diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-30 17:01:54 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-30 17:43:37 -0700 |
commit | 5eda74a514964d1cac684483bafa08d458175f9a (patch) | |
tree | a38f886f5742d52a915c3c72959a5eba50b9fa0e /src | |
parent | b6a181097c3e7c3168be3575d5d7e95820fc74ba (diff) | |
parent | 7b5a1ca1670a0346cdbf2af689fabde4e70ed561 (diff) | |
download | qtlocation-mapboxgl-5eda74a514964d1cac684483bafa08d458175f9a.tar.gz |
Merge branch 'release-ios-3.2.0-android-4.0.0'
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/map/map.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/map/map_context.cpp | 5 | ||||
-rw-r--r-- | src/mbgl/map/map_data.hpp | 1 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 1d9cb1ac74..4024aaee7e 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -79,8 +79,8 @@ void Map::renderSync() { } else if (renderState != RenderState::fully) { renderState = RenderState::fully; view.notifyMapChange(MapChangeDidFinishRenderingMapFullyRendered); - if (data->loading) { - data->loading = false; + if (loading) { + loading = false; view.notifyMapChange(MapChangeDidFinishLoadingMap); } } @@ -100,11 +100,13 @@ void Map::update(Update flags) { #pragma mark - Style void Map::setStyleURL(const std::string &url) { + loading = true; view.notifyMapChange(MapChangeWillStartLoadingMap); context->invoke(&MapContext::setStyleURL, url); } void Map::setStyleJSON(const std::string& json, const std::string& base) { + loading = true; view.notifyMapChange(MapChangeWillStartLoadingMap); context->invoke(&MapContext::setStyleJSON, json, base); } diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp index b4badb20ef..0ea51bf53a 100644 --- a/src/mbgl/map/map_context.cpp +++ b/src/mbgl/map/map_context.cpp @@ -113,7 +113,6 @@ void MapContext::setStyleURL(const std::string& url) { Log::Error(Event::Setup, "style %s could not be found or is an incompatible legacy map or style", styleURL.c_str()); } else { Log::Error(Event::Setup, "loading style failed: %s", res.error->message.c_str()); - data.loading = false; } } else if (res.notModified || res.noContent) { return; @@ -146,10 +145,6 @@ void MapContext::loadStyleJSON(const std::string& json, const std::string& base) // force style cascade, causing all pending transitions to complete. style->cascade(Clock::now()); - // set loading here so we don't get a false loaded event as soon as map is - // created but before a style is loaded - data.loading = true; - updateAsync(Update::Classes | Update::RecalculateStyle | Update::Annotations); } diff --git a/src/mbgl/map/map_data.hpp b/src/mbgl/map/map_data.hpp index 4cf3140e91..0513d84f87 100644 --- a/src/mbgl/map/map_data.hpp +++ b/src/mbgl/map/map_data.hpp @@ -68,7 +68,6 @@ public: bool paused = false; std::mutex mutexPause; std::condition_variable condPause; - bool loading = false; }; } // namespace mbgl |