[core] Simplify GeometryTile::setData

2016-06-10 17:23:25 -07:00
parent 5c7dfd948f
commit b9be5fd768
5 changed files with 9 additions and 14 deletions
--- 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) {