From 9ecc0d95979ca2fa3154f4b47c8f9fa4717fe696 Mon Sep 17 00:00:00 2001
From: Vladimir Agafonkin <agafonkin@gmail.com>
Date: Wed, 27 Jul 2016 20:18:41 +0300
Subject: 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
---
 include/mbgl/util/geojson.hpp | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'include/mbgl/util/geojson.hpp')

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
-- 
cgit v1.2.1