summaryrefslogtreecommitdiff
path: root/src/mbgl/tile/vector_tile.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-06-10 17:23:25 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-06-13 10:59:34 -0700
commitb9be5fd768f04756c976b21d2b09454caa57e848 (patch)
treecfb122bcecf469bd44da2b2b908dd756c42382fd /src/mbgl/tile/vector_tile.cpp
parent5c7dfd948ffd52f2b60dcfe052176da788f17893 (diff)
downloadqtlocation-mapboxgl-b9be5fd768f04756c976b21d2b09454caa57e848.tar.gz
[core] Simplify GeometryTile::setData
Diffstat (limited to 'src/mbgl/tile/vector_tile.cpp')
-rw-r--r--src/mbgl/tile/vector_tile.cpp5
1 files changed, 4 insertions, 1 deletions
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) {