summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2017-09-15 23:35:26 +0200
committerKonstantin Käfer <mail@kkaefer.com>2017-09-21 12:20:54 +0200
commit1a684c1f48ef9fdc40ffcaacf1abe33b28370562 (patch)
treec91148a4d1b33bc7df187d2ba9ea3ff913964b79 /src
parentc9cb4ef6248cfd2f562b0931d9dc93e4f7088b51 (diff)
downloadqtlocation-mapboxgl-1a684c1f48ef9fdc40ffcaacf1abe33b28370562.tar.gz
[core] keep tiles renderable even if a subsequent error occurs
Since 9a9408e8111bcdcd0fcb9a93112d61ab8fce0601, we marked tiles as non-renderable if an error occured. This lead to situations where a tile was loaded + parsed successfully, then a revalidation attempt occured (e.g. because the resource was stale) which failed. In this case, we used to mark the tile as non-renderable although we could've used the perfectly parsed (stale) resource.
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/tile/geometry_tile.cpp2
-rw-r--r--src/mbgl/tile/raster_tile.cpp3
2 files changed, 0 insertions, 5 deletions
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index 017861884b..fafd9f7ae7 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -79,7 +79,6 @@ void GeometryTile::markObsolete() {
void GeometryTile::setError(std::exception_ptr err) {
loaded = true;
- renderable = false;
observer->onTileError(*this, err);
}
@@ -174,7 +173,6 @@ void GeometryTile::onPlacement(PlacementResult result) {
void GeometryTile::onError(std::exception_ptr err) {
loaded = true;
pending = false;
- renderable = false;
observer->onTileError(*this, err);
}
diff --git a/src/mbgl/tile/raster_tile.cpp b/src/mbgl/tile/raster_tile.cpp
index b940e342d7..76c74ab964 100644
--- a/src/mbgl/tile/raster_tile.cpp
+++ b/src/mbgl/tile/raster_tile.cpp
@@ -29,7 +29,6 @@ void RasterTile::cancel() {
void RasterTile::setError(std::exception_ptr err) {
loaded = true;
- renderable = false;
observer->onTileError(*this, err);
}
@@ -49,9 +48,7 @@ void RasterTile::onParsed(std::unique_ptr<RasterBucket> result) {
}
void RasterTile::onError(std::exception_ptr err) {
- bucket.reset();
loaded = true;
- renderable = false;
observer->onTileError(*this, err);
}