summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/style/layers/symbol_layer.hpp11
-rw-r--r--include/mbgl/style/types.hpp3
2 files changed, 9 insertions, 5 deletions
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
index 3806310c95..676d90d5b9 100644
--- a/include/mbgl/style/layers/symbol_layer.hpp
+++ b/include/mbgl/style/layers/symbol_layer.hpp
@@ -47,8 +47,8 @@ public:
PropertyValue<bool> getIconOptional() const;
void setIconOptional(PropertyValue<bool>);
- PropertyValue<RotationAlignmentType> getIconRotationAlignment() const;
- void setIconRotationAlignment(PropertyValue<RotationAlignmentType>);
+ PropertyValue<AlignmentType> getIconRotationAlignment() const;
+ void setIconRotationAlignment(PropertyValue<AlignmentType>);
PropertyValue<float> getIconSize() const;
void setIconSize(PropertyValue<float>);
@@ -68,8 +68,11 @@ public:
PropertyValue<std::array<float, 2>> getIconOffset() const;
void setIconOffset(PropertyValue<std::array<float, 2>>);
- PropertyValue<RotationAlignmentType> getTextRotationAlignment() const;
- void setTextRotationAlignment(PropertyValue<RotationAlignmentType>);
+ PropertyValue<AlignmentType> getTextPitchAlignment() const;
+ void setTextPitchAlignment(PropertyValue<AlignmentType>);
+
+ PropertyValue<AlignmentType> getTextRotationAlignment() const;
+ void setTextRotationAlignment(PropertyValue<AlignmentType>);
PropertyValue<std::string> getTextField() const;
void setTextField(PropertyValue<std::string>);
diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp
index 27b524a800..3be7b5d9c7 100644
--- a/include/mbgl/style/types.hpp
+++ b/include/mbgl/style/types.hpp
@@ -58,9 +58,10 @@ enum class SymbolPlacementType : bool {
Line,
};
-enum class RotationAlignmentType : bool {
+enum class AlignmentType : uint8_t {
Map,
Viewport,
+ Undefined,
};
enum class TextJustifyType : uint8_t {