[core] Split up and clean up conversion.hpp

1 files changed, 34 insertions, 0 deletions

diff --git a/include/mbgl/style/conversion/property_value.hpp b/include/mbgl/style/conversion/property_value.hpp
new file mode 100644
index 0000000000..840643abbe
--- /dev/null
+++ b/include/mbgl/style/conversion/property_value.hpp
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <mbgl/style/property_value.hpp>
+#include <mbgl/style/conversion.hpp>
+#include <mbgl/style/conversion/constant.hpp>
+#include <mbgl/style/conversion/function.hpp>
+
+namespace mbgl {
+namespace style {
+namespace conversion {
+
+template <class T>
+struct Converter<PropertyValue<T>> {
+    template <class V>
+    Result<PropertyValue<T>> operator()(const V& value) const {
+        if (isObject(value)) {
+            Result<Function<T>> function = convert<Function<T>>(value);
+            if (!function) {
+                return function.error();
+            }
+            return *function;
+        } else {
+            Result<T> constant = convert<T>(value);
+            if (!constant) {
+                return constant.error();
+            }
+            return *constant;
+        }
+    }
+};
+
+} // namespace conversion
+} // namespace style
+} // namespace mbgl