[ios] Add type check

mapbox · Sep 25, 2019 · 650a231 · 650a231
1 parent 06f4094
commit 650a231
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm
@@ -1056,8 +1056,8 @@ - (id)mgl_jsonExpressionObject {
         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) {