From 01f31a82a8be87b25ea3b466a9248e2344fb52ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Fri, 15 Jan 2016 11:39:12 +0100 Subject: [PATCH] [core] update the modified/expires debug info for unmodified responses as well --- src/mbgl/map/raster_tile_data.cpp | 6 +++--- src/mbgl/map/vector_tile_data.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mbgl/map/raster_tile_data.cpp b/src/mbgl/map/raster_tile_data.cpp index 19baa26e5..da2dd808b 100644 --- a/src/mbgl/map/raster_tile_data.cpp +++ b/src/mbgl/map/raster_tile_data.cpp @@ -40,6 +40,9 @@ void RasterTileData::request(const std::string& url, return; } + modified = res.modified; + expires = res.expires; + if (res.notModified) { // We got the same data again. Abort early. return; @@ -50,9 +53,6 @@ void RasterTileData::request(const std::string& url, state = State::loaded; } - modified = res.modified; - expires = res.expires; - workRequest.reset(); workRequest = worker.parseRasterTile(std::make_unique(texturePool), res.data, [this, callback] (RasterTileParseResult result) { workRequest.reset(); diff --git a/src/mbgl/map/vector_tile_data.cpp b/src/mbgl/map/vector_tile_data.cpp index ee43373a6..4bf686b73 100644 --- a/src/mbgl/map/vector_tile_data.cpp +++ b/src/mbgl/map/vector_tile_data.cpp @@ -41,6 +41,9 @@ VectorTileData::VectorTileData(const TileID& id_, // messages from being displayed again, e.g. after a connection trouble cleared up. error = nullptr; + modified = modified_; + expires = expires_; + if (!tile) { // This is a 404 response. We're treating these as empty tiles. state = State::parsed; @@ -55,9 +58,6 @@ VectorTileData::VectorTileData(const TileID& id_, state = State::partial; } - modified = modified_; - expires = expires_; - // Kick off a fresh parse of this tile. This happens when the tile is new, or // when tile data changed. Replacing the workdRequest will cancel a pending work // request in case there is one.