diff options
author | Chris Loer <chris.loer@gmail.com> | 2018-09-19 15:20:03 -0700 |
---|---|---|
committer | Chris Loer <chris.loer@mapbox.com> | 2018-10-15 13:15:46 -0700 |
commit | d0cd49f516d053620147e9f047252bd88374ac5d (patch) | |
tree | 55681fefb455cc7e3d6305c86d9a1d88e9dced84 /platform/darwin/src/NSExpression+MGLAdditions.mm | |
parent | ce76bde13d0f4381ee861f81daf636defaff0bc5 (diff) | |
download | qtlocation-mapboxgl-d0cd49f516d053620147e9f047252bd88374ac5d.tar.gz |
[ios, macos] Minimal darwin wrappers of 'format' expression
Add support for `MGL_FUNCTION('format', <text>, <options dictionary>)`
Diffstat (limited to 'platform/darwin/src/NSExpression+MGLAdditions.mm')
-rw-r--r-- | platform/darwin/src/NSExpression+MGLAdditions.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm index 58f5816416..1a8dff060c 100644 --- a/platform/darwin/src/NSExpression+MGLAdditions.mm +++ b/platform/darwin/src/NSExpression+MGLAdditions.mm @@ -1111,6 +1111,11 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) { // Avoid wrapping collator options object in literal expression. return @[@"collator", self.arguments[1].constantValue]; } + if (op.expressionType == NSConstantValueExpressionType + && [op.constantValue isEqualToString:@"format"]) { + // Avoid wrapping format options object in literal expression. + return @[@"format", self.arguments[1].mgl_jsonExpressionObject, self.arguments[2].constantValue]; + } return self.arguments.mgl_jsonExpressionObject; } else if (op == [MGLColor class] && [function isEqualToString:@"colorWithRed:green:blue:alpha:"]) { NSArray *arguments = self.arguments.mgl_jsonExpressionObject; |