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/annotation/annotation.hpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'include/mbgl/annotation')

diff --git a/include/mbgl/annotation/annotation.hpp b/include/mbgl/annotation/annotation.hpp
index a72c65b8c4..de83d24712 100644
--- a/include/mbgl/annotation/annotation.hpp
+++ b/include/mbgl/annotation/annotation.hpp
@@ -4,6 +4,7 @@
 #include <mbgl/util/variant.hpp>
 #include <mbgl/util/color.hpp>
 #include <mbgl/style/property_value.hpp>
+#include <mbgl/style/data_driven_property_value.hpp>
 
 #include <cstdint>
 #include <vector>
@@ -29,17 +30,17 @@ using ShapeAnnotationGeometry = variant<
 class LineAnnotation {
 public:
     ShapeAnnotationGeometry geometry;
-    style::PropertyValue<float> opacity { 1.0f };
+    style::DataDrivenPropertyValue<float> opacity { 1.0f };
     style::PropertyValue<float> width { 1.0f };
-    style::PropertyValue<Color> color { Color::black() };
+    style::DataDrivenPropertyValue<Color> color { Color::black() };
 };
 
 class FillAnnotation {
 public:
     ShapeAnnotationGeometry geometry;
-    style::PropertyValue<float> opacity { 1.0f };
-    style::PropertyValue<Color> color { Color::black() };
-    style::PropertyValue<Color> outlineColor {};
+    style::DataDrivenPropertyValue<float> opacity { 1.0f };
+    style::DataDrivenPropertyValue<Color> color { Color::black() };
+    style::DataDrivenPropertyValue<Color> outlineColor {};
 };
 
 // An annotation whose type and properties are sourced from a style layer.
-- 
cgit v1.2.1