[core] const consistency

5 files changed, 7 insertions, 7 deletions

diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp
index ab596bd9ba..09c12dff8f 100644
--- a/src/mbgl/tile/geojson_tile.cpp
+++ b/src/mbgl/tile/geojson_tile.cpp
@@ -40,7 +40,7 @@ private:
 class GeoJSONTileData : public GeometryTileData {
 public:
     GeoJSONTileData(std::shared_ptr<GeoJSONTileLayer>);
-    util::ptr<GeometryTileLayer> getLayer(const std::string&) const override;
+    util::ptr<const GeometryTileLayer> getLayer(const std::string&) const override;
 
 private:
     const std::shared_ptr<GeoJSONTileLayer> layer;
@@ -136,7 +136,7 @@ util::ptr<const GeometryTileFeature> GeoJSONTileLayer::getFeature(std::size_t i)
 GeoJSONTileData::GeoJSONTileData(std::shared_ptr<GeoJSONTileLayer> layer_) : layer(std::move(layer_)) {
 }
 
-util::ptr<GeometryTileLayer> GeoJSONTileData::getLayer(const std::string&) const {
+util::ptr<const GeometryTileLayer> GeoJSONTileData::getLayer(const std::string&) const {
     // We're ignoring the layer name because GeoJSON tiles only have one layer.
     return layer;
 }
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index daa358420b..e4e2085d05 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -60,7 +60,7 @@ std::vector<std::unique_ptr<Layer>> GeometryTile::cloneStyleLayers() const {
     return result;
 }
 
-void GeometryTile::setData(std::unique_ptr<GeometryTileData> data_) {
+void GeometryTile::setData(std::unique_ptr<const GeometryTileData> data_) {
     if (!data_) {
         // This is a 404 response. We're treating these as empty tiles.
         workRequest.reset();
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index 891aba0432..adbe81e29f 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -31,7 +31,7 @@ public:
     ~GeometryTile() override;
 
     void setError(std::exception_ptr err);
-    void setData(std::unique_ptr<GeometryTileData>);
+    void setData(std::unique_ptr<const GeometryTileData>);
 
     Bucket* getBucket(const style::Layer&) override;
 
diff --git a/src/mbgl/tile/geometry_tile_data.hpp b/src/mbgl/tile/geometry_tile_data.hpp
index 4055a80ecf..dcc8e66fcb 100644
--- a/src/mbgl/tile/geometry_tile_data.hpp
+++ b/src/mbgl/tile/geometry_tile_data.hpp
@@ -58,7 +58,7 @@ public:
 class GeometryTileData : private util::noncopyable {
 public:
     virtual ~GeometryTileData() = default;
-    virtual util::ptr<GeometryTileLayer> getLayer(const std::string&) const = 0;
+    virtual util::ptr<const GeometryTileLayer> getLayer(const std::string&) const = 0;
 };
 
 // classifies an array of rings into polygons with outer rings and holes
diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp
index 1ba30d8695..e96080ce8c 100644
--- a/src/mbgl/tile/vector_tile.cpp
+++ b/src/mbgl/tile/vector_tile.cpp
@@ -59,7 +59,7 @@ class VectorTileData : public GeometryTileData {
 public:
     VectorTileData(std::shared_ptr<const std::string> data);
 
-    util::ptr<GeometryTileLayer> getLayer(const std::string&) const override;
+    util::ptr<const GeometryTileLayer> getLayer(const std::string&) const override;
 
 private:
     std::shared_ptr<const std::string> data;
@@ -242,7 +242,7 @@ VectorTileData::VectorTileData(std::shared_ptr<const std::string> data_)
     : data(std::move(data_)) {
 }
 
-util::ptr<GeometryTileLayer> VectorTileData::getLayer(const std::string& name) const {
+util::ptr<const GeometryTileLayer> VectorTileData::getLayer(const std::string& name) const {
     if (!parsed) {
         parsed = true;
         protozero::pbf_reader tile_pbf(*data);