From 141e995806576364d185626176c1b993fc519291 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 28 Oct 2016 16:39:50 -0700
Subject: [core] Add support for data-driven styling

---
 include/mbgl/style/layers/background_layer.hpp     |  1 +
 include/mbgl/style/layers/circle_layer.hpp         | 43 +++++++++++-----------
 include/mbgl/style/layers/fill_extrusion_layer.hpp | 19 +++++-----
 include/mbgl/style/layers/fill_layer.hpp           | 19 +++++-----
 include/mbgl/style/layers/layer.hpp.ejs            | 13 ++++---
 include/mbgl/style/layers/line_layer.hpp           | 31 ++++++++--------
 include/mbgl/style/layers/raster_layer.hpp         |  1 +
 include/mbgl/style/layers/symbol_layer.hpp         | 13 ++++---
 8 files changed, 74 insertions(+), 66 deletions(-)

(limited to 'include/mbgl/style/layers')

diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp
index c120b7f493..050cb67df6 100644
--- a/include/mbgl/style/layers/background_layer.hpp
+++ b/include/mbgl/style/layers/background_layer.hpp
@@ -5,6 +5,7 @@
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
+#include <mbgl/style/data_driven_property_value.hpp>
 
 #include <mbgl/util/color.hpp>
 
diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp
index 5562126c2f..8ffea9946f 100644
--- a/include/mbgl/style/layers/circle_layer.hpp
+++ b/include/mbgl/style/layers/circle_layer.hpp
@@ -5,6 +5,7 @@
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
+#include <mbgl/style/data_driven_property_value.hpp>
 
 #include <mbgl/util/color.hpp>
 
@@ -26,21 +27,21 @@ public:
 
     // Paint properties
 
-    static PropertyValue<float> getDefaultCircleRadius();
-    PropertyValue<float> getCircleRadius(const optional<std::string>& klass = {}) const;
-    void setCircleRadius(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultCircleRadius();
+    DataDrivenPropertyValue<float> getCircleRadius(const optional<std::string>& klass = {}) const;
+    void setCircleRadius(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
 
-    static PropertyValue<Color> getDefaultCircleColor();
-    PropertyValue<Color> getCircleColor(const optional<std::string>& klass = {}) const;
-    void setCircleColor(PropertyValue<Color>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<Color> getDefaultCircleColor();
+    DataDrivenPropertyValue<Color> getCircleColor(const optional<std::string>& klass = {}) const;
+    void setCircleColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultCircleBlur();
-    PropertyValue<float> getCircleBlur(const optional<std::string>& klass = {}) const;
-    void setCircleBlur(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultCircleBlur();
+    DataDrivenPropertyValue<float> getCircleBlur(const optional<std::string>& klass = {}) const;
+    void setCircleBlur(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultCircleOpacity();
-    PropertyValue<float> getCircleOpacity(const optional<std::string>& klass = {}) const;
-    void setCircleOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultCircleOpacity();
+    DataDrivenPropertyValue<float> getCircleOpacity(const optional<std::string>& klass = {}) const;
+    void setCircleOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
 
     static PropertyValue<std::array<float, 2>> getDefaultCircleTranslate();
     PropertyValue<std::array<float, 2>> getCircleTranslate(const optional<std::string>& klass = {}) const;
@@ -54,17 +55,17 @@ public:
     PropertyValue<CirclePitchScaleType> getCirclePitchScale(const optional<std::string>& klass = {}) const;
     void setCirclePitchScale(PropertyValue<CirclePitchScaleType>, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultCircleStrokeWidth();
-    PropertyValue<float> getCircleStrokeWidth(const optional<std::string>& klass = {}) const;
-    void setCircleStrokeWidth(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultCircleStrokeWidth();
+    DataDrivenPropertyValue<float> getCircleStrokeWidth(const optional<std::string>& klass = {}) const;
+    void setCircleStrokeWidth(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
 
-    static PropertyValue<Color> getDefaultCircleStrokeColor();
-    PropertyValue<Color> getCircleStrokeColor(const optional<std::string>& klass = {}) const;
-    void setCircleStrokeColor(PropertyValue<Color>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<Color> getDefaultCircleStrokeColor();
+    DataDrivenPropertyValue<Color> getCircleStrokeColor(const optional<std::string>& klass = {}) const;
+    void setCircleStrokeColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultCircleStrokeOpacity();
-    PropertyValue<float> getCircleStrokeOpacity(const optional<std::string>& klass = {}) const;
-    void setCircleStrokeOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultCircleStrokeOpacity();
+    DataDrivenPropertyValue<float> getCircleStrokeOpacity(const optional<std::string>& klass = {}) const;
+    void setCircleStrokeOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp
index 08728af309..09a0040ff3 100644
--- a/include/mbgl/style/layers/fill_extrusion_layer.hpp
+++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp
@@ -5,6 +5,7 @@
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
+#include <mbgl/style/data_driven_property_value.hpp>
 
 #include <mbgl/util/color.hpp>
 
@@ -30,9 +31,9 @@ public:
     PropertyValue<float> getFillExtrusionOpacity(const optional<std::string>& klass = {}) const;
     void setFillExtrusionOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
 
-    static PropertyValue<Color> getDefaultFillExtrusionColor();
-    PropertyValue<Color> getFillExtrusionColor(const optional<std::string>& klass = {}) const;
-    void setFillExtrusionColor(PropertyValue<Color>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<Color> getDefaultFillExtrusionColor();
+    DataDrivenPropertyValue<Color> getFillExtrusionColor(const optional<std::string>& klass = {}) const;
+    void setFillExtrusionColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
 
     static PropertyValue<std::array<float, 2>> getDefaultFillExtrusionTranslate();
     PropertyValue<std::array<float, 2>> getFillExtrusionTranslate(const optional<std::string>& klass = {}) const;
@@ -46,13 +47,13 @@ public:
     PropertyValue<std::string> getFillExtrusionPattern(const optional<std::string>& klass = {}) const;
     void setFillExtrusionPattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultFillExtrusionHeight();
-    PropertyValue<float> getFillExtrusionHeight(const optional<std::string>& klass = {}) const;
-    void setFillExtrusionHeight(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultFillExtrusionHeight();
+    DataDrivenPropertyValue<float> getFillExtrusionHeight(const optional<std::string>& klass = {}) const;
+    void setFillExtrusionHeight(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultFillExtrusionBase();
-    PropertyValue<float> getFillExtrusionBase(const optional<std::string>& klass = {}) const;
-    void setFillExtrusionBase(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultFillExtrusionBase();
+    DataDrivenPropertyValue<float> getFillExtrusionBase(const optional<std::string>& klass = {}) const;
+    void setFillExtrusionBase(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp
index 4b9201641d..079541ec39 100644
--- a/include/mbgl/style/layers/fill_layer.hpp
+++ b/include/mbgl/style/layers/fill_layer.hpp
@@ -5,6 +5,7 @@
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
+#include <mbgl/style/data_driven_property_value.hpp>
 
 #include <mbgl/util/color.hpp>
 
@@ -30,17 +31,17 @@ public:
     PropertyValue<bool> getFillAntialias(const optional<std::string>& klass = {}) const;
     void setFillAntialias(PropertyValue<bool>, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultFillOpacity();
-    PropertyValue<float> getFillOpacity(const optional<std::string>& klass = {}) const;
-    void setFillOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultFillOpacity();
+    DataDrivenPropertyValue<float> getFillOpacity(const optional<std::string>& klass = {}) const;
+    void setFillOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
 
-    static PropertyValue<Color> getDefaultFillColor();
-    PropertyValue<Color> getFillColor(const optional<std::string>& klass = {}) const;
-    void setFillColor(PropertyValue<Color>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<Color> getDefaultFillColor();
+    DataDrivenPropertyValue<Color> getFillColor(const optional<std::string>& klass = {}) const;
+    void setFillColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
 
-    static PropertyValue<Color> getDefaultFillOutlineColor();
-    PropertyValue<Color> getFillOutlineColor(const optional<std::string>& klass = {}) const;
-    void setFillOutlineColor(PropertyValue<Color>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<Color> getDefaultFillOutlineColor();
+    DataDrivenPropertyValue<Color> getFillOutlineColor(const optional<std::string>& klass = {}) const;
+    void setFillOutlineColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
 
     static PropertyValue<std::array<float, 2>> getDefaultFillTranslate();
     PropertyValue<std::array<float, 2>> getFillTranslate(const optional<std::string>& klass = {}) const;
diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs
index 15d0fcee61..0c902de5af 100644
--- a/include/mbgl/style/layers/layer.hpp.ejs
+++ b/include/mbgl/style/layers/layer.hpp.ejs
@@ -10,6 +10,7 @@
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
+#include <mbgl/style/data_driven_property_value.hpp>
 
 #include <mbgl/util/color.hpp>
 
@@ -45,18 +46,18 @@ public:
     // Layout properties
 
 <% for (const property of layoutProperties) { -%>
-    static PropertyValue<<%- propertyType(property) %>> getDefault<%- camelize(property.name) %>();
-    PropertyValue<<%- propertyType(property) %>> get<%- camelize(property.name) %>() const;
-    void set<%- camelize(property.name) %>(PropertyValue<<%- propertyType(property) %>>);
+    static <%- propertyValueType(property) %> getDefault<%- camelize(property.name) %>();
+    <%- propertyValueType(property) %> get<%- camelize(property.name) %>() const;
+    void set<%- camelize(property.name) %>(<%- propertyValueType(property) %>);
 
 <% } -%>
 <% } -%>
     // Paint properties
 
 <% for (const property of paintProperties) { -%>
-    static PropertyValue<<%- propertyType(property) %>> getDefault<%- camelize(property.name) %>();
-    PropertyValue<<%- propertyType(property) %>> get<%- camelize(property.name) %>(const optional<std::string>& klass = {}) const;
-    void set<%- camelize(property.name) %>(PropertyValue<<%- propertyType(property) %>>, const optional<std::string>& klass = {});
+    static <%- propertyValueType(property) %> getDefault<%- camelize(property.name) %>();
+    <%- propertyValueType(property) %> get<%- camelize(property.name) %>(const optional<std::string>& klass = {}) const;
+    void set<%- camelize(property.name) %>(<%- propertyValueType(property) %>, const optional<std::string>& klass = {});
 
 <% } -%>
     // Private implementation
diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp
index c3c1026bcd..c9413f1096 100644
--- a/include/mbgl/style/layers/line_layer.hpp
+++ b/include/mbgl/style/layers/line_layer.hpp
@@ -5,6 +5,7 @@
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
+#include <mbgl/style/data_driven_property_value.hpp>
 
 #include <mbgl/util/color.hpp>
 
@@ -46,13 +47,13 @@ public:
 
     // Paint properties
 
-    static PropertyValue<float> getDefaultLineOpacity();
-    PropertyValue<float> getLineOpacity(const optional<std::string>& klass = {}) const;
-    void setLineOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultLineOpacity();
+    DataDrivenPropertyValue<float> getLineOpacity(const optional<std::string>& klass = {}) const;
+    void setLineOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
 
-    static PropertyValue<Color> getDefaultLineColor();
-    PropertyValue<Color> getLineColor(const optional<std::string>& klass = {}) const;
-    void setLineColor(PropertyValue<Color>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<Color> getDefaultLineColor();
+    DataDrivenPropertyValue<Color> getLineColor(const optional<std::string>& klass = {}) const;
+    void setLineColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
 
     static PropertyValue<std::array<float, 2>> getDefaultLineTranslate();
     PropertyValue<std::array<float, 2>> getLineTranslate(const optional<std::string>& klass = {}) const;
@@ -66,17 +67,17 @@ public:
     PropertyValue<float> getLineWidth(const optional<std::string>& klass = {}) const;
     void setLineWidth(PropertyValue<float>, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultLineGapWidth();
-    PropertyValue<float> getLineGapWidth(const optional<std::string>& klass = {}) const;
-    void setLineGapWidth(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultLineGapWidth();
+    DataDrivenPropertyValue<float> getLineGapWidth(const optional<std::string>& klass = {}) const;
+    void setLineGapWidth(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultLineOffset();
-    PropertyValue<float> getLineOffset(const optional<std::string>& klass = {}) const;
-    void setLineOffset(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultLineOffset();
+    DataDrivenPropertyValue<float> getLineOffset(const optional<std::string>& klass = {}) const;
+    void setLineOffset(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultLineBlur();
-    PropertyValue<float> getLineBlur(const optional<std::string>& klass = {}) const;
-    void setLineBlur(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultLineBlur();
+    DataDrivenPropertyValue<float> getLineBlur(const optional<std::string>& klass = {}) const;
+    void setLineBlur(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
 
     static PropertyValue<std::vector<float>> getDefaultLineDasharray();
     PropertyValue<std::vector<float>> getLineDasharray(const optional<std::string>& klass = {}) const;
diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp
index ae6ec7f91c..e998abf12a 100644
--- a/include/mbgl/style/layers/raster_layer.hpp
+++ b/include/mbgl/style/layers/raster_layer.hpp
@@ -5,6 +5,7 @@
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
+#include <mbgl/style/data_driven_property_value.hpp>
 
 #include <mbgl/util/color.hpp>
 
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
index 1e2e6ac454..8826408e81 100644
--- a/include/mbgl/style/layers/symbol_layer.hpp
+++ b/include/mbgl/style/layers/symbol_layer.hpp
@@ -5,6 +5,7 @@
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
+#include <mbgl/style/data_driven_property_value.hpp>
 
 #include <mbgl/util/color.hpp>
 
@@ -72,9 +73,9 @@ public:
     PropertyValue<std::string> getIconImage() const;
     void setIconImage(PropertyValue<std::string>);
 
-    static PropertyValue<float> getDefaultIconRotate();
-    PropertyValue<float> getIconRotate() const;
-    void setIconRotate(PropertyValue<float>);
+    static DataDrivenPropertyValue<float> getDefaultIconRotate();
+    DataDrivenPropertyValue<float> getIconRotate() const;
+    void setIconRotate(DataDrivenPropertyValue<float>);
 
     static PropertyValue<float> getDefaultIconPadding();
     PropertyValue<float> getIconPadding() const;
@@ -84,9 +85,9 @@ public:
     PropertyValue<bool> getIconKeepUpright() const;
     void setIconKeepUpright(PropertyValue<bool>);
 
-    static PropertyValue<std::array<float, 2>> getDefaultIconOffset();
-    PropertyValue<std::array<float, 2>> getIconOffset() const;
-    void setIconOffset(PropertyValue<std::array<float, 2>>);
+    static DataDrivenPropertyValue<std::array<float, 2>> getDefaultIconOffset();
+    DataDrivenPropertyValue<std::array<float, 2>> getIconOffset() const;
+    void setIconOffset(DataDrivenPropertyValue<std::array<float, 2>>);
 
     static PropertyValue<AlignmentType> getDefaultTextPitchAlignment();
     PropertyValue<AlignmentType> getTextPitchAlignment() const;
-- 
cgit v1.2.1