GeoJSON point clustering (#5724)

* add supercluster dependency
* prepare GeoJSONTile for Supercluster
* prepare GeoJSONSource for accepting options
* try removing mbgl::GeoJSON
* fix setGeoJSON types
* add GeoJSONSource getURL
* add geojson to include path
* add Supercluster index in GeoJSONSource
* fix GeoJSONSource getZoomRange
* bring back mbgl::GeoJSON header
* fix tidy warnings hopefully
* try test-suite with enabled cluster test
* fix formatting in clustering-related files

1 files changed, 10 insertions, 5 deletions

diff --git a/src/mbgl/style/sources/geojson_source.cpp b/src/mbgl/style/sources/geojson_source.cpp
index a3eec4f4ef..2bf27880b4 100644
--- a/src/mbgl/style/sources/geojson_source.cpp
+++ b/src/mbgl/style/sources/geojson_source.cpp
@@ -4,17 +4,22 @@
 namespace mbgl {
 namespace style {
 
-GeoJSONSource::GeoJSONSource(const std::string& id)
-    : Source(SourceType::GeoJSON, std::make_unique<GeoJSONSource::Impl>(std::move(id), *this))
-    , impl(static_cast<Impl*>(baseImpl.get())) {
+GeoJSONSource::GeoJSONSource(const std::string& id, const GeoJSONOptions options)
+    : Source(SourceType::GeoJSON,
+             std::make_unique<GeoJSONSource::Impl>(std::move(id), *this, options)),
+      impl(static_cast<Impl*>(baseImpl.get())) {
 }
 
 void GeoJSONSource::setURL(const std::string& url) {
     impl->setURL(url);
 }
 
-void GeoJSONSource::setGeoJSON(GeoJSON&& geoJSON) {
-    impl->setGeoJSON(std::move(geoJSON));
+void GeoJSONSource::setGeoJSON(const mapbox::geojson::geojson& geoJSON) {
+    impl->setGeoJSON(geoJSON);
+}
+
+std::string GeoJSONSource::getURL() {
+    return impl->getURL();
 }
 
 } // namespace style