summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmkiley <jordan.kiley@mapbox.com>2019-09-19 15:16:19 -0700
committerjmkiley <jordan.kiley@mapbox.com>2019-09-25 14:28:56 -0700
commit650a23163b0c9d5feedf5e6a321a0cd664494402 (patch)
tree286fa22d107d7237a8b75a99df6d752c5c3cd4ad
parent06f4094502ec1490fd6168dc68b0257578d99869 (diff)
downloadqtlocation-mapboxgl-650a23163b0c9d5feedf5e6a321a0cd664494402.tar.gz
[ios] Add type check
-rw-r--r--platform/darwin/src/NSExpression+MGLAdditions.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm
index ee598bfdd5..1918dbaa3e 100644
--- a/platform/darwin/src/NSExpression+MGLAdditions.mm
+++ b/platform/darwin/src/NSExpression+MGLAdditions.mm
@@ -1056,8 +1056,8 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) {
case NSFunctionExpressionType: {
NSString *function = self.function;
- BOOL hasCollectionProperty = !(self.arguments.firstObject.expressionType == NSConstantValueExpressionType || self.arguments.firstObject.expressionType == NSKeyPathExpressionType
- || self.arguments.firstObject.expressionType == NSVariableExpressionType || !self.arguments.firstObject.expressionType
+ BOOL hasCollectionProperty = !( ! [self.arguments.firstObject isKindOfClass: [self class]] || self.arguments.firstObject.expressionType == NSConstantValueExpressionType || self.arguments.firstObject.expressionType == NSKeyPathExpressionType
+ || self.arguments.firstObject.expressionType == NSVariableExpressionType
);
NSString *op = MGLExpressionOperatorsByFunctionNames[function];
if (op) {