diff options
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 3a896d4c93..bd5cf30ad6 100644 --- a/src/mbgl/style/layers/symbol_layer.cpp +++ b/src/mbgl/style/layers/symbol_layer.cpp @@ -203,15 +203,15 @@ void SymbolLayer::setIconTextFitPadding(PropertyValue<std::array<float, 4>> valu impl->layout.unevaluated.get<IconTextFitPadding>() = value; impl->observer->onLayerLayoutPropertyChanged(*this, "icon-text-fit-padding"); } -PropertyValue<std::string> SymbolLayer::getDefaultIconImage() { +DataDrivenPropertyValue<std::string> SymbolLayer::getDefaultIconImage() { return IconImage::defaultValue(); } -PropertyValue<std::string> SymbolLayer::getIconImage() const { +DataDrivenPropertyValue<std::string> SymbolLayer::getIconImage() const { return impl->layout.unevaluated.get<IconImage>(); } -void SymbolLayer::setIconImage(PropertyValue<std::string> value) { +void SymbolLayer::setIconImage(DataDrivenPropertyValue<std::string> value) { if (value == getIconImage()) return; impl->layout.unevaluated.get<IconImage>() = value; diff --git a/src/mbgl/style/layers/symbol_layer_properties.hpp b/src/mbgl/style/layers/symbol_layer_properties.hpp index 4e4c64eec9..4f63ed419a 100644 --- a/src/mbgl/style/layers/symbol_layer_properties.hpp +++ b/src/mbgl/style/layers/symbol_layer_properties.hpp @@ -60,7 +60,7 @@ struct IconTextFitPadding : LayoutProperty<std::array<float, 4>> { static std::array<float, 4> defaultValue() { return {{ 0, 0, 0, 0 }}; } }; -struct IconImage : LayoutProperty<std::string> { +struct IconImage : DataDrivenLayoutProperty<std::string> { static constexpr const char * key = "icon-image"; static std::string defaultValue() { return ""; } }; |