From 688540a44d7977208b606b02376edc7d87854db8 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Tue, 31 Oct 2017 13:10:01 +0200 Subject: Bump Mapbox GL Native mapbox-gl-native @ 0ef7b7154f6d4498077a83db5c486c61bc34938c --- .../mbgl/style/conversion/transition_options.hpp | 32 +--------------------- 1 file changed, 1 insertion(+), 31 deletions(-) (limited to 'include/mbgl/style/conversion/transition_options.hpp') diff --git a/include/mbgl/style/conversion/transition_options.hpp b/include/mbgl/style/conversion/transition_options.hpp index de8834d578..0563f39ac3 100644 --- a/include/mbgl/style/conversion/transition_options.hpp +++ b/include/mbgl/style/conversion/transition_options.hpp @@ -10,37 +10,7 @@ namespace conversion { template <> struct Converter { public: - template - optional operator()(const V& value, Error& error) const { - if (!isObject(value)) { - error = { "transition must be an object" }; - return {}; - } - - TransitionOptions result; - - auto duration = objectMember(value, "duration"); - if (duration) { - auto number = toNumber(*duration); - if (!number) { - error = { "duration must be a number" }; - return {}; - } - result.duration = { std::chrono::milliseconds(int64_t(*number)) }; - } - - auto delay = objectMember(value, "delay"); - if (delay) { - auto number = toNumber(*delay); - if (!number) { - error = { "delay must be a number" }; - return {}; - } - result.delay = { std::chrono::milliseconds(int64_t(*number)) }; - } - - return result; - } + optional operator()(const Convertible& value, Error& error) const; }; } // namespace conversion -- cgit v1.2.1