Merge branch 'release-ios-3.2.0-android-4.0.0'

This commit is contained in:
John Firebaugh
2016-03-30 17:01:54 -07:00
101 changed files with 2268 additions and 1077 deletions

View File

@@ -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);
}