diff --git a/src/mbgl/map/geometry_tile.hpp b/src/mbgl/map/geometry_tile.hpp index f94ce15d7..f303a32bd 100644 --- a/src/mbgl/map/geometry_tile.hpp +++ b/src/mbgl/map/geometry_tile.hpp @@ -38,12 +38,12 @@ public: class GeometryTileLayer : public mbgl::util::noncopyable { public: virtual std::size_t featureCount() const = 0; - virtual const util::ptr feature(std::size_t i) const = 0; + virtual util::ptr feature(std::size_t i) const = 0; }; class GeometryTile : public mbgl::util::noncopyable { public: - virtual const util::ptr getLayer(const std::string&) const = 0; + virtual util::ptr getLayer(const std::string&) const = 0; }; class GeometryTileFeatureExtractor { diff --git a/src/mbgl/map/vector_tile.cpp b/src/mbgl/map/vector_tile.cpp index 9ea57f4f6..e9ae52e9a 100644 --- a/src/mbgl/map/vector_tile.cpp +++ b/src/mbgl/map/vector_tile.cpp @@ -101,7 +101,7 @@ VectorTile::VectorTile(pbf tile_pbf) { } } -const util::ptr VectorTile::getLayer(const std::string& name) const { +util::ptr VectorTile::getLayer(const std::string& name) const { auto layer_it = layers.find(name); if (layer_it != layers.end()) { return layer_it->second; @@ -127,6 +127,6 @@ VectorTileLayer::VectorTileLayer(pbf layer_pbf) { } } -const util::ptr VectorTileLayer::feature(std::size_t i) const { +util::ptr VectorTileLayer::feature(std::size_t i) const { return std::make_shared(features.at(i), *this); } diff --git a/src/mbgl/map/vector_tile.hpp b/src/mbgl/map/vector_tile.hpp index a7521cd32..b27f6bb39 100644 --- a/src/mbgl/map/vector_tile.hpp +++ b/src/mbgl/map/vector_tile.hpp @@ -28,7 +28,7 @@ public: VectorTileLayer(pbf); virtual std::size_t featureCount() const { return features.size(); } - virtual const util::ptr feature(std::size_t) const; + virtual util::ptr feature(std::size_t) const; private: friend class VectorTile; @@ -45,7 +45,7 @@ class VectorTile : public GeometryTile { public: VectorTile(pbf); - virtual const util::ptr getLayer(const std::string&) const; + virtual util::ptr getLayer(const std::string&) const; private: std::map> layers;