From 6a2ce352d1eec6dc166e351e06c6b10c633eb07c Mon Sep 17 00:00:00 2001
From: Young Hahn <young@mapbox.com>
Date: Wed, 21 Sep 2016 19:07:33 -0400
Subject: Better handling for undefined icon|text-rotation-alignment (#6253)

* [core, ios, android] Use `auto` value for properties with calculated defaults

* Fix render tests
---
 src/mbgl/style/layers/symbol_layer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mbgl/style/layers/symbol_layer.cpp')

diff --git a/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp
index c9fd2c0988..6b4d7400da 100644
--- a/src/mbgl/style/layers/symbol_layer.cpp
+++ b/src/mbgl/style/layers/symbol_layer.cpp
@@ -144,7 +144,7 @@ void SymbolLayer::setIconOptional(PropertyValue<bool> value) {
     impl->observer->onLayerLayoutPropertyChanged(*this);
 }
 PropertyValue<AlignmentType> SymbolLayer::getDefaultIconRotationAlignment() {
-    return { AlignmentType::Viewport };
+    return { AlignmentType::Auto };
 }
 
 PropertyValue<AlignmentType> SymbolLayer::getIconRotationAlignment() const {
@@ -270,7 +270,7 @@ void SymbolLayer::setIconOffset(PropertyValue<std::array<float, 2>> value) {
     impl->observer->onLayerLayoutPropertyChanged(*this);
 }
 PropertyValue<AlignmentType> SymbolLayer::getDefaultTextPitchAlignment() {
-    return { AlignmentType::Undefined };
+    return { AlignmentType::Auto };
 }
 
 PropertyValue<AlignmentType> SymbolLayer::getTextPitchAlignment() const {
@@ -284,7 +284,7 @@ void SymbolLayer::setTextPitchAlignment(PropertyValue<AlignmentType> value) {
     impl->observer->onLayerLayoutPropertyChanged(*this);
 }
 PropertyValue<AlignmentType> SymbolLayer::getDefaultTextRotationAlignment() {
-    return { AlignmentType::Viewport };
+    return { AlignmentType::Auto };
 }
 
 PropertyValue<AlignmentType> SymbolLayer::getTextRotationAlignment() const {
-- 
cgit v1.2.1