1 files changed, 32 insertions, 41 deletions

diff --git a/src/mbgl/style/sources/geojson_source_impl.cpp b/src/mbgl/style/sources/geojson_source_impl.cpp
index f58e0fc62b..b9744d193a 100644
--- a/src/mbgl/style/sources/geojson_source_impl.cpp
+++ b/src/mbgl/style/sources/geojson_source_impl.cpp
@@ -1,9 +1,10 @@
 #include <mbgl/style/sources/geojson_source_impl.hpp>
 #include <mbgl/style/source_observer.hpp>
-#include <mbgl/style/parser.hpp>
+#include <mbgl/style/conversion/geojson.hpp>
 #include <mbgl/tile/geojson_tile.hpp>
 #include <mbgl/storage/file_source.hpp>
 #include <mbgl/platform/log.hpp>
+#include <mbgl/util/rapidjson.hpp>
 
 #include <mapbox/geojsonvt.hpp>
 #include <mapbox/geojsonvt/convert.hpp>
@@ -12,56 +13,38 @@
 
 #include <sstream>
 
+using namespace mapbox::geojsonvt;
+
 namespace mbgl {
 namespace style {
-
-std::unique_ptr<mapbox::geojsonvt::GeoJSONVT> GeoJSONSource::Impl::parseGeoJSON(const JSValue& value) {
-    using namespace mapbox::geojsonvt;
-
+namespace conversion {
+template <>
+Result<GeoJSON> convertGeoJSON(const JSValue& value) {
     Options options;
     options.buffer = util::EXTENT / util::tileSize * 128;
     options.extent = util::EXTENT;
 
     try {
-        return std::make_unique<GeoJSONVT>(Convert::convert(value, 0), options);
+        return GeoJSON { std::make_unique<GeoJSONVT>(Convert::convert(value, 0), options) };
     } catch (const std::exception& ex) {
-        Log::Error(Event::ParseStyle, "Failed to parse GeoJSON data: %s", ex.what());
-        // Create an empty GeoJSON VT object to make sure we're not infinitely waiting for
-        // tiles to load.
-        return std::make_unique<GeoJSONVT>(std::vector<ProjectedFeature>{}, options);
+        return Error { ex.what() };
     }
 }
+} // namespace conversion
 
-std::unique_ptr<GeoJSONSource> GeoJSONSource::Impl::parse(const std::string& id, const JSValue& value) {
-    // We should probably split this up to have URLs in the url property, and actual data
-    // in the data property. Until then, we're going to detect the content based on the
-    // object type.
-    if (!value.HasMember("data")) {
-        Log::Error(Event::ParseStyle, "GeoJSON source must have a data value");
-        return nullptr;
-    }
-
-    const JSValue& dataVal = value["data"];
-    if (dataVal.IsString()) {
-        return std::make_unique<GeoJSONSource>([&] (Source& base) {
-            return std::make_unique<Impl>(id, base, std::string(dataVal.GetString(), dataVal.GetStringLength()));
-        });
-    } else if (dataVal.IsObject()) {
-        return std::make_unique<GeoJSONSource>([&] (Source& base) {
-            return std::make_unique<Impl>(id, base, parseGeoJSON(dataVal));
-        });
-    } else {
-        Log::Error(Event::ParseStyle, "GeoJSON data must be a URL or an object");
-        return nullptr;
-    }
+GeoJSONSource::Impl::Impl(std::string id_, Source& base_)
+    : Source::Impl(SourceType::GeoJSON, std::move(id_), base_) {
 }
 
-GeoJSONSource::Impl::Impl(std::string id_, Source& base_, variant<std::string, GeoJSON> urlOrGeoJSON_)
-    : Source::Impl(SourceType::GeoJSON, std::move(id_), base_),
-      urlOrGeoJSON(std::move(urlOrGeoJSON_)) {
+GeoJSONSource::Impl::~Impl() = default;
+
+void GeoJSONSource::Impl::setURL(std::string url) {
+    urlOrGeoJSON = std::move(url);
 }
 
-GeoJSONSource::Impl::~Impl() = default;
+void GeoJSONSource::Impl::setGeoJSON(GeoJSON&& geoJSON) {
+    urlOrGeoJSON = std::move(geoJSON);
+}
 
 void GeoJSONSource::Impl::load(FileSource& fileSource) {
     if (urlOrGeoJSON.is<GeoJSON>()) {
@@ -94,9 +77,17 @@ void GeoJSONSource::Impl::load(FileSource& fileSource) {
 
             invalidateTiles();
 
-            urlOrGeoJSON = parseGeoJSON(d);
-            loaded = true;
+            conversion::Result<GeoJSON> geoJSON = conversion::convertGeoJSON<JSValue>(d);
+            if (!geoJSON) {
+                Log::Error(Event::ParseStyle, "Failed to parse GeoJSON data: %s", geoJSON.error().message);
+                // Create an empty GeoJSON VT object to make sure we're not infinitely waiting for
+                // tiles to load.
+                urlOrGeoJSON = GeoJSON { std::make_unique<GeoJSONVT>(std::vector<ProjectedFeature>()) };
+            } else {
+                urlOrGeoJSON = std::move(*geoJSON);
+            }
 
+            loaded = true;
             observer->onSourceLoaded(base);
         }
     });
@@ -104,13 +95,13 @@ void GeoJSONSource::Impl::load(FileSource& fileSource) {
 
 Range<uint8_t> GeoJSONSource::Impl::getZoomRange() {
     assert(loaded);
-    return { 0, urlOrGeoJSON.get<GeoJSON>()->options.maxZoom };
+    return { 0, urlOrGeoJSON.get<GeoJSON>().impl->options.maxZoom };
 }
 
 std::unique_ptr<Tile> GeoJSONSource::Impl::createTile(const OverscaledTileID& tileID,
-                                                const UpdateParameters& parameters) {
+                                                      const UpdateParameters& parameters) {
     assert(loaded);
-    return std::make_unique<GeoJSONTile>(tileID, base.getID(), parameters, *urlOrGeoJSON.get<GeoJSON>());
+    return std::make_unique<GeoJSONTile>(tileID, base.getID(), parameters, *urlOrGeoJSON.get<GeoJSON>().impl);
 }
 
 } // namespace style