[core] Pass geojsonvt only to GeoJSONSource

8 files changed, 16 insertions, 18 deletions

diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp
index 0a11d6f978..a2ce5d2422 100644
--- a/src/mbgl/style/parser.cpp
+++ b/src/mbgl/style/parser.cpp
@@ -212,11 +212,11 @@ void Parser::parseSources(const JSValue& value) {
                 }
             }
 
-            source = std::make_unique<RasterSource>(id, url, tileSize, std::move(tileset), std::move(geojsonvt));
+            source = std::make_unique<RasterSource>(id, url, tileSize, std::move(tileset));
             break;
 
         case SourceType::Vector:
-            source = std::make_unique<VectorSource>(id, url, tileSize, std::move(tileset), std::move(geojsonvt));
+            source = std::make_unique<VectorSource>(id, url, tileSize, std::move(tileset));
             break;
 
         case SourceType::GeoJSON:
diff --git a/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp
index bffb6a8fcc..d806e3140e 100644
--- a/src/mbgl/style/source.cpp
+++ b/src/mbgl/style/source.cpp
@@ -47,14 +47,12 @@ Source::Source(SourceType type_,
                std::string id_,
                std::string url_,
                uint16_t tileSize_,
-               std::unique_ptr<Tileset>&& tileset_,
-               std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&& geojsonvt_)
+               std::unique_ptr<Tileset>&& tileset_)
     : type(type_),
       id(std::move(id_)),
       url(std::move(url_)),
       tileSize(tileSize_),
       tileset(std::move(tileset_)),
-      geojsonvt(std::move(geojsonvt_)),
       observer(&nullObserver) {
 }
 
diff --git a/src/mbgl/style/source.hpp b/src/mbgl/style/source.hpp
index 91fc6514c8..45feadf2fe 100644
--- a/src/mbgl/style/source.hpp
+++ b/src/mbgl/style/source.hpp
@@ -44,8 +44,7 @@ public:
            std::string id,
            std::string url,
            uint16_t tileSize,
-           std::unique_ptr<Tileset>&&,
-           std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&&);
+           std::unique_ptr<Tileset>&&);
     ~Source() override;
 
     bool loaded = false;
@@ -99,8 +98,10 @@ private:
 private:
     std::unique_ptr<const Tileset> tileset;
 
+protected:
     std::unique_ptr<mapbox::geojsonvt::GeoJSONVT> geojsonvt;
 
+private:
     // Stores the time when this source was most recently updated.
     TimePoint updated = TimePoint::min();
 
diff --git a/src/mbgl/style/sources/geojson_source.cpp b/src/mbgl/style/sources/geojson_source.cpp
index 785c8a3eb0..8a573becfe 100644
--- a/src/mbgl/style/sources/geojson_source.cpp
+++ b/src/mbgl/style/sources/geojson_source.cpp
@@ -1,5 +1,7 @@
 #include <mbgl/style/sources/geojson_source.hpp>
 
+#include <mapbox/geojsonvt.hpp>
+
 namespace mbgl {
 namespace style {
 
@@ -8,7 +10,8 @@ GeoJSONSource::GeoJSONSource(std::string id_,
                              uint16_t tileSize_,
                              std::unique_ptr<Tileset>&& tileset_,
                              std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&& geojsonvt_)
-    : Source(SourceType::GeoJSON, std::move(id_), std::move(url_), tileSize_, std::move(tileset_), std::move(geojsonvt_)) {
+    : Source(SourceType::GeoJSON, std::move(id_), std::move(url_), tileSize_, std::move(tileset_)) {
+    geojsonvt = std::move(geojsonvt_);
 }
 
 } // namespace style
diff --git a/src/mbgl/style/sources/raster_source.cpp b/src/mbgl/style/sources/raster_source.cpp
index d0f525894a..868d3f7f88 100644
--- a/src/mbgl/style/sources/raster_source.cpp
+++ b/src/mbgl/style/sources/raster_source.cpp
@@ -6,9 +6,8 @@ namespace style {
 RasterSource::RasterSource(std::string id_,
                            std::string url_,
                            uint16_t tileSize_,
-                           std::unique_ptr<Tileset>&& tileset_,
-                           std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&& geojsonvt_)
-    : Source(SourceType::Raster, std::move(id_), std::move(url_), tileSize_, std::move(tileset_), std::move(geojsonvt_)) {
+                           std::unique_ptr<Tileset>&& tileset_)
+    : Source(SourceType::Raster, std::move(id_), std::move(url_), tileSize_, std::move(tileset_)) {
 }
 
 } // namespace style
diff --git a/src/mbgl/style/sources/raster_source.hpp b/src/mbgl/style/sources/raster_source.hpp
index 1b04865464..0e062c14f8 100644
--- a/src/mbgl/style/sources/raster_source.hpp
+++ b/src/mbgl/style/sources/raster_source.hpp
@@ -10,8 +10,7 @@ public:
     RasterSource(std::string id,
                  std::string url,
                  uint16_t tileSize,
-                 std::unique_ptr<Tileset>&&,
-                 std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&&);
+                 std::unique_ptr<Tileset>&&);
 };
 
 } // namespace style
diff --git a/src/mbgl/style/sources/vector_source.cpp b/src/mbgl/style/sources/vector_source.cpp
index 6cbb667c40..2c283057df 100644
--- a/src/mbgl/style/sources/vector_source.cpp
+++ b/src/mbgl/style/sources/vector_source.cpp
@@ -6,9 +6,8 @@ namespace style {
 VectorSource::VectorSource(std::string id_,
                            std::string url_,
                            uint16_t tileSize_,
-                           std::unique_ptr<Tileset>&& tileset_,
-                           std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&& geojsonvt_)
-    : Source(SourceType::Vector, std::move(id_), std::move(url_), tileSize_, std::move(tileset_), std::move(geojsonvt_)) {
+                           std::unique_ptr<Tileset>&& tileset_)
+    : Source(SourceType::Vector, std::move(id_), std::move(url_), tileSize_, std::move(tileset_)) {
 }
 
 } // namespace style
diff --git a/src/mbgl/style/sources/vector_source.hpp b/src/mbgl/style/sources/vector_source.hpp
index e3a14a7531..c9fdd55a64 100644
--- a/src/mbgl/style/sources/vector_source.hpp
+++ b/src/mbgl/style/sources/vector_source.hpp
@@ -10,8 +10,7 @@ public:
     VectorSource(std::string id,
                  std::string url,
                  uint16_t tileSize,
-                 std::unique_ptr<Tileset>&&,
-                 std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>&&);
+                 std::unique_ptr<Tileset>&&);
 };
 
 } // namespace style