[core] Restored shape annotation z-order

Shapes are once again always added to the top z-index.

Fixes #5691.

Cherry-picked from 74fe96d2617f870206ff358d7dfcafccf4e109bc.

2 files changed, 15 insertions, 0 deletions

diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp
index 60d7db6baa..552a386f96 100644
--- a/test/api/annotations.cpp
+++ b/test/api/annotations.cpp
@@ -68,6 +68,21 @@ TEST(Annotations, FillAnnotation) {
     test.checkRendering("fill_annotation");
 }
 
+TEST(Annotations, OverlappingFillAnnotation) {
+    AnnotationTest test;
+
+    Polygon<double> polygon = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }};
+    FillAnnotation underlaidAnnotation { polygon };
+    underlaidAnnotation.color = { { 0, 255, 0, 1 } };
+    FillAnnotation overlaidAnnotation { polygon };
+    overlaidAnnotation.color = { { 255, 0, 0, 1 } };
+
+    test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
+    test.map.addAnnotation(underlaidAnnotation);
+    test.map.addAnnotation(overlaidAnnotation);
+    test.checkRendering("overlapping_fill_annotation");
+}
+
 TEST(Annotations, StyleSourcedShapeAnnotation) {
     AnnotationTest test;
 
diff --git a/test/fixtures/annotations/overlapping_fill_annotation/expected.png b/test/fixtures/annotations/overlapping_fill_annotation/expected.png
new file mode 100644
index 0000000000..09f48081a8
--- /dev/null
+++ b/test/fixtures/annotations/overlapping_fill_annotation/expected.png