[macos] Add visible annotations API

mapbox · Oct 26, 2016 · 9ed7757 · 9ed7757
1 parent 60889d4
commit 9ed7757
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/platform/ios/src/MGLMapView.h b/platform/ios/src/MGLMapView.h
@@ -894,7 +894,7 @@ IB_DESIGNABLE
 
 /**
  The complete list of annotations associated with the receiver that are 
- currently visible. (read-only)
+ currently visible.
  
  The objects in this array must adopt the `MGLAnnotation` protocol. If no
  annotations are associated with the map view or if no annotations associated

diff --git a/platform/macos/src/MGLMapView.h b/platform/macos/src/MGLMapView.h
@@ -568,6 +568,16 @@ IB_DESIGNABLE
  */
 - (void)addAnnotations:(NS_ARRAY_OF(id <MGLAnnotation>) *)annotations;
 
+/**
+ The complete list of annotations associated with the receiver that are
+ currently visible.
+ 
+ The objects in this array must adopt the `MGLAnnotation` protocol. If no
+ annotations are associated with the map view or if no annotations associated
+ with the map view are currently visible, the value of this property is `nil`.
+ */
+@property (nonatomic, readonly, nullable) NS_ARRAY_OF(id <MGLAnnotation>) *visibleAnnotations;
+
 /**
  Removes an annotation from the map view, deselecting it if it is selected.
  

diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
@@ -1616,6 +1616,30 @@ - (IBAction)rotate:(NSSlider *)sender {
     return [NSArray arrayWithObjects:&annotations[0] count:annotations.size()];
 }
 
+- (nullable NS_ARRAY_OF(id <MGLAnnotation>) *)visibleAnnotations
+{
+    if (_annotationContextsByAnnotationTag.empty())
+    {
+        return nil;
+    }
+
+    std::vector<MGLAnnotationTag> annotationTags = [self annotationTagsInRect:self.bounds];
+    if (annotationTags.size())
+    {
+        NSMutableArray *annotations = [NSMutableArray arrayWithCapacity:annotationTags.size()];
+
+        for (auto const& annotationTag: annotationTags)
+        {
+            MGLAnnotationContext annotationContext = _annotationContextsByAnnotationTag[annotationTag];
+            [annotations addObject:annotationContext.annotation];
+        }
+
+        return [annotations copy];
+    }
+
+    return nil;
+}
+
 /// Returns the annotation assigned the given tag. Cheap.
 - (id <MGLAnnotation>)annotationWithTag:(MGLAnnotationTag)tag {
     if (!_annotationContextsByAnnotationTag.count(tag)) {