diff options
author | Julian Rex <julian.rex@mapbox.com> | 2018-10-02 14:00:06 -0400 |
---|---|---|
committer | Julian Rex <julian.rex@mapbox.com> | 2018-10-06 00:58:40 -0400 |
commit | 0e30aba216d4d33c6787280080d074f4f6680c1a (patch) | |
tree | 7480a7bb68e53f4ce4ac92e4226400da7745cc1b | |
parent | 2be56509a12c8ed67f95b9ec6ccd017a3ccf37e0 (diff) | |
download | qtlocation-mapboxgl-0e30aba216d4d33c6787280080d074f4f6680c1a.tar.gz |
Minor whitespace/comment tweaks.
-rw-r--r-- | platform/ios/src/MGLMapView.h | 2 | ||||
-rw-r--r-- | platform/ios/src/MGLMapView.mm | 6 | ||||
-rw-r--r-- | platform/ios/src/MGLMapViewDelegate.h | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/platform/ios/src/MGLMapView.h b/platform/ios/src/MGLMapView.h index 22b9dcedc1..bda7131e65 100644 --- a/platform/ios/src/MGLMapView.h +++ b/platform/ios/src/MGLMapView.h @@ -1331,7 +1331,7 @@ MGL_EXPORT IB_DESIGNABLE Note that a selection initiated by a single tap gesture is always animated. @param annotation The annotation object to select. - @param animated If `YES`, the annotation and callout view are moved on-screen. + @param animated If `YES`, the annotation and callout view are animated on-screen. @note In versions prior to `4.0.0` selecting an offscreen annotation did not change the camera. diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index b6af3d552a..6f89d43051 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -234,7 +234,6 @@ public: /// could be the touch point rather than its centroid) @property (nonatomic) CLLocationCoordinate2D anchorCoordinateForSelectedAnnotation; - @property (nonatomic) MGLUserLocationAnnotationView *userLocationAnnotationView; /// Indicates how thoroughly the map view is tracking the user location. @@ -4428,7 +4427,6 @@ public: CGPoint originPoint = [self convertCoordinate:origin toPointToView:self]; calloutPositioningRect = { .origin = originPoint, .size = CGSizeZero }; } - CGRect expandedPositioningRect = calloutPositioningRect; @@ -4503,7 +4501,6 @@ public: // If the callout view provides inset (outset) information, we can use it to expand our positioning // rect, which we then use to help move the annotation on-screen if want need to. if (moveOnscreen) { - UIEdgeInsets margins = MGLMapViewOffscreenAnnotationPadding; if ([calloutView respondsToSelector:@selector(marginInsetsHintForPresentationFromRect:)]) { @@ -4578,7 +4575,6 @@ public: { CGPoint center = CGPointMake(CGRectGetMidX(constrainedRect), CGRectGetMidY(constrainedRect)); CLLocationCoordinate2D centerCoord = [self convertPoint:center toCoordinateFromView:self]; - [self setCenterCoordinate:centerCoord animated:animated]; } } @@ -5918,7 +5914,6 @@ public: - (void)updateCalloutView { - // If we're moving the annotation and callout, don't update UIView <MGLCalloutView> *calloutView = self.calloutViewForSelectedAnnotation; id <MGLAnnotation> annotation = calloutView.representedObject; @@ -6044,7 +6039,6 @@ public: /// Intended center point of the user location annotation view with respect to /// the overall map view (but respecting the content inset). - - (CGPoint)userLocationAnnotationViewCenter { if ([self.delegate respondsToSelector:@selector(mapViewUserLocationAnchorPoint:)]) diff --git a/platform/ios/src/MGLMapViewDelegate.h b/platform/ios/src/MGLMapViewDelegate.h index 9c2caf8bb8..c7dc4b1ea8 100644 --- a/platform/ios/src/MGLMapViewDelegate.h +++ b/platform/ios/src/MGLMapViewDelegate.h @@ -474,7 +474,6 @@ NS_ASSUME_NONNULL_BEGIN */ - (BOOL)mapView:(MGLMapView *)mapView shouldMoveAnnotationOnscreenInResponseToUserSelection:(id <MGLAnnotation>)annotation; - /** Tells the delegate that one of its annotations was selected. |