[core] Simplify GeometryTile::setData

5 files changed, 9 insertions, 14 deletions

diff --git a/src/mbgl/annotation/annotation_manager.cpp b/src/mbgl/annotation/annotation_manager.cpp
index c6fb4546d7..29062383be 100644
--- a/src/mbgl/annotation/annotation_manager.cpp
+++ b/src/mbgl/annotation/annotation_manager.cpp
@@ -135,13 +135,13 @@ void AnnotationManager::updateStyle(Style& style) {
     obsoleteShapeAnnotationLayers.clear();
 
     for (auto& tile : tiles) {
-        tile->setData(getTileData(tile->id.canonical), {}, {});
+        tile->setData(getTileData(tile->id.canonical));
     }
 }
 
 void AnnotationManager::addTile(AnnotationTile& tile) {
     tiles.insert(&tile);
-    tile.setData(getTileData(tile.id.canonical), {}, {});
+    tile.setData(getTileData(tile.id.canonical));
 }
 
 void AnnotationManager::removeTile(AnnotationTile& tile) {
diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp
index b702400d47..f7bf969e7c 100644
--- a/src/mbgl/tile/geojson_tile.cpp
+++ b/src/mbgl/tile/geojson_tile.cpp
@@ -112,7 +112,7 @@ GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID,
                          mapbox::geojsonvt::GeoJSONVT* geojsonvt)
     : GeometryTile(overscaledTileID, sourceID, parameters.style, parameters.mode) {
     if (geojsonvt) {
-        setData(convertTile(geojsonvt->getTile(id.canonical.z, id.canonical.x, id.canonical.y)), {}, {});
+        setData(convertTile(geojsonvt->getTile(id.canonical.z, id.canonical.x, id.canonical.y)));
     }
 }
 
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index cded448656..686ed36b39 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -33,12 +33,7 @@ void GeometryTile::setError(std::exception_ptr err) {
     observer->onTileError(*this, err);
 }
 
-void GeometryTile::setData(std::unique_ptr<GeometryTileData> data_,
-                           optional<Timestamp> modified_,
-                           optional<Timestamp> expires_) {
-    modified = modified_;
-    expires = expires_;
-
+void GeometryTile::setData(std::unique_ptr<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 4c5d08ee46..3ad54b6a95 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -29,10 +29,7 @@ public:
     ~GeometryTile();
 
     void setError(std::exception_ptr err);
-
-    void setData(std::unique_ptr<GeometryTileData>,
-                 optional<Timestamp> modified_,
-                 optional<Timestamp> expires_);
+    void setData(std::unique_ptr<GeometryTileData>);
 
     Bucket* getBucket(const style::Layer&) override;
 
diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp
index cd61b52c8e..bd0fcac53a 100644
--- a/src/mbgl/tile/vector_tile.cpp
+++ b/src/mbgl/tile/vector_tile.cpp
@@ -83,7 +83,10 @@ void VectorTile::setNecessity(Necessity necessity) {
 void VectorTile::setData(std::shared_ptr<const std::string> data_,
                          optional<Timestamp> modified_,
                          optional<Timestamp> expires_) {
-    GeometryTile::setData(data_ ? std::make_unique<VectorTileData>(data_) : nullptr, modified_, expires_);
+    modified = modified_;
+    expires = expires_;
+
+    GeometryTile::setData(data_ ? std::make_unique<VectorTileData>(data_) : nullptr);
 }
 
 Value parseValue(protozero::pbf_reader data) {