[ios, osx] Ignore compound shape types as annotations

Ignore any multipolyline, multipolygon, or shape collection object passed into -addAnnotation: or -addAnnotations:. Previously, these methods broke apart the compound shape into its constituent shapes in order to recursively add them to the map. But that broke assumptions about a one-to-one correspondence between annotations and their contexts during selection and deletion.

1 files changed, 4 insertions, 10 deletions

diff --git a/platform/osx/src/MGLMapView.mm b/platform/osx/src/MGLMapView.mm
index 660c5d9ee0..c398a9424b 100644
--- a/platform/osx/src/MGLMapView.mm
+++ b/platform/osx/src/MGLMapView.mm
@@ -1621,16 +1621,10 @@ public:
             }
             shapes.emplace_back(multiPoint.annotationSegments, [multiPoint shapeAnnotationPropertiesObjectWithDelegate:self]);
             [userShapes addObject:annotation];
-        } else if ([annotation isKindOfClass:[MGLMultiPolyline class]]) {
-            // TODO: Add real support for these types down in mbgl instead of breaking the annotation apart.
-            NS_ARRAY_OF(MGLPolyline *) *polylines = [(MGLMultiPolyline *)annotation polylines];
-            [self addAnnotations:polylines];
-        } else if ([annotation isKindOfClass:[MGLMultiPolygon class]]) {
-            NS_ARRAY_OF(MGLPolygon *) *polygons = [(MGLMultiPolygon *)annotation polygons];
-            [self addAnnotations:polygons];
-        } else if ([annotation isKindOfClass:[MGLShapeCollection class]]) {
-            NS_ARRAY_OF(MGLShape <MGLAnnotation> *) *shapes = [(MGLShapeCollection *)annotation shapes];
-            [self addAnnotations:shapes];
+        } else if ([annotation isKindOfClass:[MGLMultiPolyline class]]
+                   || [annotation isKindOfClass:[MGLMultiPolygon class]]
+                   || [annotation isKindOfClass:[MGLShapeCollection class]]) {
+            continue;
         } else {
             MGLAnnotationImage *annotationImage = nil;
             if (delegateHasImagesForAnnotations) {