diff options
| author | Fabian Guerra Soto <fabian.guerra@mapbox.com> | 2018-05-17 14:47:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-17 14:47:01 -0400 |
| commit | 1aa5c67837a19d5f8ba8f7336f183da83e68441c (patch) | |
| tree | 9185feeb7da4f0890b150367b138c7b81783cd4d /platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm | |
| parent | 4ceb687f6c7bdb4cd768310eeae558d826dcf506 (diff) | |
| download | qtlocation-mapboxgl-1aa5c67837a19d5f8ba8f7336f183da83e68441c.tar.gz | |
[ios, macos] Support array values in match expressions. (#11866)android-v6.2.0-alpha.1
* [ios, macos] Support array values in match expressions.
* [ios, macos] Update mgl_match documentation.
* [ios, macos] Update changelogs.
* [ios, macos] Clarify match expressions documentation.
Diffstat (limited to 'platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm')
| -rw-r--r-- | platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm b/platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm index 380215ff32..15aa71419d 100644 --- a/platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm +++ b/platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm @@ -115,15 +115,14 @@ return @[op, leftHandPredicate.mgl_jsonExpressionObject, rightHandPredicate.mgl_jsonExpressionObject]; } case NSInPredicateOperatorType: { - NSMutableArray *elements = [NSMutableArray arrayWithObjects:@"match", self.leftExpression.mgl_jsonExpressionObject, nil]; - NSArray *optionsExpressions = self.rightExpression.constantValue; - for (id object in optionsExpressions) { - id option = ((NSExpression *)object).mgl_jsonExpressionObject; - [elements addObject:option]; - [elements addObject:@YES]; - } - [elements addObject:@NO]; - return elements; + + NSExpression *matchExpression = [NSExpression expressionForFunction:@"MGL_MATCH" + arguments:@[self.leftExpression, + self.rightExpression, + [NSExpression expressionForConstantValue:@YES], + [NSExpression expressionForConstantValue:@NO]]]; + + return matchExpression.mgl_jsonExpressionObject; } case NSContainsPredicateOperatorType: { NSPredicate *inPredicate = [NSComparisonPredicate predicateWithLeftExpression:self.rightExpression |