summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIvo van Dongen <ivovandongen@users.noreply.github.com>2016-09-20 09:55:53 +0200
committerGitHub <noreply@github.com>2016-09-20 09:55:53 +0200
commitf3b38df91dc22ddbeec45cd3dbce636253c75037 (patch)
tree31efcfa5315f686eae29b92ce8585a1fe2d9c93d /src
parent073a675c2951ca98efeb2a7b2973e27dada4c56e (diff)
downloadqtlocation-mapboxgl-f3b38df91dc22ddbeec45cd3dbce636253c75037.tar.gz
[core] add MapChangeDidFinishLoadingStyle signal (#6371)
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/map/change.hpp1
-rw-r--r--src/mbgl/map/map.cpp5
-rw-r--r--src/mbgl/style/observer.hpp1
-rw-r--r--src/mbgl/style/style.cpp2
4 files changed, 9 insertions, 0 deletions
diff --git a/src/mbgl/map/change.hpp b/src/mbgl/map/change.hpp
index 483ce82893..343d7d8e4f 100644
--- a/src/mbgl/map/change.hpp
+++ b/src/mbgl/map/change.hpp
@@ -19,6 +19,7 @@ enum MapChange : uint8_t {
MapChangeWillStartRenderingMap = 11,
MapChangeDidFinishRenderingMap = 12,
MapChangeDidFinishRenderingMapFullyRendered = 13,
+ MapChangeDidFinishLoadingStyle = 14
};
} // namespace mbgl
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index ad77ac19fe..1c376e40aa 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -39,6 +39,7 @@ public:
Impl(View&, FileSource&, MapMode, GLContextMode, ConstrainMode, ViewportMode);
void onUpdate(Update) override;
+ void onStyleLoaded() override;
void onStyleError() override;
void onResourceError(std::exception_ptr) override;
@@ -965,6 +966,10 @@ void Map::Impl::onUpdate(Update flags) {
updateFlags |= flags;
asyncUpdate.send();
}
+
+void Map::Impl::onStyleLoaded() {
+ view.notifyMapChange(MapChangeDidFinishLoadingStyle);
+}
void Map::Impl::onStyleError() {
view.notifyMapChange(MapChangeDidFailLoadingMap);
diff --git a/src/mbgl/style/observer.hpp b/src/mbgl/style/observer.hpp
index 6694819bca..f28fdfc084 100644
--- a/src/mbgl/style/observer.hpp
+++ b/src/mbgl/style/observer.hpp
@@ -14,6 +14,7 @@ class Observer : public GlyphAtlasObserver,
public:
virtual void onUpdate(Update) {}
virtual void onStyleError() {}
+ virtual void onStyleLoaded() {}
virtual void onResourceError(std::exception_ptr) {}
};
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index e519238637..1c0d7f5395 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -105,6 +105,8 @@ void Style::setJSON(const std::string& json) {
observer->onResourceError(error);
return;
+ } else {
+ observer->onStyleLoaded();
}
for (auto& source : parser.sources) {