From 040bdb1994106516a27edfef8c83c8d6aea3ec87 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 13 Jun 2016 13:00:20 -0700 Subject: [PATCH] =?UTF-8?q?[core]=20TileSource=20=E2=87=A2=20TileLoader?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mbgl/tile/geometry_tile.cpp | 1 - src/mbgl/tile/raster_tile.cpp | 6 +++--- src/mbgl/tile/raster_tile.hpp | 4 ++-- .../tile/{tile_source.hpp => tile_loader.hpp} | 4 ++-- ...le_source_impl.hpp => tile_loader_impl.hpp} | 18 +++++++++--------- src/mbgl/tile/vector_tile.cpp | 6 +++--- src/mbgl/tile/vector_tile.hpp | 4 ++-- 7 files changed, 21 insertions(+), 22 deletions(-) rename src/mbgl/tile/{tile_source.hpp => tile_loader.hpp} (96%) rename src/mbgl/tile/{tile_source_impl.hpp => tile_loader_impl.hpp} (90%) diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index 686ed36b3..41673a79c 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include #include diff --git a/src/mbgl/tile/raster_tile.cpp b/src/mbgl/tile/raster_tile.cpp index c3838bc59..ef6782027 100644 --- a/src/mbgl/tile/raster_tile.cpp +++ b/src/mbgl/tile/raster_tile.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include @@ -17,7 +17,7 @@ RasterTile::RasterTile(const OverscaledTileID& id_, : Tile(id_), texturePool(parameters.texturePool), worker(parameters.worker), - tileSource(*this, id_, parameters, tileset) { + loader(*this, id_, parameters, tileset) { } void RasterTile::setError(std::exception_ptr err) { @@ -60,7 +60,7 @@ Bucket* RasterTile::getBucket(const style::Layer&) { } void RasterTile::setNecessity(Necessity necessity) { - tileSource.setNecessity(static_cast::Necessity>(necessity)); + loader.setNecessity(static_cast::Necessity>(necessity)); } void RasterTile::cancel() { diff --git a/src/mbgl/tile/raster_tile.hpp b/src/mbgl/tile/raster_tile.hpp index 7de5247a1..8c0923e7e 100644 --- a/src/mbgl/tile/raster_tile.hpp +++ b/src/mbgl/tile/raster_tile.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include namespace mbgl { @@ -37,7 +37,7 @@ private: gl::TexturePool& texturePool; Worker& worker; - TileSource tileSource; + TileLoader loader; std::unique_ptr workRequest; // Contains the Bucket object for the tile. Buckets are render diff --git a/src/mbgl/tile/tile_source.hpp b/src/mbgl/tile/tile_loader.hpp similarity index 96% rename from src/mbgl/tile/tile_source.hpp rename to src/mbgl/tile/tile_loader.hpp index 3ba3ab270..cab190774 100644 --- a/src/mbgl/tile/tile_source.hpp +++ b/src/mbgl/tile/tile_loader.hpp @@ -15,7 +15,7 @@ class UpdateParameters; } // namespace style template -class TileSource : private util::noncopyable { +class TileLoader : private util::noncopyable { public: // TileSources can have two states: optional or required. // - optional means that only low-cost actions should be taken to obtain the data @@ -27,7 +27,7 @@ public: Required = true, }; - TileSource(T&, + TileLoader(T&, const OverscaledTileID&, const style::UpdateParameters&, const Tileset&); diff --git a/src/mbgl/tile/tile_source_impl.hpp b/src/mbgl/tile/tile_loader_impl.hpp similarity index 90% rename from src/mbgl/tile/tile_source_impl.hpp rename to src/mbgl/tile/tile_loader_impl.hpp index 51591aa53..2e57f2f6f 100644 --- a/src/mbgl/tile/tile_source_impl.hpp +++ b/src/mbgl/tile/tile_loader_impl.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include @@ -10,7 +10,7 @@ namespace mbgl { template -TileSource::TileSource(T& tile_, +TileLoader::TileLoader(T& tile_, const OverscaledTileID& id, const style::UpdateParameters& parameters, const Tileset& tileset) @@ -25,9 +25,9 @@ TileSource::TileSource(T& tile_, fileSource(parameters.fileSource) { assert(!request); if (fileSource.supportsOptionalRequests()) { - // When supported, the first request is always optional, even if the TileSource + // When supported, the first request is always optional, even if the TileLoader // is marked as required. That way, we can let the first optional request continue - // to load when the TileSource is later changed from required to optional. If we + // to load when the TileLoader is later changed from required to optional. If we // started out with a required request, we'd have to cancel everything, including the // initial optional part of the request. loadOptional(); @@ -44,7 +44,7 @@ TileSource::TileSource(T& tile_, } template -void TileSource::loadOptional() { +void TileLoader::loadOptional() { assert(!request); resource.necessity = Resource::Optional; @@ -69,14 +69,14 @@ void TileSource::loadOptional() { } template -void TileSource::makeRequired() { +void TileLoader::makeRequired() { if (!request) { loadRequired(); } } template -void TileSource::makeOptional() { +void TileLoader::makeOptional() { if (resource.necessity == Resource::Required && request) { // Abort a potential HTTP request. request.reset(); @@ -84,7 +84,7 @@ void TileSource::makeOptional() { } template -void TileSource::loadedData(const Response& res) { +void TileLoader::loadedData(const Response& res) { if (res.error && res.error->reason != Response::Error::Reason::NotFound) { tile.setError(std::make_exception_ptr(std::runtime_error(res.error->message))); } else if (res.notModified) { @@ -100,7 +100,7 @@ void TileSource::loadedData(const Response& res) { } template -void TileSource::loadRequired() { +void TileLoader::loadRequired() { assert(!request); resource.necessity = Resource::Required; diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp index bd0fcac53..8050f51a9 100644 --- a/src/mbgl/tile/vector_tile.cpp +++ b/src/mbgl/tile/vector_tile.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include @@ -73,11 +73,11 @@ VectorTile::VectorTile(const OverscaledTileID& id_, const style::UpdateParameters& parameters, const Tileset& tileset) : GeometryTile(id_, sourceID, parameters.style, parameters.mode), - tileSource(*this, id_, parameters, tileset) { + loader(*this, id_, parameters, tileset) { } void VectorTile::setNecessity(Necessity necessity) { - tileSource.setNecessity(static_cast::Necessity>(necessity)); + loader.setNecessity(static_cast::Necessity>(necessity)); } void VectorTile::setData(std::shared_ptr data_, diff --git a/src/mbgl/tile/vector_tile.hpp b/src/mbgl/tile/vector_tile.hpp index 89fb51ebc..2568a277e 100644 --- a/src/mbgl/tile/vector_tile.hpp +++ b/src/mbgl/tile/vector_tile.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace mbgl { @@ -24,7 +24,7 @@ public: optional expires); private: - TileSource tileSource; + TileLoader loader; }; } // namespace mbgl