diff options
-rw-r--r-- | include/mbgl/map/map_observer.hpp | 5 | ||||
-rw-r--r-- | src/mbgl/map/map.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/style/source_observer.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/style.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/style/style.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/tile_source_impl.cpp | 2 | ||||
-rw-r--r-- | test/src/mbgl/test/stub_style_observer.hpp | 6 | ||||
-rw-r--r-- | test/style/source.test.cpp | 4 |
8 files changed, 17 insertions, 14 deletions
diff --git a/include/mbgl/map/map_observer.hpp b/include/mbgl/map/map_observer.hpp index 7f5073ba27..4fefb79121 100644 --- a/include/mbgl/map/map_observer.hpp +++ b/include/mbgl/map/map_observer.hpp @@ -1,7 +1,10 @@ #pragma once +#include <mbgl/style/source.hpp> + #include <cstdint> #include <exception> +#include <string> namespace mbgl { @@ -33,7 +36,7 @@ public: virtual void onWillStartRenderingMap() {} virtual void onDidFinishRenderingMap(RenderMode) {} virtual void onDidFinishLoadingStyle() {} - virtual void onSourceDidChange() {} + virtual void onSourceChanged(style::Source&) {} }; } // namespace mbgl diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 32fbd3f0c4..24ae5643ee 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -59,7 +59,7 @@ public: ConstrainMode, ViewportMode); - void onSourceAttributionChanged(style::Source&, const std::string&) override; + void onSourceChanged(style::Source&) override; void onUpdate(Update) override; void onStyleLoaded() override; void onStyleError(std::exception_ptr) override; @@ -1089,8 +1089,8 @@ void Map::onLowMemory() { } } -void Map::Impl::onSourceAttributionChanged(style::Source&, const std::string&) { - observer.onSourceDidChange(); +void Map::Impl::onSourceChanged(style::Source& source) { + observer.onSourceChanged(source); } void Map::Impl::onUpdate(Update flags) { diff --git a/src/mbgl/style/source_observer.hpp b/src/mbgl/style/source_observer.hpp index 9be7c67960..c97ba19e84 100644 --- a/src/mbgl/style/source_observer.hpp +++ b/src/mbgl/style/source_observer.hpp @@ -17,7 +17,7 @@ public: virtual ~SourceObserver() = default; virtual void onSourceLoaded(Source&) {} - virtual void onSourceAttributionChanged(Source&, const std::string&) {} + virtual void onSourceChanged(Source&) {} virtual void onSourceError(Source&, std::exception_ptr) {} // Source description needs to be reloaded diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 1db0807535..9e212826f9 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -593,8 +593,8 @@ void Style::onSourceLoaded(Source& source) { observer->onUpdate(Update::Repaint); } -void Style::onSourceAttributionChanged(Source& source, const std::string& attribution) { - observer->onSourceAttributionChanged(source, attribution); +void Style::onSourceChanged(Source& source) { + observer->onSourceChanged(source); } void Style::onSourceError(Source& source, std::exception_ptr error) { diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index 36ccd1f30e..0c65129422 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -140,7 +140,7 @@ private: // SourceObserver implementation. void onSourceLoaded(Source&) override; - void onSourceAttributionChanged(Source&, const std::string&) override; + void onSourceChanged(Source&) override; void onSourceError(Source&, std::exception_ptr) override; void onSourceDescriptionChanged(Source&) override; void onTileChanged(Source&, const OverscaledTileID&) override; diff --git a/src/mbgl/style/tile_source_impl.cpp b/src/mbgl/style/tile_source_impl.cpp index 44a25a8bfb..44fb01b0ee 100644 --- a/src/mbgl/style/tile_source_impl.cpp +++ b/src/mbgl/style/tile_source_impl.cpp @@ -107,7 +107,7 @@ void TileSourceImpl::loadDescription(FileSource& fileSource) { observer->onSourceLoaded(base); if (attributionChanged) { - observer->onSourceAttributionChanged(base, newTileset.attribution); + observer->onSourceChanged(base); } } }); diff --git a/test/src/mbgl/test/stub_style_observer.hpp b/test/src/mbgl/test/stub_style_observer.hpp index 95280565ff..9312cfa550 100644 --- a/test/src/mbgl/test/stub_style_observer.hpp +++ b/test/src/mbgl/test/stub_style_observer.hpp @@ -30,8 +30,8 @@ public: if (sourceLoaded) sourceLoaded(source); } - void onSourceAttributionChanged(Source& source, const std::string& attribution) override { - if (sourceAttributionChanged) sourceAttributionChanged(source, attribution); + void onSourceChanged(Source& source) override { + if (sourceChanged) sourceChanged(source); } void onSourceError(Source& source, std::exception_ptr error) override { @@ -60,7 +60,7 @@ public: std::function<void ()> spriteLoaded; std::function<void (std::exception_ptr)> spriteError; std::function<void (Source&)> sourceLoaded; - std::function<void (Source&, std::string)> sourceAttributionChanged; + std::function<void (Source&)> sourceChanged; std::function<void (Source&, std::exception_ptr)> sourceError; std::function<void (Source&)> sourceDescriptionChanged; std::function<void (Source&, const OverscaledTileID&)> tileChanged; diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp index feb7b6b05a..6bb18d188b 100644 --- a/test/style/source.test.cpp +++ b/test/style/source.test.cpp @@ -388,8 +388,8 @@ TEST(Source, RasterTileAttribution) { return response; }; - test.observer.sourceAttributionChanged = [&] (Source&, std::string attribution) { - EXPECT_EQ(mapboxOSM, attribution); + test.observer.sourceChanged = [&] (Source& source) { + EXPECT_EQ(mapboxOSM, source.getAttribution()); EXPECT_FALSE(mapboxOSM.find("©️ OpenStreetMap") == std::string::npos); test.end(); }; |