[core] use stale raster tiles

This commit is contained in:
Konstantin Käfer
2016-01-07 12:38:07 +01:00
parent 180b3f125f
commit 3f5d02ee65

View File

@@ -26,23 +26,25 @@ void RasterTileData::request(const std::string& url,
FileSource* fs = util::ThreadContext::getFileSource();
req = fs->request({ Resource::Kind::Tile, url }, [url, callback, this](Response res) {
if (res.stale) {
// Only handle fresh responses.
return;
}
req = nullptr;
if (res.error) {
if (res.error->reason == Response::Error::Reason::NotFound) {
// This is a 404 response. We're treating these as empty tiles.
workRequest.reset();
state = State::parsed;
bucket.reset();
} else {
// This is a different error, e.g. a connection or server error.
error = std::make_exception_ptr(std::runtime_error(res.error->message));
state = State::obsolete;
}
callback();
return;
}
if (res.notModified) {
// We got the same data again. Abort early.
return;
}
if (state == State::loading) {
// Only overwrite the state when we didn't have a previous tile.
state = State::loaded;
@@ -51,6 +53,7 @@ void RasterTileData::request(const std::string& url,
modified = res.modified;
expires = res.expires;
workRequest.reset();
workRequest = worker.parseRasterTile(std::make_unique<RasterBucket>(texturePool), res.data, [this, callback] (RasterTileParseResult result) {
workRequest.reset();
if (state != State::loaded) {
@@ -63,6 +66,7 @@ void RasterTileData::request(const std::string& url,
} else {
error = result.get<std::exception_ptr>();
state = State::obsolete;
bucket.reset();
}
callback();