[core] Add ImageSource support to style parsers

7 files changed, 88 insertions, 0 deletions

diff --git a/test/fixtures/style_parser/center-not-latlong.info.json b/test/fixtures/style_parser/center-not-latlong.info.json
new file mode 100644
index 0000000000..c79de0a525
--- /dev/null
+++ b/test/fixtures/style_parser/center-not-latlong.info.json
@@ -0,0 +1,7 @@
+{
+    "default": {
+        "log": [
+	    [1, "WARNING", "ParseStyle", "center coordinate must be a longitude, latitude pair"]
+        ]
+    }
+}
\ No newline at end of file
diff --git a/test/fixtures/style_parser/center-not-latlong.style.json b/test/fixtures/style_parser/center-not-latlong.style.json
new file mode 100644
index 0000000000..eb847868f5
--- /dev/null
+++ b/test/fixtures/style_parser/center-not-latlong.style.json
@@ -0,0 +1,4 @@
+{
+  "version": 8,
+  "center" : [ 75.123, 181.123]
+}
\ No newline at end of file
diff --git a/test/fixtures/style_parser/image-coordinates.info.json b/test/fixtures/style_parser/image-coordinates.info.json
new file mode 100644
index 0000000000..5ef44badba
--- /dev/null
+++ b/test/fixtures/style_parser/image-coordinates.info.json
@@ -0,0 +1,7 @@
+{
+  "default": {
+    "log": [
+      [1, "WARNING", "ParseStyle", "Image coordinates must be an array of four longitude latitude pairs"]
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/fixtures/style_parser/image-coordinates.style.json b/test/fixtures/style_parser/image-coordinates.style.json
new file mode 100644
index 0000000000..51b0e93ee7
--- /dev/null
+++ b/test/fixtures/style_parser/image-coordinates.style.json
@@ -0,0 +1,14 @@
+{
+  "version": 8,
+  "center" : [ 75.123, 81.123],
+  "sources": {
+    "image": {
+      "type": "image",
+      "url": "local://0.png",
+      "coordinates": [
+        [ 12.2344, 87.23434],
+	[-12.234, 12.41242]
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/fixtures/style_parser/image-url.info.json b/test/fixtures/style_parser/image-url.info.json
new file mode 100644
index 0000000000..988e89c011
--- /dev/null
+++ b/test/fixtures/style_parser/image-url.info.json
@@ -0,0 +1,7 @@
+{
+  "default": {
+    "log": [
+      [1, "WARNING", "ParseStyle", "Image source must have a url value"]
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/fixtures/style_parser/image-url.style.json b/test/fixtures/style_parser/image-url.style.json
new file mode 100644
index 0000000000..94614cb7ab
--- /dev/null
+++ b/test/fixtures/style_parser/image-url.style.json
@@ -0,0 +1,9 @@
+{
+  "version": 8,
+  "center" : [ 75.123, 81.123],
+  "sources": {
+    "image": {
+      "type": "image"
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp
index 880bcd986c..e674d69ed0 100644
--- a/test/style/source.test.cpp
+++ b/test/style/source.test.cpp
@@ -7,6 +7,7 @@
 #include <mbgl/style/sources/raster_source.hpp>
 #include <mbgl/style/sources/vector_source.hpp>
 #include <mbgl/style/sources/geojson_source.hpp>
+#include <mbgl/style/sources/image_source.hpp>
 
 #include <mbgl/renderer/sources/render_raster_source.hpp>
 #include <mbgl/renderer/sources/render_vector_source.hpp>
@@ -16,6 +17,9 @@
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/string.hpp>
 #include <mbgl/util/io.hpp>
+#include <mbgl/util/premultiply.hpp>
+#include <mbgl/util/image.hpp>
+
 #include <mbgl/util/tileset.hpp>
 #include <mbgl/util/default_thread_pool.hpp>
 #include <mbgl/util/logging.hpp>
@@ -436,3 +440,39 @@ TEST(Source, GeoJSonSourceUrlUpdate) {
 
     test.run();
 }
+
+TEST(Source, ImageSourceImageUpdate) {
+    SourceTest test;
+
+    test.fileSource.response = [&] (const Resource& resource) {
+        EXPECT_EQ("http://url", resource.url);
+        Response response;
+        response.data = std::make_unique<std::string>(util::read_file("test/fixtures/image/no_profile.png"));
+        return response;
+    };
+    test.styleObserver.sourceChanged = [&] (Source&) {
+        // Should be called (test will hang if it doesn't)
+        test.end();
+    };
+    std::vector<LatLng> coords;
+
+    ImageSource source("source", coords);
+    source.setURL("http://url");
+    source.setObserver(&test.styleObserver);
+
+    // Load initial, so the source state will be loaded=true
+    source.loadDescription(test.fileSource);
+    UnassociatedImage rgba({ 1, 1 });
+    rgba.data[0] = 255;
+    rgba.data[1] = 254;
+    rgba.data[2] = 253;
+    rgba.data[3] = 128;
+
+    // Schedule an update
+    test.loop.invoke([&] () {
+        // Update the url
+        source.setImage(std::move(rgba));
+    });
+
+    test.run();
+}