diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-30 16:02:59 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-31 13:26:27 -0700 |
commit | 743d95405363e0eea1b80e8c28bde245211f7868 (patch) | |
tree | 98cc6ab0a8980916ca704efd887a029a40d05d0e /src/mbgl/style/layers | |
parent | c4f9582bfa9be832eb2eb349249918db8b867ec9 (diff) | |
download | qtlocation-mapboxgl-743d95405363e0eea1b80e8c28bde245211f7868.tar.gz |
[core] Add DDS support for text-rotate
Diffstat (limited to 'src/mbgl/style/layers')
-rw-r--r-- | src/mbgl/style/layers/symbol_layer.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/style/layers/symbol_layer_properties.hpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp index 02e1e364f1..3a896d4c93 100644 --- a/src/mbgl/style/layers/symbol_layer.cpp +++ b/src/mbgl/style/layers/symbol_layer.cpp @@ -427,15 +427,15 @@ void SymbolLayer::setTextMaxAngle(PropertyValue<float> value) { impl->layout.unevaluated.get<TextMaxAngle>() = value; impl->observer->onLayerLayoutPropertyChanged(*this, "text-max-angle"); } -PropertyValue<float> SymbolLayer::getDefaultTextRotate() { +DataDrivenPropertyValue<float> SymbolLayer::getDefaultTextRotate() { return TextRotate::defaultValue(); } -PropertyValue<float> SymbolLayer::getTextRotate() const { +DataDrivenPropertyValue<float> SymbolLayer::getTextRotate() const { return impl->layout.unevaluated.get<TextRotate>(); } -void SymbolLayer::setTextRotate(PropertyValue<float> value) { +void SymbolLayer::setTextRotate(DataDrivenPropertyValue<float> value) { if (value == getTextRotate()) return; impl->layout.unevaluated.get<TextRotate>() = value; diff --git a/src/mbgl/style/layers/symbol_layer_properties.hpp b/src/mbgl/style/layers/symbol_layer_properties.hpp index e7cfb8d455..4e4c64eec9 100644 --- a/src/mbgl/style/layers/symbol_layer_properties.hpp +++ b/src/mbgl/style/layers/symbol_layer_properties.hpp @@ -140,7 +140,7 @@ struct TextMaxAngle : LayoutProperty<float> { static float defaultValue() { return 45; } }; -struct TextRotate : LayoutProperty<float> { +struct TextRotate : DataDrivenLayoutProperty<float> { static constexpr const char * key = "text-rotate"; static float defaultValue() { return 0; } }; |