[core] introduce a RasterTileMonitor
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
#include <mbgl/tile/raster_tile_data.hpp>
|
||||
#include <mbgl/style/source.hpp>
|
||||
#include <mbgl/tile/raster_tile_source.hpp>
|
||||
#include <mbgl/storage/resource.hpp>
|
||||
#include <mbgl/storage/response.hpp>
|
||||
#include <mbgl/storage/file_source.hpp>
|
||||
@@ -9,51 +10,51 @@
|
||||
using namespace mbgl;
|
||||
|
||||
RasterTileData::RasterTileData(const OverscaledTileID& id_,
|
||||
float pixelRatio,
|
||||
const std::string& urlTemplate,
|
||||
gl::TexturePool &texturePool_,
|
||||
std::unique_ptr<RasterTileSource> tileSource_,
|
||||
gl::TexturePool& texturePool_,
|
||||
Worker& worker_,
|
||||
FileSource& fileSource,
|
||||
const std::function<void(std::exception_ptr)>& callback)
|
||||
: TileData(id_),
|
||||
: TileData(id_, std::move(tileSource_)),
|
||||
texturePool(texturePool_),
|
||||
worker(worker_) {
|
||||
const Resource resource =
|
||||
Resource::tile(urlTemplate, pixelRatio, id.canonical.x, id.canonical.y, id.canonical.z);
|
||||
req = fileSource.request(resource, [callback, this](Response res) {
|
||||
if (res.error) {
|
||||
callback(std::make_exception_ptr(std::runtime_error(res.error->message)));
|
||||
} else if (res.notModified) {
|
||||
modified = res.modified;
|
||||
expires = res.expires;
|
||||
} else if (res.noContent) {
|
||||
availableData = DataAvailability::All;
|
||||
modified = res.modified;
|
||||
expires = res.expires;
|
||||
workRequest.reset();
|
||||
bucket.reset();
|
||||
callback(nullptr);
|
||||
} else {
|
||||
modified = res.modified;
|
||||
expires = res.expires;
|
||||
|
||||
workRequest.reset();
|
||||
workRequest = worker.parseRasterTile(std::make_unique<RasterBucket>(texturePool), res.data, [this, callback] (RasterTileParseResult result) {
|
||||
workRequest.reset();
|
||||
|
||||
std::exception_ptr error;
|
||||
if (result.is<std::unique_ptr<Bucket>>()) {
|
||||
bucket = std::move(result.get<std::unique_ptr<Bucket>>());
|
||||
} else {
|
||||
error = result.get<std::exception_ptr>();
|
||||
bucket.reset();
|
||||
}
|
||||
|
||||
availableData = DataAvailability::All;
|
||||
|
||||
callback(error);
|
||||
});
|
||||
auto rasterTileSource = reinterpret_cast<RasterTileSource*>(tileSource.get());
|
||||
tileRequest = rasterTileSource->monitorTile([callback, this](std::exception_ptr err,
|
||||
std::shared_ptr<const std::string> data,
|
||||
optional<Timestamp> modified_,
|
||||
optional<Timestamp> expires_) {
|
||||
if (err) {
|
||||
callback(err);
|
||||
return;
|
||||
}
|
||||
|
||||
modified = modified_;
|
||||
expires = expires_;
|
||||
|
||||
if (!data) {
|
||||
// This is a 404 response. We're treating these as empty tiles.
|
||||
workRequest.reset();
|
||||
availableData = DataAvailability::All;
|
||||
bucket.reset();
|
||||
callback(err);
|
||||
return;
|
||||
}
|
||||
|
||||
workRequest.reset();
|
||||
workRequest = worker.parseRasterTile(std::make_unique<RasterBucket>(texturePool), data, [this, callback] (RasterTileParseResult result) {
|
||||
workRequest.reset();
|
||||
|
||||
std::exception_ptr error;
|
||||
if (result.is<std::unique_ptr<Bucket>>()) {
|
||||
bucket = std::move(result.get<std::unique_ptr<Bucket>>());
|
||||
} else {
|
||||
error = result.get<std::exception_ptr>();
|
||||
bucket.reset();
|
||||
}
|
||||
|
||||
availableData = DataAvailability::All;
|
||||
|
||||
callback(error);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -66,6 +67,6 @@ Bucket* RasterTileData::getBucket(const style::Layer&) {
|
||||
}
|
||||
|
||||
void RasterTileData::cancel() {
|
||||
req = nullptr;
|
||||
tileRequest.reset();
|
||||
workRequest.reset();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user