Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.0-beta.5-master

Also reran make style-code and manually discarded anything related to fill extrusion layers.

2 files changed, 12 insertions, 0 deletions

diff --git a/test/fixtures/map/get_icon/expected.png b/test/fixtures/map/get_icon/expected.png
new file mode 100644
index 0000000000..b112096c18
--- /dev/null
+++ b/test/fixtures/map/get_icon/expected.png
diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp
index 0df7c7c2aa..8eedeb3c01 100644
--- a/test/map/map.test.cpp
+++ b/test/map/map.test.cpp
@@ -396,6 +396,18 @@ TEST(Map, RemoveImage) {
     test::checkImage("test/fixtures/map/remove_icon", test::render(map, test.view));
 }
 
+TEST(Map, GetImage) {
+    MapTest test;
+
+    Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool, MapMode::Still);
+    auto decoded = decodeImage(util::read_file("test/fixtures/sprites/default_marker.png"));
+    auto image = std::make_unique<SpriteImage>(std::move(decoded), 1.0);
+
+    map.setStyleJSON(util::read_file("test/fixtures/api/icon_style.json"));
+    map.addImage("test-icon", std::move(image));
+    test::checkImage("test/fixtures/map/get_icon", map.getImage("test-icon")->image);
+}
+
 TEST(Map, DontLoadUnneededTiles) {
     MapTest test;