diff options
| author | Molly Lloyd <molly@mapbox.com> | 2017-03-27 17:30:58 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-28 11:06:58 -0700 |
| commit | 47c1e42ac1073ef02093b59336588f389f287227 (patch) | |
| tree | 9e1737ff6c56f2d07fa2eddab4055a19af5479ba /platform/darwin/src/MGLSymbolStyleLayer.mm | |
| parent | 5f402975267e0cb0baf87a13afcd0d1366791d01 (diff) | |
| download | qtlocation-mapboxgl-47c1e42ac1073ef02093b59336588f389f287227.tar.gz | |
[core] implement dds for text-offset
Diffstat (limited to 'platform/darwin/src/MGLSymbolStyleLayer.mm')
| -rw-r--r-- | platform/darwin/src/MGLSymbolStyleLayer.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/darwin/src/MGLSymbolStyleLayer.mm index 8441931685..6e35bf5dd2 100644 --- a/platform/darwin/src/MGLSymbolStyleLayer.mm +++ b/platform/darwin/src/MGLSymbolStyleLayer.mm @@ -763,7 +763,7 @@ namespace mbgl { - (void)setTextOffset:(MGLStyleValue<NSValue *> *)textOffset { MGLAssertStyleLayerIsValid(); - auto mbglValue = MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toInterpolatablePropertyValue(textOffset); + auto mbglValue = MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toDataDrivenPropertyValue(textOffset); self.rawLayer->setTextOffset(mbglValue); } @@ -772,9 +772,9 @@ namespace mbgl { auto propertyValue = self.rawLayer->getTextOffset(); if (propertyValue.isUndefined()) { - return MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toStyleValue(self.rawLayer->getDefaultTextOffset()); + return MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toDataDrivenStyleValue(self.rawLayer->getDefaultTextOffset()); } - return MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toStyleValue(propertyValue); + return MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toDataDrivenStyleValue(propertyValue); } - (void)setTextOptional:(MGLStyleValue<NSNumber *> *)textOptional { |