shape annotations

include/mbgl/map/map.hpp

@@ -4,6 +4,7 @@
 #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>
@@ -13,6 +14,7 @@
 #include <functional>
 #include <vector>
 #include <memory>
+#include <unordered_map>
 
 namespace mbgl {
 
@@ -118,6 +120,8 @@ class Map : private util::noncopyable {
     uint32_t addPointAnnotation(const LatLng&, const std::string& symbol);
     std::vector<uint32_t> addPointAnnotations(const std::vector<LatLng>&,
                                               const std::vector<std::string>& symbols);
+    uint32_t addShapeAnnotation(const std::vector<LatLng>&,
+                                const StyleProperties&);
     void removeAnnotation(uint32_t);
     void removeAnnotations(const std::vector<uint32_t>&);
     std::vector<uint32_t> getAnnotationsInBounds(const LatLngBounds&);

src/mbgl/style/style_properties.hpp → include/mbgl/style/style_properties.hpp

@@ -3,7 +3,6 @@
 
 #include <mbgl/util/variant.hpp>
 #include <mbgl/style/types.hpp>
-#include <mbgl/style/piecewisefunction_properties.hpp>
 
 #include <array>
 #include <string>

macosx/main.mm

@@ -150,6 +150,27 @@ int main() {
     map.setStyleURL(newStyle.first);
     view.setWindowTitle(newStyle.second);
 
+    map.addPointAnnotation(mbgl::LatLng(45, -120), "default_marker");
+
+    __block mbgl::Map& map_ = map;
+
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        mbgl::FillProperties fillProperties;
+        fillProperties.fill_color = mbgl::Color({{ 1, 0, 0, 1 }});
+        fillProperties.stroke_color = mbgl::Color({{ 0, 0, 0, 1 }});
+        fillProperties.opacity = 0.25;
+
+        mbgl::StyleProperties shapeProperties;
+        shapeProperties.set<mbgl::FillProperties>(fillProperties);
+
+        map_.addShapeAnnotation({
+            mbgl::LatLng(44, -122),
+            mbgl::LatLng(46, -122),
+            mbgl::LatLng(46, -121),
+            mbgl::LatLng(44, -122)
+        }, shapeProperties);
+    });
+
     view.run();
 
     [reachability stopNotifier];