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

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

4 files changed, 64 insertions, 56 deletions

diff --git a/test/style/source.cpp b/test/style/source.cpp
index 82763c99f1..9de208f343 100644
--- a/test/style/source.cpp
+++ b/test/style/source.cpp
@@ -87,7 +87,7 @@ TEST(Source, LoadingFail) {
         test.end();
     };
 
-    VectorSource source("source", "url", nullptr);
+    VectorSource source("source", "url");
     source.setObserver(&test.observer);
     source.load(test.fileSource);
 
@@ -110,7 +110,7 @@ TEST(Source, LoadingCorrupt) {
         test.end();
     };
 
-    VectorSource source("source", "url", nullptr);
+    VectorSource source("source", "url");
     source.setObserver(&test.observer);
     source.load(test.fileSource);
 
@@ -135,10 +135,10 @@ TEST(Source, RasterTileEmpty) {
         FAIL() << "Should never be called";
     };
 
-    auto tileset = std::make_unique<Tileset>();
-    tileset->tiles = { "tiles" };
+    Tileset tileset;
+    tileset.tiles = { "tiles" };
 
-    RasterSource source("source", "", 512, std::move(tileset));
+    RasterSource source("source", tileset, 512);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -164,10 +164,10 @@ TEST(Source, VectorTileEmpty) {
         FAIL() << "Should never be called";
     };
 
-    auto tileset = std::make_unique<Tileset>();
-    tileset->tiles = { "tiles" };
+    Tileset tileset;
+    tileset.tiles = { "tiles" };
 
-    VectorSource source("source", "", std::move(tileset));
+    VectorSource source("source", tileset);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -193,10 +193,10 @@ TEST(Source, RasterTileFail) {
         test.end();
     };
 
-    auto tileset = std::make_unique<Tileset>();
-    tileset->tiles = { "tiles" };
+    Tileset tileset;
+    tileset.tiles = { "tiles" };
 
-    RasterSource source("source", "", 512, std::move(tileset));
+    RasterSource source("source", tileset, 512);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -222,10 +222,10 @@ TEST(Source, VectorTileFail) {
         test.end();
     };
 
-    auto tileset = std::make_unique<Tileset>();
-    tileset->tiles = { "tiles" };
+    Tileset tileset;
+    tileset.tiles = { "tiles" };
 
-    VectorSource source("source", "", std::move(tileset));
+    VectorSource source("source", tileset);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -250,10 +250,10 @@ TEST(Source, RasterTileCorrupt) {
         test.end();
     };
 
-    auto tileset = std::make_unique<Tileset>();
-    tileset->tiles = { "tiles" };
+    Tileset tileset;
+    tileset.tiles = { "tiles" };
 
-    RasterSource source("source", "", 512, std::move(tileset));
+    RasterSource source("source", tileset, 512);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -282,10 +282,10 @@ TEST(Source, VectorTileCorrupt) {
     layer->setSource("source", "water");
     test.style.addLayer(std::move(layer));
 
-    auto tileset = std::make_unique<Tileset>();
-    tileset->tiles = { "tiles" };
+    Tileset tileset;
+    tileset.tiles = { "tiles" };
 
-    VectorSource source("source", "", std::move(tileset));
+    VectorSource source("source", tileset);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -309,10 +309,10 @@ TEST(Source, RasterTileCancel) {
         FAIL() << "Should never be called";
     };
 
-    auto tileset = std::make_unique<Tileset>();
-    tileset->tiles = { "tiles" };
+    Tileset tileset;
+    tileset.tiles = { "tiles" };
 
-    RasterSource source("source", "", 512, std::move(tileset));
+    RasterSource source("source", tileset, 512);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -336,10 +336,10 @@ TEST(Source, VectorTileCancel) {
         FAIL() << "Should never be called";
     };
 
-    auto tileset = std::make_unique<Tileset>();
-    tileset->tiles = { "tiles" };
+    Tileset tileset;
+    tileset.tiles = { "tiles" };
 
-    VectorSource source("source", "", std::move(tileset));
+    VectorSource source("source", tileset);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
diff --git a/test/style/style_parser.cpp b/test/style/style_parser.cpp
index f3fef24352..b7806c11cc 100644
--- a/test/style/style_parser.cpp
+++ b/test/style/style_parser.cpp
@@ -87,36 +87,6 @@ INSTANTIATE_TEST_CASE_P(StyleParser, StyleParserTest, ::testing::ValuesIn([] {
     return names;
 }()));
 
-TEST(StyleParser, ParseTileJSONRaster) {
-    auto result = style::parseTileJSON(
-        util::read_file("test/fixtures/style_parser/tilejson.raster.json"),
-        "mapbox://mapbox.satellite",
-        SourceType::Raster,
-        256);
-
-    EXPECT_EQ(0, result->zoomRange.min);
-    EXPECT_EQ(15, result->zoomRange.max);
-    EXPECT_EQ("attribution", result->attribution);
-#if !defined(__ANDROID__) && !defined(__APPLE__)
-    EXPECT_EQ("mapbox://tiles/mapbox.satellite/{z}/{x}/{y}{ratio}.webp", result->tiles[0]);
-#else
-    EXPECT_EQ("mapbox://tiles/mapbox.satellite/{z}/{x}/{y}{ratio}.png", result->tiles[0]);
-#endif
-}
-
-TEST(StyleParser, ParseTileJSONVector) {
-    auto result = style::parseTileJSON(
-        util::read_file("test/fixtures/style_parser/tilejson.vector.json"),
-        "mapbox://mapbox.streets",
-        SourceType::Vector,
-        256);
-
-    EXPECT_EQ(0, result->zoomRange.min);
-    EXPECT_EQ(15, result->zoomRange.max);
-    EXPECT_EQ("attribution", result->attribution);
-    EXPECT_EQ("mapbox://tiles/mapbox.streets/{z}/{x}/{y}.vector.pbf", result->tiles[0]);
-}
-
 TEST(StyleParser, FontStacks) {
     style::Parser parser;
     parser.parse(util::read_file("test/fixtures/style_parser/font_stacks.json"));
diff --git a/test/style/tile_source.cpp b/test/style/tile_source.cpp
new file mode 100644
index 0000000000..e0709e3be1
--- /dev/null
+++ b/test/style/tile_source.cpp
@@ -0,0 +1,37 @@
+#include <mbgl/test/util.hpp>
+
+#include <mbgl/style/tile_source.hpp>
+#include <mbgl/util/io.hpp>
+
+using namespace mbgl;
+using namespace mbgl::style;
+
+TEST(TileSource, ParseTileJSONRaster) {
+    auto result = TileSource::parseTileJSON(
+        util::read_file("test/fixtures/style_parser/tilejson.raster.json"),
+        "mapbox://mapbox.satellite",
+        SourceType::Raster,
+        256);
+
+    EXPECT_EQ(0, result.zoomRange.min);
+    EXPECT_EQ(15, result.zoomRange.max);
+    EXPECT_EQ("attribution", result.attribution);
+#if !defined(__ANDROID__) && !defined(__APPLE__)
+    EXPECT_EQ("mapbox://tiles/mapbox.satellite/{z}/{x}/{y}{ratio}.webp", result.tiles[0]);
+#else
+    EXPECT_EQ("mapbox://tiles/mapbox.satellite/{z}/{x}/{y}{ratio}.png", result.tiles[0]);
+#endif
+}
+
+TEST(TileSource, ParseTileJSONVector) {
+    auto result = TileSource::parseTileJSON(
+        util::read_file("test/fixtures/style_parser/tilejson.vector.json"),
+        "mapbox://mapbox.streets",
+        SourceType::Vector,
+        256);
+
+    EXPECT_EQ(0, result.zoomRange.min);
+    EXPECT_EQ(15, result.zoomRange.max);
+    EXPECT_EQ("attribution", result.attribution);
+    EXPECT_EQ("mapbox://tiles/mapbox.streets/{z}/{x}/{y}.vector.pbf", result.tiles[0]);
+}
diff --git a/test/test.gypi b/test/test.gypi
index d7023874f0..da605b6fd8 100644
--- a/test/test.gypi
+++ b/test/test.gypi
@@ -73,6 +73,7 @@
         'style/source.cpp',
         'style/style.cpp',
         'style/style_layer.cpp',
+        'style/tile_source.cpp',
         'style/filter.cpp',
         'style/functions.cpp',
         'style/style_parser.cpp',