summaryrefslogtreecommitdiff
path: root/src/mbgl/style/sources
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2018-11-06 16:11:47 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2018-11-13 17:28:26 +0200
commitbf8b24fa8d30df374ee36be781b6a572036187b9 (patch)
treebdca15eef94898a879e4f3737eee2dc44efa275f /src/mbgl/style/sources
parent4e15a0c8cd7c906908d97da10f75b35a3bc2ed9e (diff)
downloadqtlocation-mapboxgl-bf8b24fa8d30df374ee36be781b6a572036187b9.tar.gz
[build] Update to geometry v1.0.0
Diffstat (limited to 'src/mbgl/style/sources')
-rw-r--r--src/mbgl/style/sources/geojson_source_impl.cpp12
-rw-r--r--src/mbgl/style/sources/geojson_source_impl.hpp2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mbgl/style/sources/geojson_source_impl.cpp b/src/mbgl/style/sources/geojson_source_impl.cpp
index 5ec3909d3e..1c1288d978 100644
--- a/src/mbgl/style/sources/geojson_source_impl.cpp
+++ b/src/mbgl/style/sources/geojson_source_impl.cpp
@@ -17,7 +17,7 @@ public:
const mapbox::geojsonvt::Options& options)
: impl(geoJSON, options) {}
- mapbox::geometry::feature_collection<int16_t> getTile(const CanonicalTileID& tileID) final {
+ mapbox::feature::feature_collection<int16_t> getTile(const CanonicalTileID& tileID) final {
return impl.getTile(tileID.z, tileID.x, tileID.y).features;
}
@@ -27,11 +27,11 @@ private:
class SuperclusterData : public GeoJSONData {
public:
- SuperclusterData(const mapbox::geometry::feature_collection<double>& features,
+ SuperclusterData(const mapbox::feature::feature_collection<double>& features,
const mapbox::supercluster::Options& options)
: impl(features, options) {}
- mapbox::geometry::feature_collection<int16_t> getTile(const CanonicalTileID& tileID) final {
+ mapbox::feature::feature_collection<int16_t> getTile(const CanonicalTileID& tileID) final {
return impl.getTile(tileID.z, tileID.x, tileID.y);
}
@@ -50,14 +50,14 @@ GeoJSONSource::Impl::Impl(const Impl& other, const GeoJSON& geoJSON)
double scale = util::EXTENT / util::tileSize;
if (options.cluster
- && geoJSON.is<mapbox::geometry::feature_collection<double>>()
- && !geoJSON.get<mapbox::geometry::feature_collection<double>>().empty()) {
+ && geoJSON.is<mapbox::feature::feature_collection<double>>()
+ && !geoJSON.get<mapbox::feature::feature_collection<double>>().empty()) {
mapbox::supercluster::Options clusterOptions;
clusterOptions.maxZoom = options.clusterMaxZoom;
clusterOptions.extent = util::EXTENT;
clusterOptions.radius = ::round(scale * options.clusterRadius);
data = std::make_unique<SuperclusterData>(
- geoJSON.get<mapbox::geometry::feature_collection<double>>(), clusterOptions);
+ geoJSON.get<mapbox::feature::feature_collection<double>>(), clusterOptions);
} else {
mapbox::geojsonvt::Options vtOptions;
vtOptions.maxZoom = options.maxzoom;
diff --git a/src/mbgl/style/sources/geojson_source_impl.hpp b/src/mbgl/style/sources/geojson_source_impl.hpp
index a524bab9f2..957cf53081 100644
--- a/src/mbgl/style/sources/geojson_source_impl.hpp
+++ b/src/mbgl/style/sources/geojson_source_impl.hpp
@@ -14,7 +14,7 @@ namespace style {
class GeoJSONData {
public:
virtual ~GeoJSONData() = default;
- virtual mapbox::geometry::feature_collection<int16_t> getTile(const CanonicalTileID&) = 0;
+ virtual mapbox::feature::feature_collection<int16_t> getTile(const CanonicalTileID&) = 0;
};
class GeoJSONSource::Impl : public Source::Impl {