diff options
Diffstat (limited to 'include/mbgl/style/layers/circle_layer.hpp')
| -rw-r--r-- | include/mbgl/style/layers/circle_layer.hpp | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp index 942dd67503..89ef926221 100644 --- a/include/mbgl/style/layers/circle_layer.hpp +++ b/include/mbgl/style/layers/circle_layer.hpp @@ -5,7 +5,6 @@ #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> @@ -36,27 +35,27 @@ public: // Paint properties - static DataDrivenPropertyValue<float> getDefaultCircleRadius(); - DataDrivenPropertyValue<float> getCircleRadius() const; - void setCircleRadius(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultCircleRadius(); + PropertyValue<float> getCircleRadius() const; + void setCircleRadius(PropertyValue<float>); void setCircleRadiusTransition(const TransitionOptions&); TransitionOptions getCircleRadiusTransition() const; - static DataDrivenPropertyValue<Color> getDefaultCircleColor(); - DataDrivenPropertyValue<Color> getCircleColor() const; - void setCircleColor(DataDrivenPropertyValue<Color>); + static PropertyValue<Color> getDefaultCircleColor(); + PropertyValue<Color> getCircleColor() const; + void setCircleColor(PropertyValue<Color>); void setCircleColorTransition(const TransitionOptions&); TransitionOptions getCircleColorTransition() const; - static DataDrivenPropertyValue<float> getDefaultCircleBlur(); - DataDrivenPropertyValue<float> getCircleBlur() const; - void setCircleBlur(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultCircleBlur(); + PropertyValue<float> getCircleBlur() const; + void setCircleBlur(PropertyValue<float>); void setCircleBlurTransition(const TransitionOptions&); TransitionOptions getCircleBlurTransition() const; - static DataDrivenPropertyValue<float> getDefaultCircleOpacity(); - DataDrivenPropertyValue<float> getCircleOpacity() const; - void setCircleOpacity(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultCircleOpacity(); + PropertyValue<float> getCircleOpacity() const; + void setCircleOpacity(PropertyValue<float>); void setCircleOpacityTransition(const TransitionOptions&); TransitionOptions getCircleOpacityTransition() const; @@ -84,21 +83,21 @@ public: void setCirclePitchAlignmentTransition(const TransitionOptions&); TransitionOptions getCirclePitchAlignmentTransition() const; - static DataDrivenPropertyValue<float> getDefaultCircleStrokeWidth(); - DataDrivenPropertyValue<float> getCircleStrokeWidth() const; - void setCircleStrokeWidth(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultCircleStrokeWidth(); + PropertyValue<float> getCircleStrokeWidth() const; + void setCircleStrokeWidth(PropertyValue<float>); void setCircleStrokeWidthTransition(const TransitionOptions&); TransitionOptions getCircleStrokeWidthTransition() const; - static DataDrivenPropertyValue<Color> getDefaultCircleStrokeColor(); - DataDrivenPropertyValue<Color> getCircleStrokeColor() const; - void setCircleStrokeColor(DataDrivenPropertyValue<Color>); + static PropertyValue<Color> getDefaultCircleStrokeColor(); + PropertyValue<Color> getCircleStrokeColor() const; + void setCircleStrokeColor(PropertyValue<Color>); void setCircleStrokeColorTransition(const TransitionOptions&); TransitionOptions getCircleStrokeColorTransition() const; - static DataDrivenPropertyValue<float> getDefaultCircleStrokeOpacity(); - DataDrivenPropertyValue<float> getCircleStrokeOpacity() const; - void setCircleStrokeOpacity(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultCircleStrokeOpacity(); + PropertyValue<float> getCircleStrokeOpacity() const; + void setCircleStrokeOpacity(PropertyValue<float>); void setCircleStrokeOpacityTransition(const TransitionOptions&); TransitionOptions getCircleStrokeOpacityTransition() const; |