[core] Add support for data-driven styling

1 files changed, 11 insertions, 15 deletions

diff --git a/include/mbgl/style/property_value.hpp b/include/mbgl/style/property_value.hpp
index 83c4b4cf1b..e784633aa7 100644
--- a/include/mbgl/style/property_value.hpp
+++ b/include/mbgl/style/property_value.hpp
@@ -1,20 +1,16 @@
 #pragma once
 
 #include <mbgl/util/variant.hpp>
-#include <mbgl/style/function.hpp>
+#include <mbgl/style/undefined.hpp>
+#include <mbgl/style/function/camera_function.hpp>
 
 namespace mbgl {
 namespace style {
 
-class Undefined {};
-
-inline bool operator==(const Undefined&, const Undefined&) { return true; }
-inline bool operator!=(const Undefined&, const Undefined&) { return false; }
-
 template <class T>
 class PropertyValue {
 private:
-    using Value = variant<Undefined, T, Function<T>>;
+    using Value = variant<Undefined, T, CameraFunction<T>>;
     Value value;
 
     friend bool operator==(const PropertyValue& lhs, const PropertyValue& rhs) {
@@ -26,16 +22,16 @@ private:
     }
 
 public:
-    PropertyValue()                     : value()         {}
-    PropertyValue(         T  constant) : value(constant) {}
-    PropertyValue(Function<T> function) : value(function) {}
+    PropertyValue()                           : value()         {}
+    PropertyValue(               T  constant) : value(constant) {}
+    PropertyValue(CameraFunction<T> function) : value(function) {}
 
-    bool isUndefined() const { return value.which() == 0; }
-    bool isConstant()  const { return value.which() == 1; }
-    bool isFunction()  const { return value.which() == 2; }
+    bool isUndefined()      const { return value.which() == 0; }
+    bool isConstant()       const { return value.which() == 1; }
+    bool isCameraFunction() const { return value.which() == 2; }
 
-    const          T & asConstant() const { return value.template get<         T >(); }
-    const Function<T>& asFunction() const { return value.template get<Function<T>>(); }
+    const                T & asConstant()       const { return value.template get<               T >(); }
+    const CameraFunction<T>& asCameraFunction() const { return value.template get<CameraFunction<T>>(); }
 
     explicit operator bool() const { return !isUndefined(); };