From ecd4aa14397ed081a521d8412557724e52f277f3 Mon Sep 17 00:00:00 2001
From: Young Hahn <young@mapbox.com>
Date: Fri, 10 Jun 2016 23:05:15 -0400
Subject: text-pitch-alignment (#5288)

* First pass at port of https://github.com/mapbox/mapbox-gl-js/pull/2668

* RotationAlignmentType => AlignmentType

* Handle undefined default value for text-pitch-alignment and implement inheritance for this value from text-rotation-alignment

* Update dependencies

* Move handling fo undefined default value out of camelize functions
---
 include/mbgl/style/layers/symbol_layer.hpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'include/mbgl/style/layers')

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>);
-- 
cgit v1.2.1