diff options
Diffstat (limited to 'src/mbgl/style')
-rw-r--r-- | src/mbgl/style/style.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/style/style.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/style/style_bucket_parameters.hpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 01c566308e..5c3f15d292 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -395,7 +395,7 @@ void Style::onSourceError(Source& source, std::exception_ptr error) { observer->onResourceError(error); } -void Style::onTileLoaded(Source& source, const TileID& tileID, bool isNewTile) { +void Style::onTileLoaded(Source& source, const OverscaledTileID& tileID, bool isNewTile) { if (isNewTile) { shouldReparsePartialTiles = true; } @@ -404,10 +404,10 @@ void Style::onTileLoaded(Source& source, const TileID& tileID, bool isNewTile) { observer->onResourceLoaded(); } -void Style::onTileError(Source& source, const TileID& tileID, std::exception_ptr error) { +void Style::onTileError(Source& source, const OverscaledTileID& tileID, std::exception_ptr error) { lastError = error; Log::Error(Event::Style, "Failed to load tile %s for source %s: %s", - std::string(tileID).c_str(), source.id.c_str(), util::toString(error).c_str()); + util::toString(tileID).c_str(), source.id.c_str(), util::toString(error).c_str()); observer->onTileError(source, tileID, error); observer->onResourceError(error); } diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index bfeebc28d5..76da484cab 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -148,8 +148,8 @@ private: // Source::Observer implementation. void onSourceLoaded(Source&) override; void onSourceError(Source&, std::exception_ptr) override; - void onTileLoaded(Source&, const TileID&, bool isNewTile) override; - void onTileError(Source&, const TileID&, std::exception_ptr) override; + void onTileLoaded(Source&, const OverscaledTileID&, bool isNewTile) override; + void onTileError(Source&, const OverscaledTileID&, std::exception_ptr) override; void onPlacementRedone() override; Observer nullObserver; diff --git a/src/mbgl/style/style_bucket_parameters.hpp b/src/mbgl/style/style_bucket_parameters.hpp index 402e5810d3..ce3fc6ac7e 100644 --- a/src/mbgl/style/style_bucket_parameters.hpp +++ b/src/mbgl/style/style_bucket_parameters.hpp @@ -20,7 +20,7 @@ class FeatureIndex; class StyleBucketParameters { public: - StyleBucketParameters(const TileID& tileID_, + StyleBucketParameters(const OverscaledTileID& tileID_, const GeometryTileLayer& layer_, const std::atomic<TileData::State>& state_, uintptr_t tileUID_, @@ -47,7 +47,7 @@ public: void eachFilteredFeature(const Filter&, std::function<void (const GeometryTileFeature&, std::size_t index, const std::string& layerName)>); - const TileID& tileID; + const OverscaledTileID& tileID; const GeometryTileLayer& layer; const std::atomic<TileData::State>& state; uintptr_t tileUID; |