[core] Eliminate TileData dependency on TileSource

This commit is contained in:
John Firebaugh
2016-06-06 17:15:23 -07:00
committed by Konstantin Käfer
parent dbf16440a6
commit b45713e5e9
10 changed files with 53 additions and 24 deletions

View File

@@ -21,8 +21,7 @@ RasterTileData::RasterTileData(const OverscaledTileID& id_,
const auto resource = Resource::tile(
tileset.tiles.at(0), parameters.pixelRatio, id_.canonical.x,
id_.canonical.y, id_.canonical.z);
setTileSource(
std::make_unique<ImageTileSource>(*this, resource, parameters.fileSource));
tileSource = std::make_unique<ImageTileSource>(*this, resource, parameters.fileSource);
}
void RasterTileData::setError(std::exception_ptr err) {
@@ -68,6 +67,10 @@ Bucket* RasterTileData::getBucket(const style::Layer&) {
return bucket.get();
}
void RasterTileData::setNecessity(Necessity necessity) {
tileSource->setNecessity(static_cast<TileSource::Necessity>(necessity));
}
void RasterTileData::cancel() {
workRequest.reset();
}