diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-28 16:39:50 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-02 09:44:42 -0800 |
commit | 141e995806576364d185626176c1b993fc519291 (patch) | |
tree | ecdc41fc7699f2a1a9e9456157348451ebe99597 /include/mbgl/annotation | |
parent | 6a6bddb4537004cc1bfc506e76772de74d33f3f7 (diff) | |
download | qtlocation-mapboxgl-141e995806576364d185626176c1b993fc519291.tar.gz |
[core] Add support for data-driven styling
Diffstat (limited to 'include/mbgl/annotation')
-rw-r--r-- | include/mbgl/annotation/annotation.hpp | 11 |
1 files changed, 6 insertions, 5 deletions
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. |