[ios, macos] Display the shape annotation's callout when the center coordinate is offscreen. #10255

fabian-guerra · 2017-10-20T21:02:10Z

1ec5

In addition to the feedback below, please mention this change in the iOS and macOS changelogs. Thanks!

1ec5 · 2017-10-26T05:43:44Z

platform/ios/src/MGLMapView.mm

+    [self selectAnnotation:annotation forGestureRegognizer:nil animated:animated];
+}
+
+- (void)selectAnnotation:(id <MGLAnnotation>)annotation forGestureRegognizer:(UITapGestureRecognizer *)singleTap animated:(BOOL)animated


singleTap is being used only to determine where the callout should be anchored. This method should take a positioningRect explicitly: -selectAnnotation:animated:calloutPositioningRect:. The existing code that determines positioningRect can live in -selectAnnotation:animated:.

1ec5 · 2017-10-26T05:46:55Z

platform/ios/src/MGLMapView.mm

-                positioningRect = annotationView.frame;
-                [annotationView.superview bringSubviewToFront:annotationView];
-                [annotationView setSelected:YES animated:animated];
+                {


Nit: extra set of curly braces.

1ec5 · 2017-10-26T05:49:36Z

platform/ios/src/MGLMapView.mm

-     // The client can request that any annotation be selected (even ones that are offscreen).
-     // The annotation can’t be selected if no part of it is hittable.
+    // The client can request that any annotation be selected (even ones that are offscreen).
+    // The annotation will bounce to the current tap point as anchor.


This comment implies that the PR fixes #3249, but I don’t see anything that actually moves the camera. It’s the callout view that aligns with the tap point, not the annotation.

What I'm trying to say is that if the annotation's center coordinate is outside the current viewport it will use the current tap position instead. Does this makes more sense?

// For annotations which `coordinate` falls offscreen it will use the current tap point as anchor instead.

That depends on whether the annotation is a point annotation or shape annotation:

The client can request that any annotation be selected, even an annotation that is off-screen. If a shape annotation is visible but its centroid is not, and a gesture recognizer is specified, the callout view is anchored to the gesture recognizer’s location.

1ec5 · 2017-10-26T05:52:02Z

platform/ios/src/MGLMapView.mm

    if ( ! CGRectIntersectsRect(positioningRect, self.bounds) && annotation != self.userLocation)
    {
-        return;
+        CGPoint tapPoint = [singleTap locationInView:self];


singleTap isn’t guaranteed to exist at this point. If the developer calls -showAnnotation:animated:, a public method, then tapPoint ends up being (0, 0). It should instead be the annotation’s center coordinate.

1ec5 · 2017-10-30T20:31:22Z

platform/ios/src/MGLMapView.mm

+    [self selectAnnotation:annotation forGestureRegognizer:nil animated:animated];
+}
+
+- (void)selectAnnotation:(id <MGLAnnotation>)annotation forGestureRegognizer:(UITapGestureRecognizer *)singleTap animated:(BOOL)animated


Typo: Regognizer.

1ec5 · 2017-10-30T20:34:10Z

platform/ios/src/MGLMapView.mm

-     // The client can request that any annotation be selected (even ones that are offscreen).
-     // The annotation can’t be selected if no part of it is hittable.
+    // The client can request that any annotation be selected (even ones that are offscreen).
+    // The annotation will bounce to the current tap point as anchor.


That depends on whether the annotation is a point annotation or shape annotation:

The client can request that any annotation be selected, even an annotation that is off-screen. If a shape annotation is visible but its centroid is not, and a gesture recognizer is specified, the callout view is anchored to the gesture recognizer’s location.

…center is offscreen.

1ec5 · 2017-11-01T00:59:49Z

platform/ios/src/MGLMapView.mm

@@ -4118,6 +4114,27 @@ - (MGLCompactCalloutView *)calloutViewForAnnotation:(id <MGLAnnotation>)annotati
 /// Returns the rectangle that represents the annotation image of the annotation
 /// with the given tag. This rectangle is fitted to the image’s alignment rect
 /// and is appropriate for positioning a popover.
+/// If a shape annotation is visible but its centroid is not, and a default point is specified,
+/// the callout view is anchored to the default callout point.
+- (CGRect)positioningRectForAnnotation:(id <MGLAnnotation>)annotation withDefaultCalloutPoint:(CGPoint)calloutPoint


Nit: in general, it’s unnecessary to use a preposition for a parameter after the first parameter (“with” in this case).

fabian-guerra force-pushed the fabian-center-callout-10229 branch from 1043955 to 98278e8 Compare October 23, 2017 19:00

fabian-guerra self-assigned this Oct 23, 2017

fabian-guerra force-pushed the fabian-center-callout-10229 branch 2 times, most recently from eaba3b3 to 6b54c0c Compare October 23, 2017 20:07

fabian-guerra requested review from 1ec5 and boundsj October 23, 2017 20:08

fabian-guerra added this to the ios-v3.7.0 milestone Oct 23, 2017

fabian-guerra requested a review from frederoni October 25, 2017 13:35

1ec5 reviewed Oct 26, 2017

View reviewed changes

1ec5 reviewed Oct 30, 2017

View reviewed changes

[ios, macos] Center annotation's anchor to tap point when coordinate …

87c8150

…center is offscreen.

fabian-guerra force-pushed the fabian-center-callout-10229 branch from 6b54c0c to 87c8150 Compare October 31, 2017 20:39

1ec5 approved these changes Nov 1, 2017

View reviewed changes

[ios, macos] Update changelogs.

0713434

fabian-guerra force-pushed the fabian-center-callout-10229 branch from d19df02 to 0713434 Compare November 1, 2017 02:21

fabian-guerra merged commit 63f7963 into release-agua Nov 1, 2017

fabian-guerra deleted the fabian-center-callout-10229 branch November 1, 2017 12:20

fabian-guerra changed the title ~~[ios, macos] Center shape annotation's callout when offscreen.~~ [ios, macos] Display the shape annotation's callout when the center coordinate is offscreen. Nov 1, 2017

fabian-guerra mentioned this pull request Nov 7, 2017

[ios, macos] Display the shape annotation's callout when the center coordinate is off viewport. #10229

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ios, macos] Display the shape annotation's callout when the center coordinate is offscreen. #10255

[ios, macos] Display the shape annotation's callout when the center coordinate is offscreen. #10255

fabian-guerra commented Oct 20, 2017 •

edited

Loading

1ec5 left a comment

1ec5 Oct 26, 2017

1ec5 Oct 26, 2017

1ec5 Oct 26, 2017

fabian-guerra Oct 26, 2017

1ec5 Oct 30, 2017

1ec5 Oct 26, 2017

1ec5 Oct 30, 2017

fabian-guerra Oct 30, 2017

1ec5 Oct 30, 2017

1ec5 Nov 1, 2017

[ios, macos] Display the shape annotation's callout when the center coordinate is offscreen. #10255

[ios, macos] Display the shape annotation's callout when the center coordinate is offscreen. #10255

Conversation

fabian-guerra commented Oct 20, 2017 • edited Loading

1ec5 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fabian-guerra commented Oct 20, 2017 •

edited

Loading