[core] Style-sourced shape annotation properties

This introduces the possibility to source the type and style properties
of a shape annotation from a designated layer in the style.

2 files changed, 34 insertions, 0 deletions

diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp
index 415b2ddb69..a9667c4343 100644
--- a/test/api/annotations.cpp
+++ b/test/api/annotations.cpp
@@ -75,6 +75,21 @@ TEST(Annotations, FillAnnotation) {
     util::write_file("test/output/fill_annotation.png", renderPNG(map));
 }
 
+TEST(Annotations, StyleSourcedShapeAnnotation) {
+    auto display = std::make_shared<mbgl::HeadlessDisplay>();
+    HeadlessView view(display, 1);
+    DefaultFileSource fileSource(nullptr);
+
+    Map map(view, fileSource, MapMode::Still);
+    map.setStyleJSON(util::read_file("test/fixtures/api/annotation.json"), "");
+
+    AnnotationSegments segments = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }};
+
+    map.addShapeAnnotation(ShapeAnnotation(segments, "annotation"));
+
+    util::write_file("test/output/style_sourced_shape_annotation.png", renderPNG(map));
+}
+
 TEST(Annotations, AddMultiple) {
     auto display = std::make_shared<mbgl::HeadlessDisplay>();
     HeadlessView view(display, 1);
diff --git a/test/fixtures/api/annotation.json b/test/fixtures/api/annotation.json
new file mode 100644
index 0000000000..75fcfca41f
--- /dev/null
+++ b/test/fixtures/api/annotation.json
@@ -0,0 +1,19 @@
+{
+  "version": 8,
+  "sources": {
+    "fake": {
+      "type": "vector",
+      "url": "asset://TEST_DATA/fixtures/tiles/streets.json"
+    }
+  },
+  "layers": [{
+    "id": "annotation",
+    "type": "fill",
+    "source": "fake",
+    "source-layer": "fake",
+    "paint": {
+      "fill-color": "rgba(255,0,0,1)"
+    }
+  }],
+  "sprite": "asset://TEST_DATA/fixtures/resources/sprite"
+}