From 5daba7b43475b539b4337b559fd35aba668ad498 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 12 Jun 2017 15:11:44 -0700
Subject: [PATCH 1/4] [core] Skip calculations when we already know we need
 rendering or layout

---
 src/mbgl/renderer/render_style.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mbgl/renderer/render_style.cpp b/src/mbgl/renderer/render_style.cpp
index 9b0b512bf9e..c8918fc2eeb 100644
--- a/src/mbgl/renderer/render_style.cpp
+++ b/src/mbgl/renderer/render_style.cpp
@@ -203,14 +203,15 @@ void RenderStyle::update(const UpdateParameters& parameters) {
                 continue;
             }
 
-            if (getRenderLayer(layer->id)->needsRendering(zoomHistory.lastZoom)) {
+            if (!needsRendering && getRenderLayer(layer->id)->needsRendering(zoomHistory.lastZoom)) {
                 needsRendering = true;
             }
 
-            if (hasLayoutDifference(layerDiff, layer->id) ||
+            if (!needsRelayout && (
+                hasLayoutDifference(layerDiff, layer->id) ||
                 !imageDiff.added.empty() ||
                 !imageDiff.removed.empty() ||
-                !imageDiff.changed.empty()) {
+                !imageDiff.changed.empty())) {
                 needsRelayout = true;
             }
 

From c266c01687c9684db9d1a8270ffa2afe7bd75057 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 12 Jun 2017 15:21:15 -0700
Subject: [PATCH 2/4] [core] Obey "transition" property from style and its
 default value

---
 include/mbgl/util/constants.hpp    |  2 +-
 src/mbgl/renderer/painter.cpp      |  4 ++--
 src/mbgl/renderer/render_style.cpp |  2 +-
 src/mbgl/style/parser.cpp          | 15 +++++++++++++++
 src/mbgl/style/parser.hpp          |  2 ++
 src/mbgl/style/style.cpp           |  1 +
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp
index 0f2779e33b5..14aaa752bc1 100644
--- a/include/mbgl/util/constants.hpp
+++ b/include/mbgl/util/constants.hpp
@@ -40,7 +40,7 @@ constexpr float  MAX_ZOOM_F = MAX_ZOOM;
 
 constexpr uint64_t DEFAULT_MAX_CACHE_SIZE = 50 * 1024 * 1024;
 
-constexpr Duration DEFAULT_FADE_DURATION = Milliseconds(300);
+constexpr Duration DEFAULT_TRANSITION_DURATION = Milliseconds(300);
 constexpr Seconds CLOCK_SKEW_RETRY_TIMEOUT { 30 };
 
 constexpr UnitBezier DEFAULT_TRANSITION_EASE = { 0, 0, 0.25, 1 };
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index 1f55c168a6e..edec98047d2 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -115,7 +115,7 @@ Painter::Painter(gl::Context& context_,
 Painter::~Painter() = default;
 
 bool Painter::needsAnimation() const {
-    return frameHistory.needsAnimation(util::DEFAULT_FADE_DURATION);
+    return frameHistory.needsAnimation(util::DEFAULT_TRANSITION_DURATION);
 }
 
 void Painter::cleanup() {
@@ -159,7 +159,7 @@ void Painter::render(RenderStyle& style, const FrameData& frame_, View& view) {
     }
 
     frameHistory.record(frame.timePoint, state.getZoom(),
-        frame.mapMode == MapMode::Continuous ? util::DEFAULT_FADE_DURATION : Milliseconds(0));
+        frame.mapMode == MapMode::Continuous ? util::DEFAULT_TRANSITION_DURATION : Milliseconds(0));
 
 
     // - UPLOAD PASS -------------------------------------------------------------------------------
diff --git a/src/mbgl/renderer/render_style.cpp b/src/mbgl/renderer/render_style.cpp
index c8918fc2eeb..589a4936218 100644
--- a/src/mbgl/renderer/render_style.cpp
+++ b/src/mbgl/renderer/render_style.cpp
@@ -88,7 +88,7 @@ void RenderStyle::update(const UpdateParameters& parameters) {
     const PropertyEvaluationParameters evaluationParameters {
         zoomHistory,
         parameters.mode == MapMode::Continuous ? parameters.timePoint : Clock::time_point::max(),
-        parameters.mode == MapMode::Continuous ? util::DEFAULT_FADE_DURATION : Duration::zero()
+        parameters.mode == MapMode::Continuous ? util::DEFAULT_TRANSITION_DURATION : Duration::zero()
     };
 
     const TileParameters tileParameters {
diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp
index 725feb3fc20..467b44632c8 100644
--- a/src/mbgl/style/parser.cpp
+++ b/src/mbgl/style/parser.cpp
@@ -86,6 +86,10 @@ StyleParseResult Parser::parse(const std::string& json) {
         }
     }
 
+    if (document.HasMember("transition")) {
+        parseTransition(document["transition"]);
+    }
+
     if (document.HasMember("light")) {
         parseLight(document["light"]);
     }
@@ -115,6 +119,17 @@ StyleParseResult Parser::parse(const std::string& json) {
     return nullptr;
 }
 
+void Parser::parseTransition(const JSValue& value) {
+    conversion::Error error;
+    optional<TransitionOptions> converted = conversion::convert<TransitionOptions>(value, error);
+    if (!converted) {
+        Log::Warning(Event::ParseStyle, error.message);
+        return;
+    }
+
+    transition = std::move(*converted);
+}
+
 void Parser::parseLight(const JSValue& value) {
     conversion::Error error;
     optional<Light> converted = conversion::convert<Light>(value, error);
diff --git a/src/mbgl/style/parser.hpp b/src/mbgl/style/parser.hpp
index 32b8a7a8bcb..401b5ff513a 100644
--- a/src/mbgl/style/parser.hpp
+++ b/src/mbgl/style/parser.hpp
@@ -32,6 +32,7 @@ class Parser {
     std::vector<std::unique_ptr<Source>> sources;
     std::vector<std::unique_ptr<Layer>> layers;
 
+    TransitionOptions transition;
     Light light;
 
     std::string name;
@@ -44,6 +45,7 @@ class Parser {
     std::vector<FontStack> fontStacks() const;
 
 private:
+    void parseTransition(const JSValue&);
     void parseLight(const JSValue&);
     void parseSources(const JSValue&);
     void parseLayers(const JSValue&);
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 27ca58e85da..94e003df516 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -57,6 +57,7 @@ void Style::setJSON(const std::string& json) {
     images.clear();
 
     transitionOptions = {};
+    transitionOptions.duration = util::DEFAULT_TRANSITION_DURATION;
 
     Parser parser;
     auto error = parser.parse(json);

From 6490e5d074d2d6eddc8df13e3618b169019848a2 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 12 Jun 2017 15:12:28 -0700
Subject: [PATCH 3/4] [core] Implement "smart setStyle"

---
 src/mbgl/map/map.cpp         | 149 +++++++++--------------------------
 test/api/api_misuse.test.cpp |  28 -------
 2 files changed, 38 insertions(+), 139 deletions(-)

diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index e685251b803..0df9f11112b 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -165,6 +165,8 @@ Map::Impl::Impl(Map& map_,
               renderStill();
           }
       }) {
+    style = std::make_unique<Style>(scheduler, fileSource, pixelRatio);
+    style->setObserver(this);
 }
 
 Map::~Map() {
@@ -175,7 +177,6 @@ Map::~Map() {
     // Explicit resets currently necessary because these abandon resources that need to be
     // cleaned up by context.reset();
     impl->renderStyle.reset();
-    impl->style.reset();
     impl->painter.reset();
 }
 
@@ -195,11 +196,6 @@ void Map::renderStill(View& view, StillImageCallback callback) {
         return;
     }
 
-    if (!impl->style) {
-        callback(std::make_exception_ptr(util::MisuseException("Map doesn't have a style")));
-        return;
-    }
-
     if (impl->style->getLastError()) {
         callback(impl->style->getLastError());
         return;
@@ -228,10 +224,6 @@ void Map::render(View& view) {
 }
 
 void Map::Impl::render(View& view) {
-    if (!style) {
-        return;
-    }
-
     TimePoint timePoint = Clock::now();
 
     transform.updateTransitions(timePoint);
@@ -244,6 +236,15 @@ void Map::Impl::render(View& view) {
         annotationManager.updateData();
     }
 
+    updateFlags = Update::Nothing;
+
+    gl::Context& context = backend.getContext();
+    if (!painter) {
+        renderStyle = std::make_unique<RenderStyle>(scheduler, fileSource);
+        renderStyle->setObserver(this);
+        painter = std::make_unique<Painter>(context, transform.getState(), pixelRatio, programCacheDir);
+    }
+
     renderStyle->update({
         mode,
         pixelRatio,
@@ -262,13 +263,6 @@ void Map::Impl::render(View& view) {
         annotationManager
     });
 
-    updateFlags = Update::Nothing;
-
-    gl::Context& context = backend.getContext();
-    if (!painter) {
-        painter = std::make_unique<Painter>(context, transform.getState(), pixelRatio, programCacheDir);
-    }
-
     bool loaded = style->isLoaded() && renderStyle->isLoaded();
 
     if (mode == MapMode::Continuous) {
@@ -346,10 +340,9 @@ void Map::setStyleURL(const std::string& url) {
     impl->styleRequest = nullptr;
     impl->styleURL = url;
     impl->styleJSON.clear();
-    impl->styleMutated = false;
 
-    impl->style = std::make_unique<Style>(impl->scheduler, impl->fileSource, impl->pixelRatio);
-    impl->renderStyle = std::make_unique<RenderStyle>(impl->scheduler, impl->fileSource);
+    impl->style->loaded = false;
+    impl->styleMutated = false;
 
     impl->styleRequest = impl->fileSource.request(Resource::style(impl->styleURL), [this](Response res) {
         // Once we get a fresh style, or the style is mutated, stop revalidating.
@@ -395,16 +388,10 @@ void Map::setStyleJSON(const std::string& json) {
     impl->styleJSON.clear();
     impl->styleMutated = false;
 
-    impl->style = std::make_unique<Style>(impl->scheduler, impl->fileSource, impl->pixelRatio);
-    impl->renderStyle = std::make_unique<RenderStyle>(impl->scheduler, impl->fileSource);
-
     impl->loadStyleJSON(json);
 }
 
 void Map::Impl::loadStyleJSON(const std::string& json) {
-    style->setObserver(this);
-    renderStyle->setObserver(this);
-
     style->setJSON(json);
     styleJSON = json;
 
@@ -834,7 +821,7 @@ void Map::removeAnnotation(AnnotationID annotation) {
 #pragma mark - Feature query api
 
 std::vector<Feature> Map::queryRenderedFeatures(const ScreenCoordinate& point, const RenderedQueryOptions& options) {
-    if (!impl->style) return {};
+    if (!impl->renderStyle) return {};
 
     return impl->renderStyle->queryRenderedFeatures(
         { point },
@@ -844,7 +831,7 @@ std::vector<Feature> Map::queryRenderedFeatures(const ScreenCoordinate& point, c
 }
 
 std::vector<Feature> Map::queryRenderedFeatures(const ScreenBox& box, const RenderedQueryOptions& options) {
-    if (!impl->style) return {};
+    if (!impl->renderStyle) return {};
 
     return impl->renderStyle->queryRenderedFeatures(
         {
@@ -860,7 +847,7 @@ std::vector<Feature> Map::queryRenderedFeatures(const ScreenBox& box, const Rend
 }
 
 std::vector<Feature> Map::querySourceFeatures(const std::string& sourceID, const SourceQueryOptions& options) {
-    if (!impl->style) return {};
+    if (!impl->renderStyle) return {};
 
     const RenderSource* source = impl->renderStyle->getRenderSource(sourceID);
     if (!source) return {};
@@ -888,49 +875,34 @@ AnnotationIDs Map::queryPointAnnotations(const ScreenBox& box) {
 #pragma mark - Style API
 
 std::vector<style::Source*> Map::getSources() {
-    return impl->style ? impl->style->getSources() : std::vector<style::Source*>();
+    return impl->style->getSources();
 }
 
 style::Source* Map::getSource(const std::string& sourceID) {
-    if (impl->style) {
-        impl->styleMutated = true;
-        return impl->style->getSource(sourceID);
-    }
-    return nullptr;
+    impl->styleMutated = true;
+    return impl->style->getSource(sourceID);
 }
 
 void Map::addSource(std::unique_ptr<style::Source> source) {
-    if (impl->style) {
-        impl->styleMutated = true;
-        impl->style->addSource(std::move(source));
-    }
+    impl->styleMutated = true;
+    impl->style->addSource(std::move(source));
 }
 
 std::unique_ptr<Source> Map::removeSource(const std::string& sourceID) {
-    if (impl->style) {
-        impl->styleMutated = true;
-        return impl->style->removeSource(sourceID);
-    }
-    return nullptr;
+    impl->styleMutated = true;
+    return impl->style->removeSource(sourceID);
 }
 
 std::vector<style::Layer*> Map::getLayers() {
-    return impl->style ? impl->style->getLayers() : std::vector<style::Layer*>();
+    return impl->style->getLayers();
 }
 
 Layer* Map::getLayer(const std::string& layerID) {
-    if (impl->style) {
-        impl->styleMutated = true;
-        return impl->style->getLayer(layerID);
-    }
-    return nullptr;
+    impl->styleMutated = true;
+    return impl->style->getLayer(layerID);
 }
 
 void Map::addLayer(std::unique_ptr<Layer> layer, const optional<std::string>& before) {
-    if (!impl->style) {
-        return;
-    }
-
     impl->styleMutated = true;
     BackendScope guard(impl->backend);
 
@@ -939,10 +911,6 @@ void Map::addLayer(std::unique_ptr<Layer> layer, const optional<std::string>& be
 }
 
 std::unique_ptr<Layer> Map::removeLayer(const std::string& id) {
-    if (!impl->style) {
-        return nullptr;
-    }
-
     impl->styleMutated = true;
     BackendScope guard(impl->backend);
 
@@ -953,81 +921,47 @@ std::unique_ptr<Layer> Map::removeLayer(const std::string& id) {
 }
 
 void Map::addImage(std::unique_ptr<style::Image> image) {
-    if (!impl->style) {
-        return;
-    }
-
     impl->styleMutated = true;
     impl->style->addImage(std::move(image));
 }
 
 void Map::removeImage(const std::string& id) {
-    if (!impl->style) {
-        return;
-    }
-
     impl->styleMutated = true;
     impl->style->removeImage(id);
 }
 
 const style::Image* Map::getImage(const std::string& id) {
-    if (impl->style) {
-        return impl->style->getImage(id);
-    }
-    return nullptr;
+    return impl->style->getImage(id);
 }
 
 void Map::setLight(std::unique_ptr<style::Light> light) {
-    if (!impl->style) {
-        return;
-    }
-
     impl->style->setLight(std::move(light));
 }
 
 style::Light* Map::getLight() {
-    if (!impl->style) {
-        return nullptr;
-    }
-
     return impl->style->getLight();
 }
 
 #pragma mark - Defaults
 
 std::string Map::getStyleName() const {
-    if (impl->style) {
-        return impl->style->getName();
-    }
-    return {};
+    return impl->style->getName();
 }
 
 LatLng Map::getDefaultLatLng() const {
-    if (impl->style) {
-        return impl->style->getDefaultLatLng();
-    }
-    return {};
+    return impl->style->getDefaultLatLng();
 }
 
 double Map::getDefaultZoom() const {
-    if (impl->style) {
-        return impl->style->getDefaultZoom();
-    }
-    return {};
+    return impl->style->getDefaultZoom();
 }
 
 double Map::getDefaultBearing() const {
-    if (impl->style) {
-        return impl->style->getDefaultBearing();
-    }
-    return {};
+    return impl->style->getDefaultBearing();
 }
 
 double Map::getDefaultPitch() const {
-    if (impl->style) {
-        return impl->style->getDefaultPitch();
-    }
-    return {};
+    return impl->style->getDefaultPitch();
 }
 
 #pragma mark - Toggles
@@ -1066,26 +1000,21 @@ MapDebugOptions Map::getDebug() const {
 }
 
 bool Map::isFullyLoaded() const {
-    return impl->style && impl->style->isLoaded() && impl->renderStyle->isLoaded();
+    return impl->style && impl->style->isLoaded() && impl->renderStyle && impl->renderStyle->isLoaded();
 }
 
 style::TransitionOptions Map::getTransitionOptions() const {
-    if (impl->style) {
-        return impl->style->getTransitionOptions();
-    }
-    return {};
+    return impl->style->getTransitionOptions();
 }
 
 void Map::setTransitionOptions(const style::TransitionOptions& options) {
-    if (impl->style) {
-        impl->style->setTransitionOptions(options);
-    }
+    impl->style->setTransitionOptions(options);
 }
 
 void Map::setSourceTileCacheSize(size_t size) {
     if (size != impl->sourceCacheSize) {
         impl->sourceCacheSize = size;
-        if (!impl->style) return;
+        if (!impl->renderStyle) return;
         impl->renderStyle->setSourceTileCacheSize(size);
         impl->backend.invalidate();
     }
@@ -1133,11 +1062,9 @@ void Map::Impl::onResourceError(std::exception_ptr error) {
 void Map::dumpDebugLogs() const {
     Log::Info(Event::General, "--------------------------------------------------------------------------------");
     Log::Info(Event::General, "MapContext::styleURL: %s", impl->styleURL.c_str());
-    if (impl->style) {
-        impl->style->dumpDebugLogs();
+    impl->style->dumpDebugLogs();
+    if (impl->renderStyle) {
         impl->renderStyle->dumpDebugLogs();
-    } else {
-        Log::Info(Event::General, "no style loaded");
     }
     Log::Info(Event::General, "--------------------------------------------------------------------------------");
 }
diff --git a/test/api/api_misuse.test.cpp b/test/api/api_misuse.test.cpp
index af703fddfb1..54cde8d9b5b 100644
--- a/test/api/api_misuse.test.cpp
+++ b/test/api/api_misuse.test.cpp
@@ -44,31 +44,3 @@ TEST(API, RenderWithoutCallback) {
 
     EXPECT_EQ(log->count(logMessage), 1u);
 }
-
-TEST(API, RenderWithoutStyle) {
-    util::RunLoop loop;
-
-    HeadlessBackend backend { test::sharedDisplay() };
-    BackendScope scope { backend };
-    OffscreenView view { backend.getContext(), { 128, 512 } };
-    StubFileSource fileSource;
-    ThreadPool threadPool(4);
-
-    Map map(backend, view.getSize(), 1, fileSource, threadPool, MapMode::Still);
-
-    std::exception_ptr error;
-    map.renderStill(view, [&](std::exception_ptr error_) {
-        error = error_;
-        loop.stop();
-    });
-
-    loop.run();
-
-    try {
-        std::rethrow_exception(error);
-    } catch (const util::MisuseException& ex) {
-        EXPECT_EQ(std::string(ex.what()), "Map doesn't have a style");
-    } catch (const std::exception&) {
-        EXPECT_TRUE(false) << "Unhandled exception.";
-    }
-}

From 75fbdada74c33187d61782e9e38784c2af2157fa Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 14 Jun 2017 12:46:24 -0700
Subject: [PATCH 4/4] [tests] Enable set-style-* integration tests

---
 mapbox-gl-js                               | 2 +-
 platform/node/test/suite_implementation.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mapbox-gl-js b/mapbox-gl-js
index 0ee15860e3f..24938a6e676 160000
--- a/mapbox-gl-js
+++ b/mapbox-gl-js
@@ -1 +1 @@
-Subproject commit 0ee15860e3ffb25a535ae374f44b3007b765c6fc
+Subproject commit 24938a6e6767c880c709ee6ffb2d3ffbaad838cf
diff --git a/platform/node/test/suite_implementation.js b/platform/node/test/suite_implementation.js
index cae5d121578..b717ecd2b29 100644
--- a/platform/node/test/suite_implementation.js
+++ b/platform/node/test/suite_implementation.js
@@ -80,6 +80,11 @@ module.exports = function (style, options, callback) {
             });
 
             applyOperations(operations.slice(1), callback);
+
+        } else if (operation[0] === 'setStyle') {
+            map.load(operation[1]);
+            applyOperations(operations.slice(1), callback);
+
         } else {
             // Ensure that the next `map.render(options)` does not overwrite this change.
             if (operation[0] === 'setCenter') {