diff options
author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-10-31 13:10:01 +0200 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-11-01 18:06:36 +0200 |
commit | 688540a44d7977208b606b02376edc7d87854db8 (patch) | |
tree | 51a4335ccbd182263e8d7b5793703cf69ce74d1e /include/mbgl/style/conversion/transition_options.hpp | |
parent | 90a7cf87a32f6787e57e3852ac9d3015d8112621 (diff) | |
download | qtlocation-mapboxgl-688540a44d7977208b606b02376edc7d87854db8.tar.gz |
Bump Mapbox GL Native
mapbox-gl-native @ 0ef7b7154f6d4498077a83db5c486c61bc34938c
Diffstat (limited to 'include/mbgl/style/conversion/transition_options.hpp')
-rw-r--r-- | include/mbgl/style/conversion/transition_options.hpp | 32 |
1 files changed, 1 insertions, 31 deletions
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<TransitionOptions> { public: - template <class V> - optional<TransitionOptions> 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<TransitionOptions> operator()(const Convertible& value, Error& error) const; }; } // namespace conversion |