diff options
| author | Vladimir Agafonkin <agafonkin@gmail.com> | 2016-07-27 20:18:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-27 20:18:41 +0300 |
| commit | 9ecc0d95979ca2fa3154f4b47c8f9fa4717fe696 (patch) | |
| tree | b5e09683505cec994e3198a92cd8863d54979e3e /platform/ios | |
| parent | 6edaf2dc81ab771d1da27c939b19502753aa895f (diff) | |
| download | qtlocation-mapboxgl-9ecc0d95979ca2fa3154f4b47c8f9fa4717fe696.tar.gz | |
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
Diffstat (limited to 'platform/ios')
| -rw-r--r-- | platform/ios/ios.xcodeproj/project.pbxproj | 6 | ||||
| -rw-r--r-- | platform/ios/scripts/configure.sh | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index c9f7821e8f..bfd5a5e8a9 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -1713,6 +1713,7 @@ "$(OTHER_CFLAGS)", "$(variant_cflags)", "$(geometry_cflags)", + "$(geojson_cflags)", ); PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.test; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1731,6 +1732,7 @@ "$(OTHER_CFLAGS)", "$(variant_cflags)", "$(geometry_cflags)", + "$(geojson_cflags)", ); PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.test; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1763,6 +1765,7 @@ "$(rapidjson_cflags)", "$(variant_cflags)", "$(geometry_cflags)", + "$(geojson_cflags)", ); OTHER_LDFLAGS = ( "$(sqlite_ldflags)", @@ -1804,6 +1807,7 @@ "$(rapidjson_cflags)", "$(variant_cflags)", "$(geometry_cflags)", + "$(geojson_cflags)", ); OTHER_LDFLAGS = ( "$(sqlite_ldflags)", @@ -1862,6 +1866,7 @@ "$(rapidjson_cflags)", "$(variant_cflags)", "$(geometry_cflags)", + "$(geojson_cflags)", ); OTHER_LDFLAGS = ( "-ObjC", @@ -1897,6 +1902,7 @@ "$(rapidjson_cflags)", "$(variant_cflags)", "$(geometry_cflags)", + "$(geojson_cflags)", ); OTHER_LDFLAGS = ( "-ObjC", diff --git a/platform/ios/scripts/configure.sh b/platform/ios/scripts/configure.sh index 200cedafac..82599f0fe9 100644 --- a/platform/ios/scripts/configure.sh +++ b/platform/ios/scripts/configure.sh @@ -8,6 +8,8 @@ ZLIB_VERSION=system 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 GTEST_VERSION=1.7.0 |