diff options
Diffstat (limited to 'platform/ios/src/MGLMapView.mm')
| -rw-r--r-- | platform/ios/src/MGLMapView.mm | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 04e9e9bb4b..35ad583081 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -99,7 +99,7 @@ const double MGLMinimumZoomLevelForUserTracking = 10.5; /// Initial zoom level when entering user tracking mode from a low zoom level. const double MGLDefaultZoomLevelForUserTracking = 14.0; -const NSUInteger MGLTargetFrameInterval = 1; //Target FPS will be 60 divided by this value +const NSUInteger MGLTargetFrameInterval = 1; // Target FPS will be 60 divided by this value /// Tolerance for snapping to true north, measured in degrees in either direction. const CLLocationDirection MGLToleranceForSnappingToNorth = 7; @@ -277,7 +277,7 @@ public: MGLAnnotationTagContextMap _annotationContextsByAnnotationTag; MGLAnnotationObjectTagMap _annotationTagsByAnnotation; - + /// Tag of the selected annotation. If the user location annotation is selected, this ivar is set to `MGLAnnotationTagNotFound`. MGLAnnotationTag _selectedAnnotationTag; @@ -312,7 +312,7 @@ public: BOOL _delegateHasLineWidthsForShapeAnnotations; MGLCompassDirectionFormatter *_accessibilityCompassFormatter; - + NS_ARRAY_OF(MGLAttributionInfo *) *_attributionInfos; } @@ -368,7 +368,7 @@ public: - (void)setStyleURL:(nullable NSURL *)styleURL { if (_isTargetingInterfaceBuilder) return; - + if ( ! styleURL) { styleURL = [MGLStyle streetsStyleURLWithVersion:MGLStyleDefaultVersion]; @@ -1435,9 +1435,9 @@ public: /** Returns the annotation that would be selected by a tap gesture recognizer. - + This is used when a gesture is recognized, and to check if the gesture should be recognized. - + @param singleTap An in progress tap gesture recognizer. @param persist True to remember the cycleable set of annotations. @see annotationTagAtPoint:persistingResults */ @@ -1457,9 +1457,9 @@ public: // Get the tap point within the custom hit test layer. tapPointForUserLocation = [singleTap locationInView:self.userLocationAnnotationView]; } - + CALayer *hitLayer = [self.userLocationAnnotationView.hitTestLayer hitTest:tapPointForUserLocation]; - + if (hitLayer) { if ( ! _userLocationAnnotationIsSelected) @@ -1469,7 +1469,7 @@ public: return nil; } } - + // Handle the case of an offset annotation view by converting the tap point to be the geo location // of the annotation itself that the view represents for (MGLAnnotationView *view in self.annotationContainerView.annotationViews) @@ -1481,7 +1481,7 @@ public: } } } - + MGLAnnotationTag hitAnnotationTag = [self annotationTagAtPoint:tapPoint persistingResults:persist]; if (hitAnnotationTag != MGLAnnotationTagNotFound) { @@ -1492,7 +1492,7 @@ public: return annotation; } } - + return nil; } @@ -1653,7 +1653,7 @@ public: } else if (gestureRecognizer == _singleTapGestureRecognizer) { - //Gesture will be recognized if it could deselect an annotation + // Gesture will be recognized if it could deselect an annotation if(!self.selectedAnnotation) { id<MGLAnnotation>annotation = [self annotationForGestureRecognizer:(UITapGestureRecognizer*)gestureRecognizer persistingResults:NO]; @@ -1738,16 +1738,16 @@ public: cancelButtonTitle:NSLocalizedStringWithDefaultValue(@"CANCEL", nil, nil, @"Cancel", @"") destructiveButtonTitle:nil otherButtonTitles:nil]; - + _attributionInfos = [self.style attributionInfosWithFontSize:[UIFont buttonFontSize] linkColor:nil]; for (MGLAttributionInfo *info in _attributionInfos) { NSString *title = [info.title.string mgl_titleCasedStringWithLocale:[NSLocale currentLocale]]; [self.attributionSheet addButtonWithTitle:title]; } - + [self.attributionSheet addButtonWithTitle:NSLocalizedStringWithDefaultValue(@"TELEMETRY_NAME", nil, nil, @"Mapbox Telemetry", @"Action in attribution sheet")]; - + [self.attributionSheet showFromRect:self.attributionButton.frame inView:self animated:YES]; } @@ -2859,12 +2859,12 @@ public: { return nil; } - + std::vector<MGLAnnotationTag> annotationTags = [self annotationTagsInRect:rect]; if (annotationTags.size()) { NSMutableArray *annotations = [NSMutableArray arrayWithCapacity:annotationTags.size()]; - + for (auto const& annotationTag: annotationTags) { if (!_annotationContextsByAnnotationTag.count(annotationTag)) @@ -2874,10 +2874,10 @@ public: MGLAnnotationContext annotationContext = _annotationContextsByAnnotationTag.at(annotationTag); [annotations addObject:annotationContext.annotation]; } - + return [annotations copy]; } - + return nil; } @@ -2901,7 +2901,7 @@ public: { return MGLAnnotationTagNotFound; } - + return _annotationTagsByAnnotation.at(annotation); } @@ -4577,14 +4577,14 @@ public: MGLAnnotationTag tag = [self annotationTagForAnnotation:self.selectedAnnotation]; MGLAnnotationContext &annotationContext = _annotationContextsByAnnotationTag.at(tag); MGLAnnotationView *annotationView = annotationContext.annotationView; - + CGRect rect = [self positioningRectForCalloutForAnnotationWithTag:tag]; - + if (annotationView) { rect = annotationView.frame; } - + if ( ! CGRectIntersectsRect(rect, self.frame)) { [self deselectAnnotation:self.selectedAnnotation animated:NO]; } @@ -4733,11 +4733,11 @@ public: CGFloat widthAdjustment = self.camera.pitch > 0.0 ? 0.0 : -_largestAnnotationViewSize.width * 2.0; CGFloat heightAdjustment = self.camera.pitch > 0.0 ? 0.0 : -_largestAnnotationViewSize.height * 2.0; CGRect viewPort = CGRectInset(self.bounds, widthAdjustment, heightAdjustment); - + NSArray *visibleAnnotations = [self visibleAnnotationsInRect:viewPort]; NSMutableArray *offscreenAnnotations = [self.annotations mutableCopy]; [offscreenAnnotations removeObjectsInArray:visibleAnnotations]; - + // Update the center of visible annotation views for (id<MGLAnnotation> annotation in visibleAnnotations) { @@ -4792,7 +4792,7 @@ public: NSAssert(annotationTag != MGLAnnotationTagNotFound, @"-visibleAnnotationsInRect: returned unrecognized annotation"); MGLAnnotationContext &annotationContext = _annotationContextsByAnnotationTag.at(annotationTag); UIView *annotationView = annotationContext.annotationView; - + if (annotationView) { CLLocationCoordinate2D coordinate = annotation.coordinate; @@ -4827,27 +4827,27 @@ public: { UIView <MGLCalloutView> *calloutView = self.calloutViewForSelectedAnnotation; id <MGLAnnotation> annotation = calloutView.representedObject; - + BOOL isAnchoredToAnnotation = (calloutView && annotation && [calloutView respondsToSelector:@selector(isAnchoredToAnnotation)] && calloutView.isAnchoredToAnnotation); - + if (isAnchoredToAnnotation) { MGLAnnotationTag tag = [self annotationTagForAnnotation:annotation]; MGLAnnotationContext &annotationContext = _annotationContextsByAnnotationTag.at(tag); MGLAnnotationView *annotationView = annotationContext.annotationView; - + CGRect rect = [self positioningRectForCalloutForAnnotationWithTag:tag]; - + if (annotationView) { rect = annotationView.frame; } - + CGPoint point = CGPointMake(CGRectGetMidX(rect), CGRectGetMinY(rect)); - + if ( ! CGPointEqualToPoint(calloutView.center, point)) { calloutView.center = point; } |