diff options
author | Fabian Guerra Soto <fabian.guerra@mapbox.com> | 2018-04-16 13:39:10 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-16 13:39:10 -0400 |
commit | fe4348eec34a3a9c23f7a0af2ccfa4eff28416ea (patch) | |
tree | 17ea2dfa4b30f0d32d7a917d6c0ec78e2db8d1c9 /platform/darwin/src | |
parent | 816406e038de02cbf654571a75a77ed51a53351c (diff) | |
download | qtlocation-mapboxgl-fe4348eec34a3a9c23f7a0af2ccfa4eff28416ea.tar.gz |
[ios, macos] Remove mgl_ prefix from built-in expressions variables. (#11689)
Diffstat (limited to 'platform/darwin/src')
-rw-r--r-- | platform/darwin/src/NSExpression+MGLAdditions.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm index 14b27cb329..3c42b80a13 100644 --- a/platform/darwin/src/NSExpression+MGLAdditions.mm +++ b/platform/darwin/src/NSExpression+MGLAdditions.mm @@ -664,11 +664,11 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) { } else if ([op isEqualToString:@"heatmap-density"]) { return [NSExpression expressionForVariable:@"heatmapDensity"]; } else if ([op isEqualToString:@"geometry-type"]) { - return [NSExpression expressionForVariable:@"mgl_geometryType"]; + return [NSExpression expressionForVariable:@"geometryType"]; } else if ([op isEqualToString:@"id"]) { - return [NSExpression expressionForVariable:@"mgl_featureIdentifier"]; + return [NSExpression expressionForVariable:@"featureIdentifier"]; } else if ([op isEqualToString:@"properties"]) { - return [NSExpression expressionForVariable:@"mgl_featureProperties"]; + return [NSExpression expressionForVariable:@"featureProperties"]; } else if ([op isEqualToString:@"var"]) { return [NSExpression expressionForVariable:argumentObjects.firstObject]; } else if ([op isEqualToString:@"case"]) { @@ -754,13 +754,13 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) { if ([self.variable isEqualToString:@"zoomLevel"]) { return @[@"zoom"]; } - if ([self.variable isEqualToString:@"mgl_geometryType"]) { + if ([self.variable isEqualToString:@"geometryType"]) { return @[@"geometry-type"]; } - if ([self.variable isEqualToString:@"mgl_featureIdentifier"]) { + if ([self.variable isEqualToString:@"featureIdentifier"]) { return @[@"id"]; } - if ([self.variable isEqualToString:@"mgl_featureProperties"]) { + if ([self.variable isEqualToString:@"featureProperties"]) { return @[@"properties"]; } return @[@"var", self.variable]; |