[core] Push Source::geojsonvt down to GeoJSONSource

5 files changed, 16 insertions, 11 deletions

diff --git a/src/mbgl/style/parser.hpp b/src/mbgl/style/parser.hpp
index ea821fabde..09e47a9997 100644
--- a/src/mbgl/style/parser.hpp
+++ b/src/mbgl/style/parser.hpp
@@ -13,6 +13,12 @@
 #include <unordered_map>
 #include <forward_list>
 
+namespace mapbox {
+namespace geojsonvt {
+class GeoJSONVT;
+} // namespace geojsonvt
+} // namespace mapbox
+
 namespace mbgl {
 namespace style {
 
diff --git a/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp
index 41c1d0d22b..c3265a7b41 100644
--- a/src/mbgl/style/source.cpp
+++ b/src/mbgl/style/source.cpp
@@ -23,8 +23,6 @@
 
 #include <mbgl/algorithm/update_renderables.hpp>
 
-#include <mapbox/geojsonvt.hpp>
-#include <mapbox/geojsonvt/convert.hpp>
 #include <mapbox/geometry/envelope.hpp>
 
 #include <algorithm>
diff --git a/src/mbgl/style/source.hpp b/src/mbgl/style/source.hpp
index 92ca808afb..193f73da4d 100644
--- a/src/mbgl/style/source.hpp
+++ b/src/mbgl/style/source.hpp
@@ -16,12 +16,6 @@
 #include <vector>
 #include <map>
 
-namespace mapbox {
-namespace geojsonvt {
-class GeoJSONVT;
-} // namespace geojsonvt
-} // namespace mapbox
-
 namespace mbgl {
 
 class Painter;
@@ -99,7 +93,6 @@ protected:
     void invalidateTiles();
 
     std::unique_ptr<const Tileset> tileset;
-    std::unique_ptr<mapbox::geojsonvt::GeoJSONVT> geojsonvt;
     std::unique_ptr<AsyncRequest> req;
 
     SourceObserver* observer = nullptr;
diff --git a/src/mbgl/style/sources/geojson_source.cpp b/src/mbgl/style/sources/geojson_source.cpp
index 6ece894e2e..42e0d71985 100644
--- a/src/mbgl/style/sources/geojson_source.cpp
+++ b/src/mbgl/style/sources/geojson_source.cpp
@@ -18,8 +18,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_)) {
-    geojsonvt = std::move(geojsonvt_);
+    : Source(SourceType::GeoJSON, std::move(id_), std::move(url_), tileSize_, std::move(tileset_)),
+      geojsonvt(std::move(geojsonvt_)) {
 }
 
 void GeoJSONSource::load(FileSource& fileSource) {
diff --git a/src/mbgl/style/sources/geojson_source.hpp b/src/mbgl/style/sources/geojson_source.hpp
index 47984ff9da..670eb26964 100644
--- a/src/mbgl/style/sources/geojson_source.hpp
+++ b/src/mbgl/style/sources/geojson_source.hpp
@@ -2,6 +2,12 @@
 
 #include <mbgl/style/source.hpp>
 
+namespace mapbox {
+namespace geojsonvt {
+class GeoJSONVT;
+} // namespace geojsonvt
+} // namespace mapbox
+
 namespace mbgl {
 namespace style {
 
@@ -17,6 +23,8 @@ public:
 
 private:
     std::unique_ptr<Tile> createTile(const OverscaledTileID&, const UpdateParameters&) final;
+
+    std::unique_ptr<mapbox::geojsonvt::GeoJSONVT> geojsonvt;
 };
 
 } // namespace style