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_properties.hpp | |
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_properties.hpp')
-rw-r--r-- | src/mbgl/style/layers/symbol_layer_properties.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/style/layers/symbol_layer_properties.hpp b/src/mbgl/style/layers/symbol_layer_properties.hpp index e4560ab486..fefa0ae05e 100644 --- a/src/mbgl/style/layers/symbol_layer_properties.hpp +++ b/src/mbgl/style/layers/symbol_layer_properties.hpp @@ -22,7 +22,7 @@ public: LayoutProperty<bool> iconAllowOverlap { false }; LayoutProperty<bool> iconIgnorePlacement { false }; LayoutProperty<bool> iconOptional { false }; - LayoutProperty<AlignmentType> iconRotationAlignment { AlignmentType::Viewport }; + LayoutProperty<AlignmentType> iconRotationAlignment { AlignmentType::Auto }; LayoutProperty<float> iconSize { 1 }; LayoutProperty<IconTextFitType> iconTextFit { IconTextFitType::None }; LayoutProperty<std::array<float, 4>> iconTextFitPadding { {{ 0, 0, 0, 0 }} }; @@ -31,8 +31,8 @@ public: LayoutProperty<float> iconPadding { 2 }; LayoutProperty<bool> iconKeepUpright { false }; LayoutProperty<std::array<float, 2>> iconOffset { {{ 0, 0 }} }; - LayoutProperty<AlignmentType> textPitchAlignment { AlignmentType::Undefined }; - LayoutProperty<AlignmentType> textRotationAlignment { AlignmentType::Viewport }; + LayoutProperty<AlignmentType> textPitchAlignment { AlignmentType::Auto }; + LayoutProperty<AlignmentType> textRotationAlignment { AlignmentType::Auto }; LayoutProperty<std::string> textField { "" }; LayoutProperty<std::vector<std::string>> textFont { { "Open Sans Regular", "Arial Unicode MS Regular" } }; LayoutProperty<float> textSize { 16 }; |