summaryrefslogtreecommitdiff
path: root/platform/macos/docs
diff options
context:
space:
mode:
authorFabian Guerra Soto <fabian.guerra@mapbox.com>2019-03-22 13:45:39 -0700
committerFabian Guerra <fabian.guerra@mapbox.com>2019-03-22 13:46:58 -0700
commitc4047d98a7e76a1b44e3b96ce0111ba7b5b9d2ce (patch)
treed3e902fd02b5cc58848bc1c190b2718b9da3c6a3 /platform/macos/docs
parent7f629b4ab53e3252b8fcd687e15b976aaaf9e47e (diff)
downloadqtlocation-mapboxgl-c4047d98a7e76a1b44e3b96ce0111ba7b5b9d2ce.tar.gz
[ios, macos] Support expressions in formatting parameters. (#14198)upstream/fabian-cp-14198
Modified MGLAttributedExpression object to support NSExpressions as formatting attributes only. This aligns with GL and Android implementation and specification. Modified the documentation accordingly, and changed MGLFontSizeAttribute to MGLFontScaleAttribute to clarify the true function of the formatting parameter.
Diffstat (limited to 'platform/macos/docs')
-rw-r--r--platform/macos/docs/guides/For Style Authors.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/macos/docs/guides/For Style Authors.md b/platform/macos/docs/guides/For Style Authors.md
index 220ce3d50e..5a81eb3593 100644
--- a/platform/macos/docs/guides/For Style Authors.md
+++ b/platform/macos/docs/guides/For Style Authors.md
@@ -419,7 +419,7 @@ can use to update the formatting of `MGLSymbolStyleLayer.text` property.
In style JSON | In Objective-C | In Swift
--------------|-----------------------|---------
`text-font` | `MGLFontNamesAttribute` | `.fontNamesAttribute`
-`font-scale` | `MGLFontSizeAttribute` | `.fontSizeAttribute`
+`font-scale` | `MGLFontScaleAttribute` | `.fontScaleAttribute`
`text-color` | `MGLFontColorAttribute` | `.fontColorAttribute`
See the “[Predicates and Expressions](predicates-and-expressions.html)” guide for