diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2017-09-15 23:35:26 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2017-09-21 12:21:18 +0200 |
commit | 6dfb4ecc439b2a50b65f396142885c47161af28b (patch) | |
tree | e93e25e3b725110b51b8e81e7e1243f6cf294948 /src/mbgl | |
parent | 9613582417dd32c6e943eb23b3aad620a5404f1e (diff) | |
download | qtlocation-mapboxgl-6dfb4ecc439b2a50b65f396142885c47161af28b.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/mbgl')
-rw-r--r-- | src/mbgl/tile/geometry_tile.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/tile/raster_tile.cpp | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index 29ba7d42cd..c4d5d3bae3 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -58,7 +58,6 @@ void GeometryTile::cancel() { void GeometryTile::setError(std::exception_ptr err) { loaded = true; - renderable = false; observer->onTileError(*this, err); } @@ -144,7 +143,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 b1a901e565..770561e703 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<Bucket> result) { } void RasterTile::onError(std::exception_ptr err) { - bucket.reset(); loaded = true; - renderable = false; observer->onTileError(*this, err); } |