diff options
Diffstat (limited to 'include/mbgl/style/conversion_impl.hpp')
| -rw-r--r-- | include/mbgl/style/conversion_impl.hpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/mbgl/style/conversion_impl.hpp b/include/mbgl/style/conversion_impl.hpp index 73d83302a0..30aa132ce0 100644 --- a/include/mbgl/style/conversion_impl.hpp +++ b/include/mbgl/style/conversion_impl.hpp @@ -318,7 +318,7 @@ struct ValueFactory<TransitionOptions> { template <> struct ValueFactory<Color> { - static Value make(const Color& color) { return color.toObject(); } + static Value make(const Color& color) { return color.serialize(); } }; template <typename T> @@ -358,11 +358,14 @@ Value makeValue(T&& arg) { template <typename T> StyleProperty makeStyleProperty(const PropertyValue<T>& value) { return value.match([](const Undefined&) -> StyleProperty { return {}; }, - [](const T& t) -> StyleProperty { - return {makeValue(t), StyleProperty::Kind::Constant}; + [](const Color& c) -> StyleProperty { + return {makeValue(c), StyleProperty::Kind::Expression}; }, [](const PropertyExpression<T>& fn) -> StyleProperty { return {fn.getExpression().serialize(), StyleProperty::Kind::Expression}; + }, + [](const auto& t) -> StyleProperty { + return {makeValue(t), StyleProperty::Kind::Constant}; }); } |