[core] Localize and simplify state for MapChangeDidFinishLoadingMap event

Only Map needs to track this state, and it can simply be set when beginning to load a style and reset when finished.
This commit is contained in:
John Firebaugh
2016-03-29 16:07:10 -07:00
parent 7c036fb618
commit 7b5a1ca167
4 changed files with 5 additions and 8 deletions

View File

@@ -109,7 +109,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;
@@ -142,10 +141,6 @@ void MapContext::loadStyleJSON(const std::string& json, const std::string& base)
// force style cascade, causing all pending transitions to complete.
style->cascade();
// 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;
updateFlags |= Update::DefaultTransition | Update::Classes | Update::Zoom | Update::Annotations;
asyncUpdate.send();
}