diff --git a/src/mbgl/layer/background_layer.cpp b/src/mbgl/layer/background_layer.cpp index d52905708..d7986d757 100644 --- a/src/mbgl/layer/background_layer.cpp +++ b/src/mbgl/layer/background_layer.cpp @@ -7,7 +7,7 @@ void BackgroundLayer::parsePaints(const JSVal& layer) { paints.parseEach(layer, [&] (ClassProperties& paint, const JSVal& value) { parseProperty>("background-opacity", PropertyKey::BackgroundOpacity, paint, value); parseProperty>("background-color", PropertyKey::BackgroundColor, paint, value); - parseProperty>>("background-pattern", PropertyKey::BackgroundImage, paint, value, "background-pattern-transition"); + parseProperty>>("background-pattern", PropertyKey::BackgroundImage, paint, value); }); } diff --git a/src/mbgl/layer/fill_layer.cpp b/src/mbgl/layer/fill_layer.cpp index 7d53fa97c..b5e072755 100644 --- a/src/mbgl/layer/fill_layer.cpp +++ b/src/mbgl/layer/fill_layer.cpp @@ -17,7 +17,7 @@ void FillLayer::parsePaints(const JSVal& layer) { parseProperty>>("fill-translate", PropertyKey::FillTranslate, paint, value); parseProperty("fill-translate-transition", PropertyKey::FillTranslate, paint, value); parseProperty>("fill-translate-anchor", PropertyKey::FillTranslateAnchor, paint, value); - parseProperty>>("fill-pattern", PropertyKey::FillImage, paint, value, "fill-pattern-transition"); + parseProperty>>("fill-pattern", PropertyKey::FillImage, paint, value); }); } diff --git a/src/mbgl/layer/line_layer.cpp b/src/mbgl/layer/line_layer.cpp index a0b216bda..d404c593c 100644 --- a/src/mbgl/layer/line_layer.cpp +++ b/src/mbgl/layer/line_layer.cpp @@ -28,8 +28,8 @@ void LineLayer::parsePaints(const JSVal& layer) { parseProperty("line-gap-width-transition", PropertyKey::LineGapWidth, paint, value); parseProperty>("line-blur", PropertyKey::LineBlur, paint, value); parseProperty("line-blur-transition", PropertyKey::LineBlur, paint, value); - parseProperty>>>("line-dasharray", PropertyKey::LineDashArray, paint, value, "line-dasharray-transition"); - parseProperty>>("line-pattern", PropertyKey::LineImage, paint, value, "line-pattern-transition"); + parseProperty>>>("line-dasharray", PropertyKey::LineDashArray, paint, value); + parseProperty>>("line-pattern", PropertyKey::LineImage, paint, value); }); } diff --git a/src/mbgl/style/function.cpp b/src/mbgl/style/function.cpp index f6f67d953..c656f8688 100644 --- a/src/mbgl/style/function.cpp +++ b/src/mbgl/style/function.cpp @@ -107,7 +107,7 @@ Faded Function>::evaluate(const StyleCalculationParameters& paramete float z = parameters.z; float fraction = std::fmod(z, 1.0f); - std::chrono::duration d = duration ? *duration : parameters.defaultFadeDuration; + std::chrono::duration d = parameters.defaultFadeDuration; float t = std::min((parameters.now - parameters.zoomHistory.lastIntegerZoomTime) / d, 1.0f); float fromScale = 1.0f; float toScale = 1.0f; diff --git a/src/mbgl/style/function.hpp b/src/mbgl/style/function.hpp index e28b0efdd..c6ee9a229 100644 --- a/src/mbgl/style/function.hpp +++ b/src/mbgl/style/function.hpp @@ -44,15 +44,13 @@ public: /* explicit */ Function(const T& constant) : stops({{ 0, constant }}) {} - explicit Function(const Stops& stops_, - mapbox::util::optional duration_) - : stops(stops_), duration(duration_) {} + explicit Function(const Stops& stops_) + : stops(stops_) {} Faded evaluate(const StyleCalculationParameters&) const; private: const std::vector> stops; - const mapbox::util::optional duration = {}; }; } diff --git a/src/mbgl/style/property_parsing.cpp b/src/mbgl/style/property_parsing.cpp index 73345fcc6..00b3db891 100644 --- a/src/mbgl/style/property_parsing.cpp +++ b/src/mbgl/style/property_parsing.cpp @@ -360,12 +360,7 @@ template<> optional> parseProperty(const char* name, const JSVal } template -optional>> parseFadedFunction(const JSVal& value, const JSVal& transition) { - mapbox::util::optional duration; - if (transition.HasMember("duration")) { - duration = std::chrono::milliseconds(transition["duration"].GetUint()); - } - +optional>> parseFadedFunction(const JSVal& value) { if (!value.HasMember("stops")) { Log::Warning(Event::ParseStyle, "function must specify a function type"); return {}; @@ -377,13 +372,13 @@ optional>> parseFadedFunction(const JSVal& value, const JSVal& return {}; } - return Function>(*stops, duration); + return Function>(*stops); } template <> -optional>>> parseProperty(const char* name, const JSVal& value, const JSVal& transition) { +optional>>> parseProperty(const char* name, const JSVal& value) { if (value.IsObject()) { - return parseFadedFunction>(value, transition); + return parseFadedFunction>(value); } auto constant = parseProperty>(name, value); @@ -394,9 +389,9 @@ optional>>> parseProperty(const char* name, co } template <> -optional>> parseProperty(const char* name, const JSVal& value, const JSVal& transition) { +optional>> parseProperty(const char* name, const JSVal& value) { if (value.IsObject()) { - return parseFadedFunction(value, transition); + return parseFadedFunction(value); } auto constant = parseProperty(name, value); diff --git a/src/mbgl/style/property_parsing.hpp b/src/mbgl/style/property_parsing.hpp index 478e19289..182636df5 100644 --- a/src/mbgl/style/property_parsing.hpp +++ b/src/mbgl/style/property_parsing.hpp @@ -18,9 +18,6 @@ namespace detail { template optional parseProperty(const char* name, const JSVal&); -template -optional parseProperty(const char* name, const JSVal&, const JSVal& transition); - } template @@ -35,23 +32,6 @@ void parseProperty(const char* name, PropertyKey key, ClassProperties& propertie } } -template -void parseProperty(const char* name, PropertyKey key, ClassProperties& properties, const JSVal& value, const char* transitionName) { - if (!value.HasMember(name)) - return; - - const JSVal& noTransition = JSVal { rapidjson::kObjectType }; - - const optional res = detail::parseProperty(name, value[name], - value.HasMember(transitionName) - ? value[transitionName] - : noTransition); - - if (res) { - properties.set(key, *res); - } -} - } #endif