[ios, macos] Convert length operator to length: for strings

Only works for literal strings.
mapbox · Mar 19, 2018 · f66b1ee · f66b1ee
1 parent c86892e
commit f66b1ee
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/platform/darwin/docs/guides/Predicates and Expressions.md b/platform/darwin/docs/guides/Predicates and Expressions.md
@@ -161,6 +161,7 @@ Initializer parameter | Format string syntax
 `uppercase:`          | `uppercase('Elysian Fields')`
 `lowercase:`          | `lowercase('DOWNTOWN')`
 `noindex:`            | `noindex(0 + 2 + c)`
+`length:`             | `length('Wapakoneta')`
 
 The following predefined functions are not supported:
 

diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm
@@ -421,7 +421,12 @@ + (instancetype)mgl_expressionWithJSONObject:(id)object {
             return [NSExpression expressionForKeyPath:argumentObjects.firstObject];
         } else if ([op isEqualToString:@"length"]) {
             NSArray *subexpressions = MGLSubexpressionsWithJSONObjects(argumentObjects);
-            return [NSExpression expressionForFunction:@"count:" arguments:@[subexpressions.firstObject]];
+            NSString *function = @"count:";
+            if ([subexpressions.firstObject expressionType] == NSConstantValueExpressionType
+                && [[subexpressions.firstObject constantValue] isKindOfClass:[NSString class]]) {
+                function = @"length:";
+            }
+            return [NSExpression expressionForFunction:function arguments:@[subexpressions.firstObject]];
         } else if ([op isEqualToString:@"min"]) {
             NSArray *subexpressions = MGLSubexpressionsWithJSONObjects(argumentObjects);
             NSExpression *subexpression = [NSExpression expressionForAggregate:subexpressions];
@@ -540,6 +545,7 @@ - (id)mgl_jsonExpressionObject {
             @"raise:toPower:": @"^",
             @"uppercase:": @"upcase",
             @"lowercase:": @"downcase",
+            @"length:": @"length",
         };
     });
 

diff --git a/platform/darwin/test/MGLExpressionTests.mm b/platform/darwin/test/MGLExpressionTests.mm
@@ -512,6 +512,12 @@ - (void)testStringFormattingExpressionObject {
         XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression);
         XCTAssertEqualObjects([NSExpression mgl_expressionWithJSONObject:jsonExpression], expression);
     }
+    {
+        NSExpression *expression = [NSExpression expressionForFunction:@"length:" arguments:arguments];
+        NSArray *jsonExpression = @[@"length", @"MacDonald"];
+        XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression);
+        XCTAssertEqualObjects([NSExpression mgl_expressionWithJSONObject:jsonExpression], expression);
+    }
 }
 
 - (void)testTypeConversionExpressionObject {