1 files changed, 25 insertions, 5 deletions
diff --git a/src/mbgl/style/sources/raster_source.cpp b/src/mbgl/style/sources/raster_source.cpp
index 85d33dc72b..9f873a3065 100644
--- a/src/mbgl/style/sources/raster_source.cpp
+++ b/src/mbgl/style/sources/raster_source.cpp
@@ -1,19 +1,39 @@
 #include <mbgl/style/sources/raster_source.hpp>
 #include <mbgl/tile/raster_tile.hpp>
+#include <mbgl/platform/log.hpp>
 
 namespace mbgl {
 namespace style {
 
+std::unique_ptr<RasterSource> RasterSource::parse(std::string id, const JSValue& value) {
+    optional<variant<std::string, Tileset>> urlOrTileset = TileSource::parseURLOrTileset(value);
+    if (!urlOrTileset) {
+        return nullptr;
+    }
+
+    uint16_t tileSize = util::tileSize;
+    if (value.HasMember("tileSize")) {
+        const JSValue& tileSizeVal = value["tileSize"];
+        if (tileSizeVal.IsNumber() && tileSizeVal.GetUint64() <= std::numeric_limits<uint16_t>::max()) {
+            tileSize = tileSizeVal.GetUint64();
+        } else {
+            Log::Error(Event::ParseStyle, "invalid tileSize");
+            return nullptr;
+        }
+    }
+
+    return std::make_unique<RasterSource>(std::move(id), std::move(*urlOrTileset), tileSize);
+}
+
 RasterSource::RasterSource(std::string id_,
-                           std::string url_,
-                           uint16_t tileSize_,
-                           std::unique_ptr<Tileset>&& tileset_)
-    : TileSource(SourceType::Raster, std::move(id_), std::move(url_), tileSize_, std::move(tileset_)) {
+                           variant<std::string, Tileset> urlOrTileset_,
+                           uint16_t tileSize_)
+    : TileSource(SourceType::Raster, std::move(id_), std::move(urlOrTileset_), tileSize_) {
 }
 
 std::unique_ptr<Tile> RasterSource::createTile(const OverscaledTileID& tileID,
                                                const UpdateParameters& parameters) {
-    return std::make_unique<RasterTile>(tileID, parameters, *tileset);
+    return std::make_unique<RasterTile>(tileID, parameters, tileset);
 }
 
 } // namespace style