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.cpp | |
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.cpp')
-rw-r--r-- | src/mbgl/style/layers/symbol_layer_properties.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mbgl/style/layers/symbol_layer_properties.cpp b/src/mbgl/style/layers/symbol_layer_properties.cpp index ce16ae2e50..5c6f65112d 100644 --- a/src/mbgl/style/layers/symbol_layer_properties.cpp +++ b/src/mbgl/style/layers/symbol_layer_properties.cpp @@ -19,6 +19,7 @@ void SymbolLayoutProperties::parse(const JSValue& value) { iconPadding.parse("icon-padding", value); iconKeepUpright.parse("icon-keep-upright", value); iconOffset.parse("icon-offset", value); + textPitchAlignment.parse("text-pitch-alignment", value); textRotationAlignment.parse("text-rotation-alignment", value); textField.parse("text-field", value); textFont.parse("text-font", value); @@ -53,6 +54,7 @@ void SymbolLayoutProperties::recalculate(const CalculationParameters& parameters iconPadding.calculate(parameters); iconKeepUpright.calculate(parameters); iconOffset.calculate(parameters); + textPitchAlignment.calculate(parameters); textRotationAlignment.calculate(parameters); textField.calculate(parameters); textFont.calculate(parameters); |