diff options
| author | Fabian Guerra Soto <fabian.guerra@mapbox.com> | 2019-03-22 13:45:39 -0700 |
|---|---|---|
| committer | Fabian Guerra Soto <fabian.guerra@mapbox.com> | 2019-03-22 15:08:58 -0700 |
| commit | 79582487aa69569933e38cadc0faf5ea04711303 (patch) | |
| tree | 7f44ae7c6654171fd58faaafd6bfd3ab7e9306aa /platform/darwin/docs/guides/Predicates and Expressions.md | |
| parent | be46a707f992ce48e65163353924e0d7be25c722 (diff) | |
| download | qtlocation-mapboxgl-79582487aa69569933e38cadc0faf5ea04711303.tar.gz | |
[ios, macos] Support expressions in formatting parameters. (#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/darwin/docs/guides/Predicates and Expressions.md')
| -rw-r--r-- | platform/darwin/docs/guides/Predicates and Expressions.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/darwin/docs/guides/Predicates and Expressions.md b/platform/darwin/docs/guides/Predicates and Expressions.md index 51617c8508..b2e01b94db 100644 --- a/platform/darwin/docs/guides/Predicates and Expressions.md +++ b/platform/darwin/docs/guides/Predicates and Expressions.md @@ -550,9 +550,9 @@ with the `MGLSymbolStyleLayer.text` property. Key | Value Type --- | --- - `MGLFontNamesAttribute` | `NSArray<NSString *>*` - `MGLFontSizeAttribute` | `NSNumber` - `MGLFontColorAttribute` | `UIColor` or `NSColor` on macos + `MGLFontNamesAttribute` | An `NSExpression` evaluating to an `NSString` array. + `MGLFontScaleAttribute` | An `NSExpression` evaluating to an `NSNumber` value. + `MGLFontColorAttribute` | An `NSExpression` evaluating to an `UIColor` (iOS) or `NSColor` (macOS). This function corresponds to the [`format`](https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-types-format) |