diff options
Diffstat (limited to 'src/mbgl/style')
-rw-r--r-- | src/mbgl/style/function.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/function.hpp | 6 | ||||
-rw-r--r-- | src/mbgl/style/property_parsing.cpp | 17 | ||||
-rw-r--r-- | src/mbgl/style/property_parsing.hpp | 20 |
4 files changed, 9 insertions, 36 deletions
diff --git a/src/mbgl/style/function.cpp b/src/mbgl/style/function.cpp index f6f67d9531..c656f86888 100644 --- a/src/mbgl/style/function.cpp +++ b/src/mbgl/style/function.cpp @@ -107,7 +107,7 @@ Faded<T> Function<Faded<T>>::evaluate(const StyleCalculationParameters& paramete float z = parameters.z; float fraction = std::fmod(z, 1.0f); - std::chrono::duration<float> d = duration ? *duration : parameters.defaultFadeDuration; + std::chrono::duration<float> 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 e28b0efdd9..c6ee9a229b 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> duration_) - : stops(stops_), duration(duration_) {} + explicit Function(const Stops& stops_) + : stops(stops_) {} Faded<T> evaluate(const StyleCalculationParameters&) const; private: const std::vector<std::pair<float, T>> stops; - const mapbox::util::optional<Duration> duration = {}; }; } diff --git a/src/mbgl/style/property_parsing.cpp b/src/mbgl/style/property_parsing.cpp index 73345fcc62..00b3db8918 100644 --- a/src/mbgl/style/property_parsing.cpp +++ b/src/mbgl/style/property_parsing.cpp @@ -360,12 +360,7 @@ template<> optional<Function<Color>> parseProperty(const char* name, const JSVal } template <typename T> -optional<Function<Faded<T>>> parseFadedFunction(const JSVal& value, const JSVal& transition) { - mapbox::util::optional<Duration> duration; - if (transition.HasMember("duration")) { - duration = std::chrono::milliseconds(transition["duration"].GetUint()); - } - +optional<Function<Faded<T>>> parseFadedFunction(const JSVal& value) { if (!value.HasMember("stops")) { Log::Warning(Event::ParseStyle, "function must specify a function type"); return {}; @@ -377,13 +372,13 @@ optional<Function<Faded<T>>> parseFadedFunction(const JSVal& value, const JSVal& return {}; } - return Function<Faded<T>>(*stops, duration); + return Function<Faded<T>>(*stops); } template <> -optional<Function<Faded<std::vector<float>>>> parseProperty(const char* name, const JSVal& value, const JSVal& transition) { +optional<Function<Faded<std::vector<float>>>> parseProperty(const char* name, const JSVal& value) { if (value.IsObject()) { - return parseFadedFunction<std::vector<float>>(value, transition); + return parseFadedFunction<std::vector<float>>(value); } auto constant = parseProperty<std::vector<float>>(name, value); @@ -394,9 +389,9 @@ optional<Function<Faded<std::vector<float>>>> parseProperty(const char* name, co } template <> -optional<Function<Faded<std::string>>> parseProperty(const char* name, const JSVal& value, const JSVal& transition) { +optional<Function<Faded<std::string>>> parseProperty(const char* name, const JSVal& value) { if (value.IsObject()) { - return parseFadedFunction<std::string>(value, transition); + return parseFadedFunction<std::string>(value); } auto constant = parseProperty<std::string>(name, value); diff --git a/src/mbgl/style/property_parsing.hpp b/src/mbgl/style/property_parsing.hpp index 478e192898..182636df5c 100644 --- a/src/mbgl/style/property_parsing.hpp +++ b/src/mbgl/style/property_parsing.hpp @@ -18,9 +18,6 @@ namespace detail { template <typename T> optional<T> parseProperty(const char* name, const JSVal&); -template <typename T> -optional<T> parseProperty(const char* name, const JSVal&, const JSVal& transition); - } template <typename T> @@ -35,23 +32,6 @@ void parseProperty(const char* name, PropertyKey key, ClassProperties& propertie } } -template <typename T> -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<T> res = detail::parseProperty<T>(name, value[name], - value.HasMember(transitionName) - ? value[transitionName] - : noTransition); - - if (res) { - properties.set(key, *res); - } -} - } #endif |