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.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.cpp')
-rw-r--r-- | src/mbgl/style/layers/symbol_layer.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp index d7d6a02ace..282873b501 100644 --- a/src/mbgl/style/layers/symbol_layer.cpp +++ b/src/mbgl/style/layers/symbol_layer.cpp @@ -92,11 +92,11 @@ PropertyValue<bool> SymbolLayer::getIconOptional() const { void SymbolLayer::setIconOptional(PropertyValue<bool> value) { impl->layout.iconOptional.set(value); } -PropertyValue<RotationAlignmentType> SymbolLayer::getIconRotationAlignment() const { +PropertyValue<AlignmentType> SymbolLayer::getIconRotationAlignment() const { return impl->layout.iconRotationAlignment.get(); } -void SymbolLayer::setIconRotationAlignment(PropertyValue<RotationAlignmentType> value) { +void SymbolLayer::setIconRotationAlignment(PropertyValue<AlignmentType> value) { impl->layout.iconRotationAlignment.set(value); } PropertyValue<float> SymbolLayer::getIconSize() const { @@ -141,11 +141,18 @@ PropertyValue<std::array<float, 2>> SymbolLayer::getIconOffset() const { void SymbolLayer::setIconOffset(PropertyValue<std::array<float, 2>> value) { impl->layout.iconOffset.set(value); } -PropertyValue<RotationAlignmentType> SymbolLayer::getTextRotationAlignment() const { +PropertyValue<AlignmentType> SymbolLayer::getTextPitchAlignment() const { + return impl->layout.textPitchAlignment.get(); +} + +void SymbolLayer::setTextPitchAlignment(PropertyValue<AlignmentType> value) { + impl->layout.textPitchAlignment.set(value); +} +PropertyValue<AlignmentType> SymbolLayer::getTextRotationAlignment() const { return impl->layout.textRotationAlignment.get(); } -void SymbolLayer::setTextRotationAlignment(PropertyValue<RotationAlignmentType> value) { +void SymbolLayer::setTextRotationAlignment(PropertyValue<AlignmentType> value) { impl->layout.textRotationAlignment.set(value); } PropertyValue<std::string> SymbolLayer::getTextField() const { |