diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-20 17:11:50 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-02 08:45:09 -0700 |
commit | 3f0c89d633a5056006557ad5f4b9e446807d00ee (patch) | |
tree | 5405c50dd26a5a393a982e8e0f76b764dbbccf48 /include/mbgl | |
parent | 197751bace6181f2c2dbe4c890f277a0dc7e58b1 (diff) | |
download | qtlocation-mapboxgl-3f0c89d633a5056006557ad5f4b9e446807d00ee.tar.gz |
[core] Refactor Source::*Impls into RenderSources and TilePyramid
Diffstat (limited to 'include/mbgl')
-rw-r--r-- | include/mbgl/style/source.hpp | 1 | ||||
-rw-r--r-- | include/mbgl/style/sources/geojson_source.hpp | 19 |
2 files changed, 1 insertions, 19 deletions
diff --git a/include/mbgl/style/source.hpp b/include/mbgl/style/source.hpp index e49f1fc273..66fc2afd25 100644 --- a/include/mbgl/style/source.hpp +++ b/include/mbgl/style/source.hpp @@ -56,7 +56,6 @@ public: std::unique_ptr<Source> copy(const std::string& id) const; optional<std::string> getAttribution() const; - optional<Range<uint8_t>> getZoomRange() const; // Private implementation class Impl; diff --git a/include/mbgl/style/sources/geojson_source.hpp b/include/mbgl/style/sources/geojson_source.hpp index ede0301725..5b39d7821b 100644 --- a/include/mbgl/style/sources/geojson_source.hpp +++ b/include/mbgl/style/sources/geojson_source.hpp @@ -4,26 +4,9 @@ #include <mbgl/util/geojson.hpp> #include <mbgl/util/optional.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; @@ -38,7 +21,7 @@ struct GeoJSONOptions { class GeoJSONSource : public Source { public: - GeoJSONSource(const std::string& id, const GeoJSONOptions options_ = GeoJSONOptions()); + GeoJSONSource(const std::string& id, const GeoJSONOptions& = {}); void setURL(const std::string& url); void setGeoJSON(const GeoJSON&); |