diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-07-27 21:12:38 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-07-27 21:12:38 +0200 |
| commit | 54ca0c357bf522cb01fa3ee2f1131aac9b9c0cc0 (patch) | |
| tree | 37094c77bcd5492f882ce50467f61d491187d498 /src/mbgl/tile/vector_tile.cpp | |
| parent | 9af44b75120ad079ec7a15498b6213c5baae52da (diff) | |
| download | qtlocation-mapboxgl-54ca0c357bf522cb01fa3ee2f1131aac9b9c0cc0.tar.gz | |
[core] make sure that 304 Not Modified requests correctly update tile state
Diffstat (limited to 'src/mbgl/tile/vector_tile.cpp')
| -rw-r--r-- | src/mbgl/tile/vector_tile.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp index f03f836851..e22ccf0d54 100644 --- a/src/mbgl/tile/vector_tile.cpp +++ b/src/mbgl/tile/vector_tile.cpp @@ -21,7 +21,7 @@ void VectorTile::setError(std::exception_ptr err, const bool complete) { GeometryTile::setError(err); } -void VectorTile::setData(std::shared_ptr<const std::string> data_, +void VectorTile::setData(optional<std::shared_ptr<const std::string>> data, optional<Timestamp> modified_, optional<Timestamp> expires_, const bool complete) { @@ -29,7 +29,9 @@ void VectorTile::setData(std::shared_ptr<const std::string> data_, modified = modified_; expires = expires_; - GeometryTile::setData(data_ ? std::make_unique<VectorTileData>(data_) : nullptr); + if (data) { + GeometryTile::setData(*data ? std::make_unique<VectorTileData>(*data) : nullptr); + } } } // namespace mbgl |