diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-21 11:55:02 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-21 12:04:20 -0700 |
commit | e488ca702e8f822ba6297a2f3c933ee22ca6ce42 (patch) | |
tree | 2efe93d84722f37a61b83155510a3da444fc171b /include/mbgl/style/layers/symbol_layer.hpp | |
parent | 1f8910de186f35216791a17a683a55f01031ec81 (diff) | |
parent | e0fe42d8321d19a4a9cb46edac9fbdb035e70a0c (diff) | |
download | qtlocation-mapboxgl-e488ca702e8f822ba6297a2f3c933ee22ca6ce42.tar.gz |
Merge branch 'release-ios-v3.5.0-android-v5.0.0'
Diffstat (limited to 'include/mbgl/style/layers/symbol_layer.hpp')
-rw-r--r-- | include/mbgl/style/layers/symbol_layer.hpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index aeccabb97e..d24f808bac 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -173,71 +173,85 @@ public: DataDrivenPropertyValue<float> getIconOpacity(const optional<std::string>& klass = {}) const; void setIconOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {}); void setIconOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {}); + TransitionOptions getIconOpacityTransition(const optional<std::string>& klass = {}) const; static DataDrivenPropertyValue<Color> getDefaultIconColor(); DataDrivenPropertyValue<Color> getIconColor(const optional<std::string>& klass = {}) const; void setIconColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {}); void setIconColorTransition(const TransitionOptions&, const optional<std::string>& klass = {}); + TransitionOptions getIconColorTransition(const optional<std::string>& klass = {}) const; static DataDrivenPropertyValue<Color> getDefaultIconHaloColor(); DataDrivenPropertyValue<Color> getIconHaloColor(const optional<std::string>& klass = {}) const; void setIconHaloColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {}); void setIconHaloColorTransition(const TransitionOptions&, const optional<std::string>& klass = {}); + TransitionOptions getIconHaloColorTransition(const optional<std::string>& klass = {}) const; static DataDrivenPropertyValue<float> getDefaultIconHaloWidth(); DataDrivenPropertyValue<float> getIconHaloWidth(const optional<std::string>& klass = {}) const; void setIconHaloWidth(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {}); void setIconHaloWidthTransition(const TransitionOptions&, const optional<std::string>& klass = {}); + TransitionOptions getIconHaloWidthTransition(const optional<std::string>& klass = {}) const; static DataDrivenPropertyValue<float> getDefaultIconHaloBlur(); DataDrivenPropertyValue<float> getIconHaloBlur(const optional<std::string>& klass = {}) const; void setIconHaloBlur(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {}); void setIconHaloBlurTransition(const TransitionOptions&, const optional<std::string>& klass = {}); + TransitionOptions getIconHaloBlurTransition(const optional<std::string>& klass = {}) const; static PropertyValue<std::array<float, 2>> getDefaultIconTranslate(); PropertyValue<std::array<float, 2>> getIconTranslate(const optional<std::string>& klass = {}) const; void setIconTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {}); void setIconTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {}); + TransitionOptions getIconTranslateTransition(const optional<std::string>& klass = {}) const; static PropertyValue<TranslateAnchorType> getDefaultIconTranslateAnchor(); PropertyValue<TranslateAnchorType> getIconTranslateAnchor(const optional<std::string>& klass = {}) const; void setIconTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {}); void setIconTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {}); + TransitionOptions getIconTranslateAnchorTransition(const optional<std::string>& klass = {}) const; static DataDrivenPropertyValue<float> getDefaultTextOpacity(); DataDrivenPropertyValue<float> getTextOpacity(const optional<std::string>& klass = {}) const; void setTextOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {}); void setTextOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {}); + TransitionOptions getTextOpacityTransition(const optional<std::string>& klass = {}) const; static DataDrivenPropertyValue<Color> getDefaultTextColor(); DataDrivenPropertyValue<Color> getTextColor(const optional<std::string>& klass = {}) const; void setTextColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {}); void setTextColorTransition(const TransitionOptions&, const optional<std::string>& klass = {}); + TransitionOptions getTextColorTransition(const optional<std::string>& klass = {}) const; static DataDrivenPropertyValue<Color> getDefaultTextHaloColor(); DataDrivenPropertyValue<Color> getTextHaloColor(const optional<std::string>& klass = {}) const; void setTextHaloColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {}); void setTextHaloColorTransition(const TransitionOptions&, const optional<std::string>& klass = {}); + TransitionOptions getTextHaloColorTransition(const optional<std::string>& klass = {}) const; static DataDrivenPropertyValue<float> getDefaultTextHaloWidth(); DataDrivenPropertyValue<float> getTextHaloWidth(const optional<std::string>& klass = {}) const; void setTextHaloWidth(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {}); void setTextHaloWidthTransition(const TransitionOptions&, const optional<std::string>& klass = {}); + TransitionOptions getTextHaloWidthTransition(const optional<std::string>& klass = {}) const; static DataDrivenPropertyValue<float> getDefaultTextHaloBlur(); DataDrivenPropertyValue<float> getTextHaloBlur(const optional<std::string>& klass = {}) const; void setTextHaloBlur(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {}); void setTextHaloBlurTransition(const TransitionOptions&, const optional<std::string>& klass = {}); + TransitionOptions getTextHaloBlurTransition(const optional<std::string>& klass = {}) const; static PropertyValue<std::array<float, 2>> getDefaultTextTranslate(); PropertyValue<std::array<float, 2>> getTextTranslate(const optional<std::string>& klass = {}) const; void setTextTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {}); void setTextTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {}); + TransitionOptions getTextTranslateTransition(const optional<std::string>& klass = {}) const; static PropertyValue<TranslateAnchorType> getDefaultTextTranslateAnchor(); PropertyValue<TranslateAnchorType> getTextTranslateAnchor(const optional<std::string>& klass = {}) const; void setTextTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {}); void setTextTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {}); + TransitionOptions getTextTranslateAnchorTransition(const optional<std::string>& klass = {}) const; // Private implementation |