[core] Use variant<std::string, Tileset> in TileSource

A tile source can either specify a URL to TileJSON, or inline TileJSON.

4 files changed, 42 insertions, 17 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
diff --git a/src/mbgl/style/sources/raster_source.hpp b/src/mbgl/style/sources/raster_source.hpp
index 4702052b77..27b2276df5 100644
--- a/src/mbgl/style/sources/raster_source.hpp
+++ b/src/mbgl/style/sources/raster_source.hpp
@@ -7,10 +7,9 @@ namespace style {
 
 class RasterSource : public TileSource {
 public:
-    RasterSource(std::string id,
-                 std::string url,
-                 uint16_t tileSize,
-                 std::unique_ptr<Tileset>&&);
+    static std::unique_ptr<RasterSource> parse(std::string id, const JSValue&);
+
+    RasterSource(std::string id, variant<std::string, Tileset>, uint16_t tileSize);
 
 private:
     std::unique_ptr<Tile> createTile(const OverscaledTileID&, const UpdateParameters&) final;
diff --git a/src/mbgl/style/sources/vector_source.cpp b/src/mbgl/style/sources/vector_source.cpp
index 888c1896e1..3f8f840b38 100644
--- a/src/mbgl/style/sources/vector_source.cpp
+++ b/src/mbgl/style/sources/vector_source.cpp
@@ -4,15 +4,21 @@
 namespace mbgl {
 namespace style {
 
-VectorSource::VectorSource(std::string id_,
-                           std::string url_,
-                           std::unique_ptr<Tileset>&& tileset_)
-    : TileSource(SourceType::Vector, std::move(id_), std::move(url_), util::tileSize, std::move(tileset_)) {
+std::unique_ptr<VectorSource> VectorSource::parse(std::string id, const JSValue& value) {
+    optional<variant<std::string, Tileset>> urlOrTileset = TileSource::parseURLOrTileset(value);
+    if (!urlOrTileset) {
+        return nullptr;
+    }
+    return std::make_unique<VectorSource>(std::move(id), std::move(*urlOrTileset));
+}
+
+VectorSource::VectorSource(std::string id_, variant<std::string, Tileset> urlOrTileset_)
+    : TileSource(SourceType::Vector, std::move(id_), std::move(urlOrTileset_), util::tileSize) {
 }
 
 std::unique_ptr<Tile> VectorSource::createTile(const OverscaledTileID& tileID,
                                                const UpdateParameters& parameters) {
-    return std::make_unique<VectorTile>(tileID, id, parameters, *tileset);
+    return std::make_unique<VectorTile>(tileID, id, parameters, tileset);
 }
 
 } // namespace style
diff --git a/src/mbgl/style/sources/vector_source.hpp b/src/mbgl/style/sources/vector_source.hpp
index c96b7bd1e4..ced7d80471 100644
--- a/src/mbgl/style/sources/vector_source.hpp
+++ b/src/mbgl/style/sources/vector_source.hpp
@@ -7,9 +7,9 @@ namespace style {
 
 class VectorSource : public TileSource {
 public:
-    VectorSource(std::string id,
-                 std::string url,
-                 std::unique_ptr<Tileset>&&);
+    static std::unique_ptr<VectorSource> parse(std::string id, const JSValue&);
+
+    VectorSource(std::string id, variant<std::string, Tileset>);
 
 private:
     std::unique_ptr<Tile> createTile(const OverscaledTileID&, const UpdateParameters&) final;