diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-04-23 17:33:30 -0400 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-05-04 13:48:09 -0400 |
| commit | c47f17d220c5a82c28cb4c1c298062e48241a9d0 (patch) | |
| tree | d23acb954f17c084631c03cb2fdfc3f0efba71ad | |
| parent | 8c864ee22d6d3064ee4b6c2efc4c3a82f8f38986 (diff) | |
| download | qtlocation-mapboxgl-c47f17d220c5a82c28cb4c1c298062e48241a9d0.tar.gz | |
[ios, macos] Refactored to-rgba to to-color.
| -rw-r--r-- | platform/darwin/src/NSExpression+MGLAdditions.mm | 10 | ||||
| -rw-r--r-- | platform/darwin/test/MGLExpressionTests.mm | 7 |
2 files changed, 11 insertions, 6 deletions
diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm index d9b2e29a7a..5fc9eb6cb9 100644 --- a/platform/darwin/src/NSExpression+MGLAdditions.mm +++ b/platform/darwin/src/NSExpression+MGLAdditions.mm @@ -802,7 +802,7 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) { } else if ([op isEqualToString:@"to-string"] || [op isEqualToString:@"string"]) { NSExpression *operand = [NSExpression expressionWithMGLJSONObject:argumentObjects.firstObject]; return [NSExpression expressionWithFormat:@"CAST(%@, 'NSString')", operand]; - } else if ([op isEqualToString:@"to-rgba"]) { + } else if ([op isEqualToString:@"to-color"]) { NSExpression *operand = [NSExpression expressionWithMGLJSONObject:argumentObjects.firstObject]; #if TARGET_OS_IPHONE return [NSExpression expressionWithFormat:@"CAST(%@, 'UIColor')", operand]; @@ -1174,12 +1174,12 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) { return @[@"to-number", object]; } #if TARGET_OS_IPHONE - else if ([type isEqualToString:@"UIColor"]) { - return @[@"to-rgba", object]; + else if ([type isEqualToString:@"UIColor"] || [type isEqualToString:@"MGLColor"]) { + return @[@"to-color", object]; } #else - else if ([type isEqualToString:@"NSColor"]) { - return @[@"to-rgba", object]; + else if ([type isEqualToString:@"NSColor"] || [type isEqualToString:@"MGLColor"]) { + return @[@"to-color", object]; } #endif [NSException raise:NSInvalidArgumentException diff --git a/platform/darwin/test/MGLExpressionTests.mm b/platform/darwin/test/MGLExpressionTests.mm index 0bfba4246a..942658e326 100644 --- a/platform/darwin/test/MGLExpressionTests.mm +++ b/platform/darwin/test/MGLExpressionTests.mm @@ -675,10 +675,15 @@ using namespace std::string_literals; NSExpression *expression = [NSExpression expressionWithFormat:@"CAST(x, 'NSColor')"]; #endif - NSArray *jsonExpression = @[@"to-rgba", @[@"get", @"x"]]; + NSArray *jsonExpression = @[@"to-color", @[@"get", @"x"]]; XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression); XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression); } + { + NSExpression *expression = [NSExpression expressionWithFormat:@"CAST(x, 'MGLColor')"]; + NSArray *jsonExpression = @[@"to-color", @[@"get", @"x"]]; + XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression); + } } - (void)testInterpolationExpressionObject { |