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
mapbox · Jul 27, 2016 · 9ecc0d9 · 9ecc0d9
1 parent 6edaf2d
commit 9ecc0d9
Show file tree

Hide file tree

Showing 22 changed files with 294 additions and 133 deletions.
diff --git a/.mason b/.mason
diff --git a/configure b/configure
@@ -119,7 +119,9 @@ print_flags nunicode static_libs cflags ldflags
 print_flags libzip static_libs cflags ldflags
 print_flags geometry cflags
 print_flags geojson static_libs cflags ldflags
-print_flags geojsonvt static_libs cflags ldflags
+print_flags geojsonvt cflags
+print_flags supercluster cflags
+print_flags kdbush cflags
 print_flags variant cflags
 print_flags rapidjson static_libs cflags ldflags
 print_flags gtest static_libs cflags ldflags

diff --git a/include/mbgl/style/conversion/source.hpp b/include/mbgl/style/conversion/source.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
+#include <mbgl/style/conversion.hpp>
+#include <mbgl/style/conversion/geojson.hpp>
+#include <mbgl/style/conversion/tileset.hpp>
 #include <mbgl/style/source.hpp>
 #include <mbgl/style/sources/geojson_source.hpp>
 #include <mbgl/style/sources/raster_source.hpp>
 #include <mbgl/style/sources/vector_source.hpp>
-#include <mbgl/style/conversion.hpp>
-#include <mbgl/style/conversion/tileset.hpp>
-#include <mbgl/style/conversion/geojson.hpp>
 
 namespace mbgl {
 namespace style {
@@ -18,17 +18,17 @@ struct Converter<std::unique_ptr<Source>> {
     template <class V>
     Result<std::unique_ptr<Source>> operator()(const V& value, const std::string& id) const {
         if (!isObject(value)) {
-            return Error { "source must be an object" };
+            return Error{ "source must be an object" };
         }
 
         auto typeValue = objectMember(value, "type");
         if (!typeValue) {
-            return Error { "source must have a type" };
+            return Error{ "source must have a type" };
         }
 
         optional<std::string> type = toString(*typeValue);
         if (!type) {
-            return Error { "source type must be a string" };
+            return Error{ "source type must be a string" };
         }
 
         if (*type == "raster") {
@@ -38,7 +38,7 @@ struct Converter<std::unique_ptr<Source>> {
         } else if (*type == "geojson") {
             return convertGeoJSONSource(id, value);
         } else {
-            return Error { "invalid source type" };
+            return Error{ "invalid source type" };
         }
     }
 
@@ -57,14 +57,15 @@ struct Converter<std::unique_ptr<Source>> {
 
         optional<std::string> url = toString(*urlVal);
         if (!url) {
-            return Error { "source url must be a string" };
+            return Error{ "source url must be a string" };
         }
 
         return *url;
     }
 
     template <class V>
-    Result<std::unique_ptr<Source>> convertRasterSource(const std::string& id, const V& value) const {
+    Result<std::unique_ptr<Source>> convertRasterSource(const std::string& id,
+                                                        const V& value) const {
         Result<variant<std::string, Tileset>> urlOrTileset = convertURLOrTileset(value);
         if (!urlOrTileset) {
             return urlOrTileset.error();
@@ -75,7 +76,7 @@ struct Converter<std::unique_ptr<Source>> {
         if (tileSizeValue) {
             optional<float> size = toNumber(*tileSizeValue);
             if (!size || *size < 0 || *size > std::numeric_limits<uint16_t>::max()) {
-                return Error { "invalid tileSize" };
+                return Error{ "invalid tileSize" };
             }
             tileSize = *size;
         }
@@ -84,7 +85,8 @@ struct Converter<std::unique_ptr<Source>> {
     }
 
     template <class V>
-    Result<std::unique_ptr<Source>> convertVectorSource(const std::string& id, const V& value) const {
+    Result<std::unique_ptr<Source>> convertVectorSource(const std::string& id,
+                                                        const V& value) const {
         Result<variant<std::string, Tileset>> urlOrTileset = convertURLOrTileset(value);
         if (!urlOrTileset) {
             return urlOrTileset.error();
@@ -94,13 +96,70 @@ struct Converter<std::unique_ptr<Source>> {
     }
 
     template <class V>
-    Result<std::unique_ptr<Source>> convertGeoJSONSource(const std::string& id, const V& value) const {
+    Result<std::unique_ptr<Source>> convertGeoJSONSource(const std::string& id,
+                                                         const V& value) const {
         auto dataValue = objectMember(value, "data");
         if (!dataValue) {
-            return Error { "GeoJSON source must have a data value" };
+            return Error{ "GeoJSON source must have a data value" };
+        }
+
+        GeoJSONOptions options;
+
+        const auto maxzoomValue = objectMember(value, "maxzoom");
+        if (maxzoomValue) {
+            if (toNumber(*maxzoomValue)) {
+                options.maxzoom = static_cast<uint8_t>(*toNumber(*maxzoomValue));
+            } else {
+                return Error{ "GeoJSON source maxzoom value must be a number" };
+            }
+        }
+
+        const auto bufferValue = objectMember(value, "buffer");
+        if (bufferValue) {
+            if (toNumber(*bufferValue)) {
+                options.buffer = static_cast<uint16_t>(*toNumber(*bufferValue));
+            } else {
+                return Error{ "GeoJSON source buffer value must be a number" };
+            }
+        }
+
+        const auto toleranceValue = objectMember(value, "tolerance");
+        if (toleranceValue) {
+            if (toNumber(*toleranceValue)) {
+                options.tolerance = static_cast<double>(*toNumber(*toleranceValue));
+            } else {
+                return Error{ "GeoJSON source tolerance value must be a number" };
+            }
+        }
+
+        const auto clusterValue = objectMember(value, "cluster");
+        if (clusterValue) {
+            if (toBool(*clusterValue)) {
+                options.cluster = *toBool(*clusterValue);
+            } else {
+                return Error{ "GeoJSON source cluster value must be a boolean" };
+            }
+        }
+
+        const auto clusterMaxZoomValue = objectMember(value, "clusterMaxZoom");
+        if (clusterMaxZoomValue) {
+            if (toNumber(*clusterMaxZoomValue)) {
+                options.clusterMaxZoom = static_cast<uint8_t>(*toNumber(*clusterMaxZoomValue));
+            } else {
+                return Error{ "GeoJSON source clusterMaxZoom value must be a number" };
+            }
+        }
+
+        const auto clusterRadiusValue = objectMember(value, "clusterRadius");
+        if (clusterRadiusValue) {
+            if (toNumber(*clusterRadiusValue)) {
+                options.clusterRadius = static_cast<double>(*toNumber(*clusterRadiusValue));
+            } else {
+                return Error{ "GeoJSON source clusterRadius value must be a number" };
+            }
         }
 
-        auto result = std::make_unique<GeoJSONSource>(id);
+        auto result = std::make_unique<GeoJSONSource>(id, options);
 
         if (isObject(*dataValue)) {
             Result<GeoJSON> geoJSON = convertGeoJSON(*dataValue);
@@ -111,7 +170,7 @@ struct Converter<std::unique_ptr<Source>> {
         } else if (toString(*dataValue)) {
             result->setURL(*toString(*dataValue));
         } else {
-            return Error { "GeoJSON data must be a URL or an object" };
+            return Error{ "GeoJSON data must be a URL or an object" };
         }
 
         return std::move(result);

diff --git a/include/mbgl/style/sources/geojson_source.hpp b/include/mbgl/style/sources/geojson_source.hpp
@@ -3,15 +3,46 @@
 #include <mbgl/style/source.hpp>
 #include <mbgl/util/geojson.hpp>
 
+#include <mapbox/geojson.hpp>
+
+namespace mapbox {
+
+namespace geojsonvt {
+class GeoJSONVT;
+} // namespace geojsonvt
+
+namespace supercluster {
+class Supercluster;
+} // namespace supercluster
+
+} // namespace mapbox
+
 namespace mbgl {
 namespace style {
 
+using GeoJSONVTPointer = std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>;
+using SuperclusterPointer = std::unique_ptr<mapbox::supercluster::Supercluster>;
+
+struct GeoJSONOptions {
+    // GeoJSON-VT options
+    uint8_t maxzoom = 18;
+    uint16_t buffer = 128;
+    double tolerance = 0.375;
+
+    // Supercluster options
+    bool cluster = false;
+    uint16_t clusterRadius = 50;
+    uint8_t clusterMaxZoom = 17;
+};
+
 class GeoJSONSource : public Source {
 public:
-    GeoJSONSource(const std::string& id);
+    GeoJSONSource(const std::string& id, const GeoJSONOptions options_ = GeoJSONOptions());
 
     void setURL(const std::string& url);
-    void setGeoJSON(GeoJSON&&);
+    void setGeoJSON(const GeoJSON&);
+
+    std::string getURL();
 
     // Private implementation
 

diff --git a/include/mbgl/util/geojson.hpp b/include/mbgl/util/geojson.hpp
@@ -1,22 +1,10 @@
 #pragma once
 
-#include <memory>
-
-namespace mapbox {
-namespace geojsonvt {
-class GeoJSONVT;
-} // namespace geojsonvt
-} // namespace mapbox
+#include <mapbox/geojson.hpp>
 
 namespace mbgl {
 
-class GeoJSON {
-public:
-    GeoJSON(std::unique_ptr<mapbox::geojsonvt::GeoJSONVT>);
-    GeoJSON(GeoJSON&&);
-    ~GeoJSON();
-
-    std::unique_ptr<mapbox::geojsonvt::GeoJSONVT> impl;
-};
+using GeoJSON = mapbox::geojson::geojson;
+using FeatureCollection = mapbox::geojson::feature_collection;
 
 } // namespace mbgl
diff --git a/mbgl.gypi b/mbgl.gypi
@@ -196,6 +196,8 @@
           '<@(geometry_cflags)',
           '<@(geojson_cflags)',
           '<@(geojsonvt_cflags)',
+          '<@(supercluster_cflags)',
+          '<@(kdbush_cflags)',
           '<@(rapidjson_cflags)',
           '<@(variant_cflags)',
           '<@(earcut_cflags)',
@@ -313,12 +315,14 @@
         'cflags_cc': [
           '<@(variant_cflags)',
           '<@(geometry_cflags)',
+          '<@(geojson_cflags)',
           '<@(unique_resource_cflags)',
         ],
         'xcode_settings': {
           'OTHER_CPLUSPLUSFLAGS': [
             '<@(variant_cflags)',
             '<@(geometry_cflags)',
+            '<@(geojson_cflags)',
             '<@(unique_resource_cflags)',
           ],
         },

diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "express": "^4.11.1",
     "mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#4d1f89514bf03536c8e682439df165c33a37122a",
     "mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#83b1a3e5837d785af582efd5ed1a212f2df6a4ae",
-    "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#fbd511a54a8c27d86c5b2d7cdab94d0e507ba8e8",
+    "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#346aebbb3cf7af572e066e37c703634ceda95be2",
     "node-gyp": "^3.3.1",
     "request": "^2.72.0",
     "tape": "^4.5.1"

diff --git a/platform/android/scripts/configure.sh b/platform/android/scripts/configure.sh
@@ -12,6 +12,8 @@ LIBZIP_VERSION=0.11.2
 GEOMETRY_VERSION=0.8.0
 GEOJSON_VERSION=0.1.4
 GEOJSONVT_VERSION=6.1.2
+SUPERCLUSTER_VERSION=0.2.0
+KDBUSH_VERSION=0.1.1
 VARIANT_VERSION=1.1.0
 RAPIDJSON_VERSION=1.0.2
 JNI_HPP_VERSION=2.0.0
+0 −1		.travis.yml
+23 −4		README.md
+2 −0		mason
+39 −58		mason.sh
+12 −2		scripts/libpng/1.6.20/script.sh
+15 −0		scripts/supercluster/0.2.0/.travis.yml
+34 −0		scripts/supercluster/0.2.0/script.sh
+14 −17		test/cpp11_header_install.sh