diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2017-06-20 11:50:05 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2017-06-21 17:18:08 -0700 |
commit | 0f300d8dcda0fab8c6edf7b4759dd545f790c63f (patch) | |
tree | 49a4447d9fcddb05344b73684c12b6e23dadd156 | |
parent | 4ea47151796cb885fbcb2dd3803aa3f7132467bb (diff) | |
download | qtlocation-mapboxgl-0f300d8dcda0fab8c6edf7b4759dd545f790c63f.tar.gz |
[core] shared feature data for GeoJSONTileData objects
-rw-r--r-- | src/mbgl/tile/geojson_tile.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp index 17067571da..622d35d6d4 100644 --- a/src/mbgl/tile/geojson_tile.cpp +++ b/src/mbgl/tile/geojson_tile.cpp @@ -54,14 +54,17 @@ public: class GeoJSONTileData : public GeometryTileData, public GeometryTileLayer { public: - mapbox::geometry::feature_collection<int16_t> features; - GeoJSONTileData(mapbox::geometry::feature_collection<int16_t> features_) + : features(std::make_shared<mapbox::geometry::feature_collection<int16_t>>( + std::move(features_))) { + } + + GeoJSONTileData(std::shared_ptr<const mapbox::geometry::feature_collection<int16_t>> features_) : features(std::move(features_)) { } std::unique_ptr<GeometryTileData> clone() const override { - return std::make_unique<GeoJSONTileData>(*this); + return std::make_unique<GeoJSONTileData>(features); } const GeometryTileLayer* getLayer(const std::string&) const override { @@ -73,12 +76,15 @@ public: } std::size_t featureCount() const override { - return features.size(); + return features->size(); } std::unique_ptr<GeometryTileFeature> getFeature(std::size_t i) const override { - return std::make_unique<GeoJSONTileFeature>(features[i]); + return std::make_unique<GeoJSONTileFeature>((*features)[i]); } + +private: + std::shared_ptr<const mapbox::geometry::feature_collection<int16_t>> features; }; GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID, |