summaryrefslogtreecommitdiff
path: root/include/mbgl/util/geojson.hpp
diff options
context:
space:
mode:
authorVladimir Agafonkin <agafonkin@gmail.com>2016-07-27 20:18:41 +0300
committerGitHub <noreply@github.com>2016-07-27 20:18:41 +0300
commit9ecc0d95979ca2fa3154f4b47c8f9fa4717fe696 (patch)
treeb5e09683505cec994e3198a92cd8863d54979e3e /include/mbgl/util/geojson.hpp
parent6edaf2dc81ab771d1da27c939b19502753aa895f (diff)
downloadqtlocation-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 'include/mbgl/util/geojson.hpp')
-rw-r--r--include/mbgl/util/geojson.hpp18
1 files changed, 3 insertions, 15 deletions
diff --git a/include/mbgl/util/geojson.hpp b/include/mbgl/util/geojson.hpp
index 3fd8c6ac4b..b4e789a3ac 100644
--- 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