diff options
Diffstat (limited to 'include/mbgl/style/layers/symbol_layer.hpp')
| -rw-r--r-- | include/mbgl/style/layers/symbol_layer.hpp | 151 |
1 files changed, 75 insertions, 76 deletions
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index f068e2d060..8c0b45d796 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_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> @@ -66,9 +65,9 @@ public: PropertyValue<AlignmentType> getIconRotationAlignment() const; void setIconRotationAlignment(PropertyValue<AlignmentType>); - static DataDrivenPropertyValue<float> getDefaultIconSize(); - DataDrivenPropertyValue<float> getIconSize() const; - void setIconSize(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultIconSize(); + PropertyValue<float> getIconSize() const; + void setIconSize(PropertyValue<float>); static PropertyValue<IconTextFitType> getDefaultIconTextFit(); PropertyValue<IconTextFitType> getIconTextFit() const; @@ -78,13 +77,13 @@ public: PropertyValue<std::array<float, 4>> getIconTextFitPadding() const; void setIconTextFitPadding(PropertyValue<std::array<float, 4>>); - static DataDrivenPropertyValue<std::string> getDefaultIconImage(); - DataDrivenPropertyValue<std::string> getIconImage() const; - void setIconImage(DataDrivenPropertyValue<std::string>); + static PropertyValue<std::string> getDefaultIconImage(); + PropertyValue<std::string> getIconImage() const; + void setIconImage(PropertyValue<std::string>); - static DataDrivenPropertyValue<float> getDefaultIconRotate(); - DataDrivenPropertyValue<float> getIconRotate() const; - void setIconRotate(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultIconRotate(); + PropertyValue<float> getIconRotate() const; + void setIconRotate(PropertyValue<float>); static PropertyValue<float> getDefaultIconPadding(); PropertyValue<float> getIconPadding() const; @@ -94,13 +93,13 @@ public: PropertyValue<bool> getIconKeepUpright() const; void setIconKeepUpright(PropertyValue<bool>); - static DataDrivenPropertyValue<std::array<float, 2>> getDefaultIconOffset(); - DataDrivenPropertyValue<std::array<float, 2>> getIconOffset() const; - void setIconOffset(DataDrivenPropertyValue<std::array<float, 2>>); + static PropertyValue<std::array<float, 2>> getDefaultIconOffset(); + PropertyValue<std::array<float, 2>> getIconOffset() const; + void setIconOffset(PropertyValue<std::array<float, 2>>); - static DataDrivenPropertyValue<SymbolAnchorType> getDefaultIconAnchor(); - DataDrivenPropertyValue<SymbolAnchorType> getIconAnchor() const; - void setIconAnchor(DataDrivenPropertyValue<SymbolAnchorType>); + static PropertyValue<SymbolAnchorType> getDefaultIconAnchor(); + PropertyValue<SymbolAnchorType> getIconAnchor() const; + void setIconAnchor(PropertyValue<SymbolAnchorType>); static PropertyValue<AlignmentType> getDefaultIconPitchAlignment(); PropertyValue<AlignmentType> getIconPitchAlignment() const; @@ -114,45 +113,45 @@ public: PropertyValue<AlignmentType> getTextRotationAlignment() const; void setTextRotationAlignment(PropertyValue<AlignmentType>); - static DataDrivenPropertyValue<std::string> getDefaultTextField(); - DataDrivenPropertyValue<std::string> getTextField() const; - void setTextField(DataDrivenPropertyValue<std::string>); + static PropertyValue<std::string> getDefaultTextField(); + PropertyValue<std::string> getTextField() const; + void setTextField(PropertyValue<std::string>); - static DataDrivenPropertyValue<std::vector<std::string>> getDefaultTextFont(); - DataDrivenPropertyValue<std::vector<std::string>> getTextFont() const; - void setTextFont(DataDrivenPropertyValue<std::vector<std::string>>); + static PropertyValue<std::vector<std::string>> getDefaultTextFont(); + PropertyValue<std::vector<std::string>> getTextFont() const; + void setTextFont(PropertyValue<std::vector<std::string>>); - static DataDrivenPropertyValue<float> getDefaultTextSize(); - DataDrivenPropertyValue<float> getTextSize() const; - void setTextSize(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultTextSize(); + PropertyValue<float> getTextSize() const; + void setTextSize(PropertyValue<float>); - static DataDrivenPropertyValue<float> getDefaultTextMaxWidth(); - DataDrivenPropertyValue<float> getTextMaxWidth() const; - void setTextMaxWidth(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultTextMaxWidth(); + PropertyValue<float> getTextMaxWidth() const; + void setTextMaxWidth(PropertyValue<float>); static PropertyValue<float> getDefaultTextLineHeight(); PropertyValue<float> getTextLineHeight() const; void setTextLineHeight(PropertyValue<float>); - static DataDrivenPropertyValue<float> getDefaultTextLetterSpacing(); - DataDrivenPropertyValue<float> getTextLetterSpacing() const; - void setTextLetterSpacing(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultTextLetterSpacing(); + PropertyValue<float> getTextLetterSpacing() const; + void setTextLetterSpacing(PropertyValue<float>); - static DataDrivenPropertyValue<TextJustifyType> getDefaultTextJustify(); - DataDrivenPropertyValue<TextJustifyType> getTextJustify() const; - void setTextJustify(DataDrivenPropertyValue<TextJustifyType>); + static PropertyValue<TextJustifyType> getDefaultTextJustify(); + PropertyValue<TextJustifyType> getTextJustify() const; + void setTextJustify(PropertyValue<TextJustifyType>); - static DataDrivenPropertyValue<SymbolAnchorType> getDefaultTextAnchor(); - DataDrivenPropertyValue<SymbolAnchorType> getTextAnchor() const; - void setTextAnchor(DataDrivenPropertyValue<SymbolAnchorType>); + static PropertyValue<SymbolAnchorType> getDefaultTextAnchor(); + PropertyValue<SymbolAnchorType> getTextAnchor() const; + void setTextAnchor(PropertyValue<SymbolAnchorType>); static PropertyValue<float> getDefaultTextMaxAngle(); PropertyValue<float> getTextMaxAngle() const; void setTextMaxAngle(PropertyValue<float>); - static DataDrivenPropertyValue<float> getDefaultTextRotate(); - DataDrivenPropertyValue<float> getTextRotate() const; - void setTextRotate(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultTextRotate(); + PropertyValue<float> getTextRotate() const; + void setTextRotate(PropertyValue<float>); static PropertyValue<float> getDefaultTextPadding(); PropertyValue<float> getTextPadding() const; @@ -162,13 +161,13 @@ public: PropertyValue<bool> getTextKeepUpright() const; void setTextKeepUpright(PropertyValue<bool>); - static DataDrivenPropertyValue<TextTransformType> getDefaultTextTransform(); - DataDrivenPropertyValue<TextTransformType> getTextTransform() const; - void setTextTransform(DataDrivenPropertyValue<TextTransformType>); + static PropertyValue<TextTransformType> getDefaultTextTransform(); + PropertyValue<TextTransformType> getTextTransform() const; + void setTextTransform(PropertyValue<TextTransformType>); - static DataDrivenPropertyValue<std::array<float, 2>> getDefaultTextOffset(); - DataDrivenPropertyValue<std::array<float, 2>> getTextOffset() const; - void setTextOffset(DataDrivenPropertyValue<std::array<float, 2>>); + static PropertyValue<std::array<float, 2>> getDefaultTextOffset(); + PropertyValue<std::array<float, 2>> getTextOffset() const; + void setTextOffset(PropertyValue<std::array<float, 2>>); static PropertyValue<bool> getDefaultTextAllowOverlap(); PropertyValue<bool> getTextAllowOverlap() const; @@ -184,33 +183,33 @@ public: // Paint properties - static DataDrivenPropertyValue<float> getDefaultIconOpacity(); - DataDrivenPropertyValue<float> getIconOpacity() const; - void setIconOpacity(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultIconOpacity(); + PropertyValue<float> getIconOpacity() const; + void setIconOpacity(PropertyValue<float>); void setIconOpacityTransition(const TransitionOptions&); TransitionOptions getIconOpacityTransition() const; - static DataDrivenPropertyValue<Color> getDefaultIconColor(); - DataDrivenPropertyValue<Color> getIconColor() const; - void setIconColor(DataDrivenPropertyValue<Color>); + static PropertyValue<Color> getDefaultIconColor(); + PropertyValue<Color> getIconColor() const; + void setIconColor(PropertyValue<Color>); void setIconColorTransition(const TransitionOptions&); TransitionOptions getIconColorTransition() const; - static DataDrivenPropertyValue<Color> getDefaultIconHaloColor(); - DataDrivenPropertyValue<Color> getIconHaloColor() const; - void setIconHaloColor(DataDrivenPropertyValue<Color>); + static PropertyValue<Color> getDefaultIconHaloColor(); + PropertyValue<Color> getIconHaloColor() const; + void setIconHaloColor(PropertyValue<Color>); void setIconHaloColorTransition(const TransitionOptions&); TransitionOptions getIconHaloColorTransition() const; - static DataDrivenPropertyValue<float> getDefaultIconHaloWidth(); - DataDrivenPropertyValue<float> getIconHaloWidth() const; - void setIconHaloWidth(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultIconHaloWidth(); + PropertyValue<float> getIconHaloWidth() const; + void setIconHaloWidth(PropertyValue<float>); void setIconHaloWidthTransition(const TransitionOptions&); TransitionOptions getIconHaloWidthTransition() const; - static DataDrivenPropertyValue<float> getDefaultIconHaloBlur(); - DataDrivenPropertyValue<float> getIconHaloBlur() const; - void setIconHaloBlur(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultIconHaloBlur(); + PropertyValue<float> getIconHaloBlur() const; + void setIconHaloBlur(PropertyValue<float>); void setIconHaloBlurTransition(const TransitionOptions&); TransitionOptions getIconHaloBlurTransition() const; @@ -226,33 +225,33 @@ public: void setIconTranslateAnchorTransition(const TransitionOptions&); TransitionOptions getIconTranslateAnchorTransition() const; - static DataDrivenPropertyValue<float> getDefaultTextOpacity(); - DataDrivenPropertyValue<float> getTextOpacity() const; - void setTextOpacity(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultTextOpacity(); + PropertyValue<float> getTextOpacity() const; + void setTextOpacity(PropertyValue<float>); void setTextOpacityTransition(const TransitionOptions&); TransitionOptions getTextOpacityTransition() const; - static DataDrivenPropertyValue<Color> getDefaultTextColor(); - DataDrivenPropertyValue<Color> getTextColor() const; - void setTextColor(DataDrivenPropertyValue<Color>); + static PropertyValue<Color> getDefaultTextColor(); + PropertyValue<Color> getTextColor() const; + void setTextColor(PropertyValue<Color>); void setTextColorTransition(const TransitionOptions&); TransitionOptions getTextColorTransition() const; - static DataDrivenPropertyValue<Color> getDefaultTextHaloColor(); - DataDrivenPropertyValue<Color> getTextHaloColor() const; - void setTextHaloColor(DataDrivenPropertyValue<Color>); + static PropertyValue<Color> getDefaultTextHaloColor(); + PropertyValue<Color> getTextHaloColor() const; + void setTextHaloColor(PropertyValue<Color>); void setTextHaloColorTransition(const TransitionOptions&); TransitionOptions getTextHaloColorTransition() const; - static DataDrivenPropertyValue<float> getDefaultTextHaloWidth(); - DataDrivenPropertyValue<float> getTextHaloWidth() const; - void setTextHaloWidth(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultTextHaloWidth(); + PropertyValue<float> getTextHaloWidth() const; + void setTextHaloWidth(PropertyValue<float>); void setTextHaloWidthTransition(const TransitionOptions&); TransitionOptions getTextHaloWidthTransition() const; - static DataDrivenPropertyValue<float> getDefaultTextHaloBlur(); - DataDrivenPropertyValue<float> getTextHaloBlur() const; - void setTextHaloBlur(DataDrivenPropertyValue<float>); + static PropertyValue<float> getDefaultTextHaloBlur(); + PropertyValue<float> getTextHaloBlur() const; + void setTextHaloBlur(PropertyValue<float>); void setTextHaloBlurTransition(const TransitionOptions&); TransitionOptions getTextHaloBlurTransition() const; |