diff options
| author | Young Hahn <young@mapbox.com> | 2016-09-21 19:07:33 -0400 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-21 16:07:33 -0700 |
| commit | 6a2ce352d1eec6dc166e351e06c6b10c633eb07c (patch) | |
| tree | 58e5682522a544cd9db5c1052d538148565be9da /src/mbgl/style/layers/symbol_layer.cpp | |
| parent | 673d8f90f24a89871905e80ef1bfd7970e61dc6c (diff) | |
| download | qtlocation-mapboxgl-6a2ce352d1eec6dc166e351e06c6b10c633eb07c.tar.gz | |
Better handling for undefined icon|text-rotation-alignment (#6253)
* [core, ios, android] Use `auto` value for properties with calculated defaults
* Fix render tests
Diffstat (limited to 'src/mbgl/style/layers/symbol_layer.cpp')
| -rw-r--r-- | src/mbgl/style/layers/symbol_layer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 { |