From 3ea1a7062ffcfd05c6e5e6fe2a9a96537ba8630a Mon Sep 17 00:00:00 2001 From: Fabian Guerra Soto Date: Wed, 23 May 2018 13:21:31 -0400 Subject: [ios, macos] Fix keypath expressions, json object is parsed incorrectly for nested keypaths. (#11959) * [ios, macos] Fix keypath expressions, a json object is parsed incorrectly for nested keypaths. * [ios, macos] Update changelogs. --- platform/darwin/test/MGLExpressionTests.mm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'platform/darwin/test') diff --git a/platform/darwin/test/MGLExpressionTests.mm b/platform/darwin/test/MGLExpressionTests.mm index dbdad2ed13..8870618cef 100644 --- a/platform/darwin/test/MGLExpressionTests.mm +++ b/platform/darwin/test/MGLExpressionTests.mm @@ -306,6 +306,18 @@ using namespace std::string_literals; XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression); XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression); } + { + NSExpression *expression = [NSExpression expressionForKeyPath:@"lineStyle.color"]; + NSArray *jsonExpression = @[@"get", @"color", @[@"get", @"lineStyle"]]; + XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression); + XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression); + } + { + NSExpression *expression = [NSExpression expressionForKeyPath:@"map.box.gl"]; + NSArray *jsonExpression = @[@"get", @"gl", @[@"get", @"box", @[@"get", @"map"]]]; + XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression); + XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression); + } } - (void)testStatisticalExpressionObject { -- cgit v1.2.1