Merge branch 'master' of github.com:mapbox/mapbox-gl-native

4 files changed, 38 insertions, 13 deletions

diff --git a/platform/osx/INSTALL.md b/platform/osx/INSTALL.md
index 8a4323aa8e..63b8947227 100644
--- a/platform/osx/INSTALL.md
+++ b/platform/osx/INSTALL.md
@@ -21,7 +21,15 @@ Grab a [prebuilt release](https://github.com/mapbox/mapbox-gl-native/releases/)
 
 ## Usage
 
-In a storyboard or XIB, add a view to your view controller. (Drag Custom View from the Object library to the View Controller scene on the Interface Builder canvas.) In the Identity inspector, set the view’s custom class to `MGLMapView`. If you need to manipulate the map view programmatically:
+In a storyboard or XIB:
+
+1. Add a view to your view controller or window. (Drag Custom View from the Object library to the View Controller scene on the Interface Builder canvas. In a XIB, drag it instead to the window on the canvas.)
+2. In the Identity inspector, set the view’s custom class to `MGLMapView`.
+3. MGLMapView needs to be layer-backed:
+  * You can make the window layer-backed by selecting the window and checking Full Size Content View in the Attributes inspector. This allows the map view to underlap the title bar and toolbar.
+  * Alternatively, if you don’t want the entire window to be layer-backed, you can make just the map view layer-backed by selecting it and checking its entry under the View Effects inspector’s Core Animation Layer section.
+
+If you need to manipulate the map view programmatically:
 
 1. Switch to the Assistant Editor.
 1. Import the `Mapbox` module.
diff --git a/platform/osx/app/MapDocument.m b/platform/osx/app/MapDocument.m
index 4274126747..e9f3b99592 100644
--- a/platform/osx/app/MapDocument.m
+++ b/platform/osx/app/MapDocument.m
@@ -18,7 +18,18 @@ NS_ARRAY_OF(id <MGLAnnotation>) *MBXFlattenedShapes(NS_ARRAY_OF(id <MGLAnnotatio
     NSMutableArray *flattenedShapes = [NSMutableArray arrayWithCapacity:shapes.count];
     for (id <MGLAnnotation> shape in shapes) {
         NSArray *subshapes;
-        if ([shape isKindOfClass:[MGLMultiPolyline class]]) {
+        // Flatten multipoints but not polylines or polygons.
+        if ([shape isMemberOfClass:[MGLMultiPoint class]]) {
+            NSUInteger pointCount = [(MGLMultiPoint *)shape pointCount];
+            CLLocationCoordinate2D *coordinates = [(MGLMultiPoint *)shape coordinates];
+            NSMutableArray *pointAnnotations = [NSMutableArray arrayWithCapacity:pointCount];
+            for (NSUInteger i = 0; i < pointCount; i++) {
+                MGLPointAnnotation *pointAnnotation = [[MGLPointAnnotation alloc] init];
+                pointAnnotation.coordinate = coordinates[i];
+                [pointAnnotations addObject:pointAnnotation];
+            }
+            subshapes = pointAnnotations;
+        } else if ([shape isKindOfClass:[MGLMultiPolyline class]]) {
             subshapes = [(MGLMultiPolyline *)shape polylines];
         } else if ([shape isKindOfClass:[MGLMultiPolygon class]]) {
             subshapes = [(MGLMultiPolygon *)shape polygons];
diff --git a/platform/osx/src/MGLMapView.h b/platform/osx/src/MGLMapView.h
index 5c7e75135b..7b3efd293b 100644
--- a/platform/osx/src/MGLMapView.h
+++ b/platform/osx/src/MGLMapView.h
@@ -535,9 +535,10 @@ IB_DESIGNABLE
  Adds an annotation to the map view.
  
  @note `MGLMultiPolyline`, `MGLMultiPolygon`, and `MGLShapeCollection` objects
-    cannot be added to the map view at this time. Any multipolyline,
-    multipolygon, or shape collection object that is passed into this method is
-    silently ignored.
+    cannot be added to the map view at this time. Nor can `MGLMultiPoint`
+    objects that are not instances of `MGLPolyline` or `MGLPolygon`. Any
+    multipoint, multipolyline, multipolygon, or shape collection object that is
+    specified is silently ignored.
  
  @param annotation The annotation object to add to the receiver. This object
     must conform to the `MGLAnnotation` protocol. The map view retains the
@@ -549,9 +550,10 @@ IB_DESIGNABLE
  Adds an array of annotations to the map view.
  
  @note `MGLMultiPolyline`, `MGLMultiPolygon`, and `MGLShapeCollection` objects
-    cannot be added to the map view at this time. Any multipolyline,
-    multipolygon, or shape collection objects that are passed in are silently
-    ignored.
+    cannot be added to the map view at this time. Nor can `MGLMultiPoint`
+    objects that are not instances of `MGLPolyline` or `MGLPolygon`. Any
+    multipoint, multipolyline, multipolygon, or shape collection objects that
+    are specified are silently ignored.
  
  @param annotations An array of annotation objects. Each object in the array
     must conform to the `MGLAnnotation` protocol. The map view retains each
diff --git a/platform/osx/src/MGLMapView.mm b/platform/osx/src/MGLMapView.mm
index 03b94c25ba..ac4eae9d34 100644
--- a/platform/osx/src/MGLMapView.mm
+++ b/platform/osx/src/MGLMapView.mm
@@ -1608,6 +1608,12 @@ public:
         NSAssert([annotation conformsToProtocol:@protocol(MGLAnnotation)], @"Annotation does not conform to MGLAnnotation");
         
         if ([annotation isKindOfClass:[MGLMultiPoint class]]) {
+            // Actual multipoints aren’t supported as annotations.
+            if ([annotation isMemberOfClass:[MGLMultiPoint class]]
+                || [annotation isMemberOfClass:[MGLMultiPointFeature class]]) {
+                continue;
+            }
+            
             // The multipoint knows how to style itself (with the map view’s help).
             MGLMultiPoint *multiPoint = (MGLMultiPoint *)annotation;
             if (!multiPoint.pointCount) {
@@ -1618,11 +1624,9 @@ public:
             MGLAnnotationContext context;
             context.annotation = annotation;
             _annotationContextsByAnnotationTag[annotationTag] = context;
-        } else if ([annotation isKindOfClass:[MGLMultiPolyline class]]
-                   || [annotation isKindOfClass:[MGLMultiPolygon class]]
-                   || [annotation isKindOfClass:[MGLShapeCollection class]]) {
-            continue;
-        } else {
+        } else if (![annotation isKindOfClass:[MGLMultiPolyline class]]
+                   || ![annotation isKindOfClass:[MGLMultiPolygon class]]
+                   || ![annotation isKindOfClass:[MGLShapeCollection class]]) {
             MGLAnnotationImage *annotationImage = nil;
             if (delegateHasImagesForAnnotations) {
                 annotationImage = [self.delegate mapView:self imageForAnnotation:annotation];