[core] Obey "transition" property from style and its default value

6 files changed, 22 insertions, 4 deletions

diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp
index 0f2779e33b..14aaa752bc 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 1f55c168a6..edec98047d 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 c8918fc2ee..589a493621 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 725feb3fc2..467b44632c 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 32b8a7a8bc..401b5ff513 100644
--- a/src/mbgl/style/parser.hpp
+++ b/src/mbgl/style/parser.hpp
@@ -32,6 +32,7 @@ public:
     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 @@ public:
     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 27ca58e85d..94e003df51 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);