diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-03-29 10:02:03 -0400 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-03-29 10:02:03 -0400 |
| commit | 5bb9ca26dd5fbb207d2266c9c672c173beb04de7 (patch) | |
| tree | 01f1f4f79ad936cad5109170d1ce367ff66472d3 | |
| parent | 9c70d383bf0d12eafeb17ed02341a33f45902a3b (diff) | |
| download | qtlocation-mapboxgl-upstream/1ec5-freedom-of-nsexpression-11015.tar.gz | |
[ios, macos] Update style docs.upstream/1ec5-freedom-of-nsexpression-11015
| -rw-r--r-- | platform/ios/docs/guides/For Style Authors.md | 6 | ||||
| -rw-r--r-- | platform/macos/docs/guides/For Style Authors.md | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/platform/ios/docs/guides/For Style Authors.md b/platform/ios/docs/guides/For Style Authors.md index ce9a68032e..7462112626 100644 --- a/platform/ios/docs/guides/For Style Authors.md +++ b/platform/ios/docs/guides/For Style Authors.md @@ -331,9 +331,9 @@ In style specification | Method, function, or predicate type | Format string syn `geometry-type` | |`$mgl_geometryType` `id` | |`$mgl_featureIdentifier` `properties` | |`$mgl_featureProperties` -`at` | `objectFrom:withIndex:` | +`at` | `objectFrom:withIndex:` | `array[n]` `get` | `+[NSExpression expressionForKeyPath:]` | Key path -`has` | `mgl_hasProperty:properties:` | +`has` | `mgl_does:have:` | `mgl_does:have:(self, 'key')` `length` | `count:` | `count({1, 2, 2, 3, 4, 7, 9})` `!` | `NSNotPredicateType` | `NOT (p0 OR … OR pn)` `!=` | `NSNotEqualToPredicateOperatorType` | `key != value` @@ -344,7 +344,7 @@ In style specification | Method, function, or predicate type | Format string syn `>=` | `NSGreaterThanOrEqualToPredicateOperatorType` | `key >= value` `all` | `NSAndPredicateType` | `p0 AND … AND pn` `any` | `NSOrPredicateType` | `p0 OR … OR pn` -`case` | `MGL_IF` | `MGL_IF(1 = 2, YES, 2 = 2, YES, NO)` +`case` | `+[NSExpression expressionForConditional:trueExpression:falseExpression:]` or `MGL_IF` | `TERNARY(1 = 2, YES, NO)` or `MGL_IF(1 = 2, YES, 2 = 2, YES, NO)` `coalesce` | `mgl_coalesce:` | `mgl_coalesce({x, y, z})` `match` | `MGL_MATCH` | `MGL_MATCH(x, 0, 'zero match', 1, 'one match', 'two match', 'default')` `interpolate` | `mgl_interpolate:withCurveType:parameters:stops:` | diff --git a/platform/macos/docs/guides/For Style Authors.md b/platform/macos/docs/guides/For Style Authors.md index a67cf3898f..d99d255273 100644 --- a/platform/macos/docs/guides/For Style Authors.md +++ b/platform/macos/docs/guides/For Style Authors.md @@ -324,9 +324,9 @@ In style specification | Method, function, or predicate type | Format string syn `geometry-type` | |`$mgl_geometryType` `id` | |`$mgl_featureIdentifier` `properties` | |`$mgl_featureProperties` -`at` | `objectFrom:withIndex:` | +`at` | `objectFrom:withIndex:` | `array[n]` `get` | `+[NSExpression expressionForKeyPath:]` | Key path -`has` | `mgl_hasProperty:properties:` | +`has` | `mgl_does:have:` | `mgl_does:have:(self, 'key')` `length` | `count:` | `count({1, 2, 2, 3, 4, 7, 9})` `!` | `NSNotPredicateType` | `NOT (p0 OR … OR pn)` `!=` | `NSNotEqualToPredicateOperatorType` | `key != value` @@ -337,7 +337,7 @@ In style specification | Method, function, or predicate type | Format string syn `>=` | `NSGreaterThanOrEqualToPredicateOperatorType` | `key >= value` `all` | `NSAndPredicateType` | `p0 AND … AND pn` `any` | `NSOrPredicateType` | `p0 OR … OR pn` -`case` | `MGL_IF` | `MGL_IF(1 = 2, YES, 2 = 2, YES, NO)` +`case` | `+[NSExpression expressionForConditional:trueExpression:falseExpression:]` or `MGL_IF` | `TERNARY(1 = 2, YES, NO)` or `MGL_IF(1 = 2, YES, 2 = 2, YES, NO)` `coalesce` | `mgl_coalesce:` | `mgl_coalesce({x, y, z})` `match` | `MGL_MATCH` | `MGL_MATCH(x, 0, 'zero match', 1, 'one match', 'two match', 'default')` `interpolate` | `mgl_interpolate:withCurveType:parameters:stops:` | |