diff options
| author | Chris Loer <chris.loer@gmail.com> | 2017-07-11 11:22:39 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2017-07-12 14:14:09 -0700 |
| commit | e8657becc56c2aee5b070357092da028e752d461 (patch) | |
| tree | 21a877d6adacfc468b4d2c0223bffec49ea3f5dc /src/mbgl/style/layers/symbol_layer_properties.hpp | |
| parent | af10e2d3be5f24c1887622c63332a3cf67bc19d5 (diff) | |
| download | qtlocation-mapboxgl-e8657becc56c2aee5b070357092da028e752d461.tar.gz | |
[core] Update shaders.
Implements 'icon-pitch-alignment' (issue #9345)
Fixes issue #9456 (map-aligned point label regression)
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, 6 insertions, 0 deletions
diff --git a/src/mbgl/style/layers/symbol_layer_properties.hpp b/src/mbgl/style/layers/symbol_layer_properties.hpp index f7ceaecdaa..4b2bff01b8 100644 --- a/src/mbgl/style/layers/symbol_layer_properties.hpp +++ b/src/mbgl/style/layers/symbol_layer_properties.hpp @@ -87,6 +87,11 @@ struct IconOffset : DataDrivenLayoutProperty<std::array<float, 2>> { static std::array<float, 2> defaultValue() { return {{ 0, 0 }}; } }; +struct IconPitchAlignment : LayoutProperty<AlignmentType> { + static constexpr const char * key = "icon-pitch-alignment"; + static AlignmentType defaultValue() { return AlignmentType::Auto; } +}; + struct TextPitchAlignment : LayoutProperty<AlignmentType> { static constexpr const char * key = "text-pitch-alignment"; static AlignmentType defaultValue() { return AlignmentType::Auto; } @@ -254,6 +259,7 @@ class SymbolLayoutProperties : public Properties< IconPadding, IconKeepUpright, IconOffset, + IconPitchAlignment, TextPitchAlignment, TextRotationAlignment, TextField, |