reapply #1710 - array of structs rather than parallel arrays for annotations

include/mbgl/annotation/point_annotation.hpp

@@ -0,0 +1,22 @@
+#ifndef MBGL_ANNOTATION_POINT_ANNOTATION
+#define MBGL_ANNOTATION_POINT_ANNOTATION
+
+#include <mbgl/util/geo.hpp>
+
+#include <string>
+
+namespace mbgl {
+
+class PointAnnotation {
+public:
+    inline PointAnnotation(const LatLng& position_, const std::string& icon_ = "")
+        : position(position_), icon(icon_) {
+    }
+
+    const LatLng position;
+    const std::string icon;
+};
+
+}
+
+#endif

include/mbgl/annotation/shape_annotation.hpp

@@ -0,0 +1,24 @@
+#ifndef MBGL_ANNOTATION_SHAPE_ANNOTATION
+#define MBGL_ANNOTATION_SHAPE_ANNOTATION
+
+#include <mbgl/util/geo.hpp>
+#include <mbgl/map/map.hpp>
+#include <mbgl/style/style_properties.hpp>
+
+#include <string>
+
+namespace mbgl {
+
+class ShapeAnnotation {
+public:
+    inline ShapeAnnotation(const AnnotationSegments& segments_, const StyleProperties& styleProperties_)
+        : segments(segments_), styleProperties(styleProperties_) {
+    }
+
+    const AnnotationSegments segments;
+    const StyleProperties styleProperties;
+};
+
+}
+
+#endif

include/mbgl/map/map.hpp

@@ -4,7 +4,6 @@
 #include <mbgl/util/chrono.hpp>
 #include <mbgl/map/update.hpp>
 #include <mbgl/map/mode.hpp>
-#include <mbgl/style/style_properties.hpp>
 #include <mbgl/util/geo.hpp>
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/vec.hpp>
@@ -14,7 +13,6 @@
 #include <functional>
 #include <vector>
 #include <memory>
-#include <unordered_map>
 
 namespace mbgl {
 
@@ -24,6 +22,8 @@ class MapData;
 class MapContext;
 class StillImage;
 class Transform;
+class PointAnnotation;
+class ShapeAnnotation;
 
 namespace util {
 template <class T> class Thread;
@@ -129,15 +129,16 @@ class Map : private util::noncopyable {
     // Annotations
     void setDefaultPointAnnotationSymbol(const std::string&);
     double getTopOffsetPixelsForAnnotationSymbol(const std::string&);
-    uint32_t addPointAnnotation(const LatLng&, const std::string& symbol);
-    AnnotationIDs addPointAnnotations(const AnnotationSegment&,
-                                      const std::vector<std::string>& symbols);
-    uint32_t addShapeAnnotation(const AnnotationSegments&,
-                                const StyleProperties&);
-    AnnotationIDs addShapeAnnotations(const std::vector<AnnotationSegments>&,
-                                      const std::vector<StyleProperties>&);
+
+    uint32_t addPointAnnotation(const PointAnnotation&);
+    AnnotationIDs addPointAnnotations(const std::vector<PointAnnotation>&);
+
+    uint32_t addShapeAnnotation(const ShapeAnnotation&);
+    AnnotationIDs addShapeAnnotations(const std::vector<ShapeAnnotation>&);
+
     void removeAnnotation(uint32_t);
     void removeAnnotations(const AnnotationIDs&);
+
     AnnotationIDs getAnnotationsInBounds(const LatLngBounds&, const AnnotationType& = AnnotationType::Any);
     LatLngBounds getBoundsForAnnotations(const AnnotationIDs&);
 

platform/default/glfw_view.cpp

@@ -1,3 +1,5 @@
+#include <mbgl/annotation/point_annotation.hpp>
+#include <mbgl/annotation/shape_annotation.hpp>
 #include <mbgl/platform/default/glfw_view.hpp>
 #include <mbgl/platform/gl.hpp>
 #include <mbgl/platform/log.hpp>
@@ -149,21 +151,18 @@ mbgl::LatLng GLFWView::makeRandomPoint() const {
 
 
 void GLFWView::addRandomPointAnnotations(int count) {
-    std::vector<mbgl::LatLng> points;
-    std::vector<std::string> markers;
+    std::vector<mbgl::PointAnnotation> points;
 
     for (int i = 0; i < count; i++) {
-        points.push_back(makeRandomPoint());
-        markers.push_back("default_marker");
+        points.emplace_back(makeRandomPoint(), "default_marker");
     }
 
-    auto newIDs = map->addPointAnnotations(points, markers);
+    auto newIDs = map->addPointAnnotations(points);
     annotationIDs.insert(annotationIDs.end(), newIDs.begin(), newIDs.end());
 }
 
 void GLFWView::addRandomShapeAnnotations(int count) {
-    std::vector<mbgl::AnnotationSegments> shapes;
-    std::vector<mbgl::StyleProperties> shapesProperties;
+    std::vector<mbgl::ShapeAnnotation> shapes;
 
     mbgl::FillProperties fillProperties;
     fillProperties.opacity = .1;
@@ -180,11 +179,10 @@ void GLFWView::addRandomShapeAnnotations(int count) {
         mbgl::AnnotationSegments segments;
         segments.push_back(triangle);
 
-        shapes.push_back(segments);
-        shapesProperties.push_back(properties);
+        shapes.emplace_back(segments, properties);
     }
 
-    auto newIDs = map->addShapeAnnotations(shapes, shapesProperties);
+    auto newIDs = map->addShapeAnnotations(shapes);
     annotationIDs.insert(annotationIDs.end(), newIDs.begin(), newIDs.end());
 }
 

platform/ios/MGLMapView.mm

@@ -8,6 +8,8 @@
 #import <OpenGLES/EAGL.h>
 
 #include <mbgl/mbgl.hpp>
+#include <mbgl/annotation/point_annotation.hpp>
+#include <mbgl/annotation/shape_annotation.hpp>
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/platform/darwin/reachability.h>
 #include <mbgl/storage/default_file_source.hpp>
@@ -1780,11 +1782,8 @@ - (void)addAnnotations:(NS_ARRAY_OF(id <MGLAnnotation>) *)annotations
 {
     if ( ! annotations) return;
 
-    std::vector<mbgl::LatLng> points;
-    std::vector<std::string> symbols;
-
-    std::vector<mbgl::AnnotationSegments> shapes;
-    std::vector<mbgl::StyleProperties> shapesProperties;
+    std::vector<mbgl::PointAnnotation> points;
+    std::vector<mbgl::ShapeAnnotation> shapes;
 
     BOOL delegateImplementsSymbolLookup = [self.delegate respondsToSelector:@selector(mapView:symbolNameForAnnotation:)];
     BOOL delegateImplementsAlphaForShape = [self.delegate respondsToSelector:@selector(mapView:alphaForShapeAnnotation:)];
@@ -1851,43 +1850,39 @@ - (void)addAnnotations:(NS_ARRAY_OF(id <MGLAnnotation>) *)annotations
                                        userInfo:nil] raise];
             }
 
-            shapesProperties.push_back(shapeProperties);
-
             NSUInteger count = [(MGLMultiPoint *)annotation pointCount];
 
             CLLocationCoordinate2D *coordinates = (CLLocationCoordinate2D *)malloc(count * sizeof(CLLocationCoordinate2D));
             [(MGLMultiPoint *)annotation getCoordinates:coordinates range:NSMakeRange(0, count)];
 
-            mbgl::AnnotationSegment shape;
-            shape.reserve(count);
+            mbgl::AnnotationSegment segment;
+            segment.reserve(count);
 
             for (NSUInteger i = 0; i < count; i++)
             {
-                shape.push_back(mbgl::LatLng(coordinates[i].latitude, coordinates[i].longitude));
+                segment.push_back(mbgl::LatLng(coordinates[i].latitude, coordinates[i].longitude));
             }
 
             free(coordinates);
 
-            shapes.push_back({{ shape }});
+            shapes.emplace_back(mbgl::AnnotationSegments {{ segment }}, shapeProperties);
         }
         else
         {
-            points.push_back(MGLLatLngFromLocationCoordinate2D(annotation.coordinate));
-
             NSString *symbolName = nil;
 
             if (delegateImplementsSymbolLookup)
             {
                 symbolName = [self.delegate mapView:self symbolNameForAnnotation:annotation];
             }
 
-            symbols.push_back((symbolName ? [symbolName UTF8String] : ""));
+            points.emplace_back(MGLLatLngFromLocationCoordinate2D(annotation.coordinate), symbolName ? [symbolName UTF8String] : "");
         }
     }
 
     if (points.size())
     {
-        std::vector<uint32_t> pointAnnotationIDs = _mbglMap->addPointAnnotations(points, symbols);
+        std::vector<uint32_t> pointAnnotationIDs = _mbglMap->addPointAnnotations(points);
 
         for (size_t i = 0; i < pointAnnotationIDs.size(); ++i)
         {
@@ -1898,7 +1893,7 @@ - (void)addAnnotations:(NS_ARRAY_OF(id <MGLAnnotation>) *)annotations
 
     if (shapes.size())
     {
-        std::vector<uint32_t> shapeAnnotationIDs = _mbglMap->addShapeAnnotations(shapes, shapesProperties);
+        std::vector<uint32_t> shapeAnnotationIDs = _mbglMap->addShapeAnnotations(shapes);
 
         for (size_t i = 0; i < shapeAnnotationIDs.size(); ++i)
         {