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

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