diff options
author | Ansis Brammanis <ansis@mapbox.com> | 2019-03-27 17:52:25 -0400 |
---|---|---|
committer | Ansis Brammanis <ansis@mapbox.com> | 2019-03-27 17:52:25 -0400 |
commit | 8629e373e21d30cc57399661b5e468331760113d (patch) | |
tree | 483a16aa8ab337589c1894dba5628b970bb49e19 | |
parent | cb64dd625206aa0a0b2267aed957d8eb2e5d8f23 (diff) |
expect onStyleImageMissing listener to add image synchronously
-rw-r--r-- | include/mbgl/map/map_observer.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/map/map_impl.cpp | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/include/mbgl/map/map_observer.hpp b/include/mbgl/map/map_observer.hpp index e405c5dd0..75e389df9 100644 --- a/include/mbgl/map/map_observer.hpp +++ b/include/mbgl/map/map_observer.hpp @@ -47,7 +47,7 @@ public: virtual void onDidFinishLoadingStyle() {} virtual void onSourceChanged(style::Source&) {} virtual void onDidBecomeIdle() {} - virtual void onStyleImageMissing(const std::string&, std::function<void(optional<std::unique_ptr<mbgl::style::Image>>)> callback) { callback({}); } + virtual void onStyleImageMissing(const std::string&) {} }; } // namespace mbgl diff --git a/src/mbgl/map/map_impl.cpp b/src/mbgl/map/map_impl.cpp index 0edf26e26..6cf2b532a 100644 --- a/src/mbgl/map/map_impl.cpp +++ b/src/mbgl/map/map_impl.cpp @@ -174,17 +174,11 @@ void Map::Impl::jumpTo(const CameraOptions& camera) { void Map::Impl::onStyleImageMissing(const std::string& id, std::function<void()> done) { - if (style->getImage(id) != nullptr) { - done(); - return; + if (style->getImage(id) == nullptr) { + observer.onStyleImageMissing(id); } - observer.onStyleImageMissing(id, [this, done](optional<std::unique_ptr<mbgl::style::Image>> image = {}) { - if (image) { - style->addImage(std::move(*image)); - } - done(); - }); + done(); } } // namespace mbgl |