diff options
author | Young Hahn <young@mapbox.com> | 2016-06-10 23:05:15 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-10 23:05:15 -0400 |
commit | ecd4aa14397ed081a521d8412557724e52f277f3 (patch) | |
tree | a04bca00190eba8f3f3947689ab6b7ff537e8946 /src/mbgl/style/layers/symbol_layer_properties.hpp | |
parent | a8df0feb5414af2c16bfdae27431d779e4545dbe (diff) | |
download | qtlocation-mapboxgl-ecd4aa14397ed081a521d8412557724e52f277f3.tar.gz |
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
Diffstat (limited to 'src/mbgl/style/layers/symbol_layer_properties.hpp')
-rw-r--r-- | src/mbgl/style/layers/symbol_layer_properties.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/style/layers/symbol_layer_properties.hpp b/src/mbgl/style/layers/symbol_layer_properties.hpp index 38455b5cac..e938a09c56 100644 --- a/src/mbgl/style/layers/symbol_layer_properties.hpp +++ b/src/mbgl/style/layers/symbol_layer_properties.hpp @@ -23,14 +23,15 @@ public: LayoutProperty<bool> iconAllowOverlap { false }; LayoutProperty<bool> iconIgnorePlacement { false }; LayoutProperty<bool> iconOptional { false }; - LayoutProperty<RotationAlignmentType> iconRotationAlignment { RotationAlignmentType::Viewport }; + LayoutProperty<AlignmentType> iconRotationAlignment { AlignmentType::Viewport }; LayoutProperty<float> iconSize { 1 }; LayoutProperty<std::string> iconImage { "" }; LayoutProperty<float> iconRotate { 0 }; LayoutProperty<float> iconPadding { 2 }; LayoutProperty<bool> iconKeepUpright { false }; LayoutProperty<std::array<float, 2>> iconOffset { {{ 0, 0 }} }; - LayoutProperty<RotationAlignmentType> textRotationAlignment { RotationAlignmentType::Viewport }; + LayoutProperty<AlignmentType> textPitchAlignment { AlignmentType::Undefined }; + LayoutProperty<AlignmentType> textRotationAlignment { AlignmentType::Viewport }; LayoutProperty<std::string> textField { "" }; LayoutProperty<std::vector<std::string>> textFont { { "Open Sans Regular", "Arial Unicode MS Regular" } }; LayoutProperty<float> textSize { 16 }; |