summaryrefslogtreecommitdiff
path: root/include/mbgl
diff options
context:
space:
mode:
authorMolly Lloyd <molly@mapbox.com>2017-03-27 17:30:58 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2017-03-28 11:06:58 -0700
commit47c1e42ac1073ef02093b59336588f389f287227 (patch)
tree9e1737ff6c56f2d07fa2eddab4055a19af5479ba /include/mbgl
parent5f402975267e0cb0baf87a13afcd0d1366791d01 (diff)
downloadqtlocation-mapboxgl-47c1e42ac1073ef02093b59336588f389f287227.tar.gz
[core] implement dds for text-offset
Diffstat (limited to 'include/mbgl')
-rw-r--r--include/mbgl/style/conversion/make_property_setters.hpp2
-rw-r--r--include/mbgl/style/layers/symbol_layer.hpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/mbgl/style/conversion/make_property_setters.hpp b/include/mbgl/style/conversion/make_property_setters.hpp
index 623cc09098..2f26fe75c4 100644
--- a/include/mbgl/style/conversion/make_property_setters.hpp
+++ b/include/mbgl/style/conversion/make_property_setters.hpp
@@ -60,7 +60,7 @@ auto makeLayoutPropertySetters() {
result["text-padding"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextPadding>;
result["text-keep-upright"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setTextKeepUpright>;
result["text-transform"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<TextTransformType>, &SymbolLayer::setTextTransform>;
- result["text-offset"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<std::array<float, 2>>, &SymbolLayer::setTextOffset>;
+ result["text-offset"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<std::array<float, 2>>, &SymbolLayer::setTextOffset>;
result["text-allow-overlap"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setTextAllowOverlap>;
result["text-ignore-placement"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setTextIgnorePlacement>;
result["text-optional"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setTextOptional>;
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
index d24f808bac..b507c992f5 100644
--- a/include/mbgl/style/layers/symbol_layer.hpp
+++ b/include/mbgl/style/layers/symbol_layer.hpp
@@ -151,9 +151,9 @@ public:
DataDrivenPropertyValue<TextTransformType> getTextTransform() const;
void setTextTransform(DataDrivenPropertyValue<TextTransformType>);
- static PropertyValue<std::array<float, 2>> getDefaultTextOffset();
- PropertyValue<std::array<float, 2>> getTextOffset() const;
- void setTextOffset(PropertyValue<std::array<float, 2>>);
+ static DataDrivenPropertyValue<std::array<float, 2>> getDefaultTextOffset();
+ DataDrivenPropertyValue<std::array<float, 2>> getTextOffset() const;
+ void setTextOffset(DataDrivenPropertyValue<std::array<float, 2>>);
static PropertyValue<bool> getDefaultTextAllowOverlap();
PropertyValue<bool> getTextAllowOverlap() const;