diff options
author | jmkiley <jordan.kiley@mapbox.com> | 2019-10-03 11:50:56 -0700 |
---|---|---|
committer | jmkiley <jordan.kiley@mapbox.com> | 2019-10-03 11:50:56 -0700 |
commit | f75a3f88a9bd6d4956066c4e0c77e23df7633728 (patch) | |
tree | 754f8a11959c32f2c0fdc2d6e7f00c568669eda2 | |
parent | 7e315ab1b6b4072ffbfa600e1e217f9deefac551 (diff) | |
download | qtlocation-mapboxgl-f75a3f88a9bd6d4956066c4e0c77e23df7633728.tar.gz |
[ios] formatting
-rw-r--r-- | platform/darwin/src/NSExpression+MGLAdditions.mm | 6 | ||||
-rw-r--r-- | platform/darwin/test/MGLExpressionTests.mm | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm index 9bbea4fa34..f139b86a88 100644 --- a/platform/darwin/src/NSExpression+MGLAdditions.mm +++ b/platform/darwin/src/NSExpression+MGLAdditions.mm @@ -1067,10 +1067,10 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) { return [NSExpression expressionForFunction:@"divide:by:" arguments:@[sum, count]].mgl_jsonExpressionObject; } else if ([function isEqualToString:@"sum:"]) { NSArray *arguments; - if (!hasCollectionProperty) { - arguments = [self.arguments valueForKeyPath:@"mgl_jsonExpressionObject"]; - } else { + if (hasCollectionProperty) { arguments = [self.arguments.firstObject.collection valueForKeyPath:@"mgl_jsonExpressionObject"]; + } else { + arguments = [self.arguments valueForKeyPath:@"mgl_jsonExpressionObject"]; } return [@[@"+"] arrayByAddingObjectsFromArray:arguments]; } else if ([function isEqualToString:@"count:"]) { diff --git a/platform/darwin/test/MGLExpressionTests.mm b/platform/darwin/test/MGLExpressionTests.mm index df162338f1..4ccd7adb6e 100644 --- a/platform/darwin/test/MGLExpressionTests.mm +++ b/platform/darwin/test/MGLExpressionTests.mm @@ -670,11 +670,11 @@ using namespace std::string_literals; NSExpression *expression = [NSExpression expressionForFunction:@"mgl_join:" arguments:@[@"Old", @"MacDonald"]]; NSExpression *aftermarketExpression = [NSExpression expressionWithFormat:@"mgl_join({'Old', 'MacDonald'})"]; NSArray *jsonExpression = @[@"concat", @"Old", @"MacDonald"]; - XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression); + XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression); - XCTAssertEqualObjects(aftermarketExpression.mgl_jsonExpressionObject, expression.mgl_jsonExpressionObject); - NSExpression *aggregateExpression = [NSExpression expressionWithMGLJSONObject:jsonExpression]; - XCTAssertEqualObjects(aggregateExpression.operand, expression.operand); + XCTAssertEqualObjects(aftermarketExpression.mgl_jsonExpressionObject, expression.mgl_jsonExpressionObject); + NSExpression *aggregateExpression = [NSExpression expressionWithMGLJSONObject:jsonExpression]; + XCTAssertEqualObjects(aggregateExpression.operand, expression.operand); } { NSExpression *expression = [NSExpression expressionForFunction:@"uppercase:" arguments:arguments]; |