1 files changed, 27 insertions, 27 deletions

diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm
index 5493c59381..bd747dc97e 100644
--- a/platform/darwin/src/NSExpression+MGLAdditions.mm
+++ b/platform/darwin/src/NSExpression+MGLAdditions.mm
@@ -464,36 +464,22 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) {
         } else if ([op isEqualToString:@"var"]) {
             return [NSExpression expressionForVariable:argumentObjects.firstObject];
         } else if ([op isEqualToString:@"case"]) {
-            NSPredicate *conditional = [NSPredicate mgl_predicateWithJSONObject:argumentObjects.firstObject];
-            NSExpression *trueExpression;
-            NSInteger rightBranchIndex = 2;
-
-            if ([argumentObjects[1] isKindOfClass:[NSArray class]] ) {
-                NSInteger length = 1;
-                for (NSInteger index = 1; index < argumentObjects.count - 2; index++) {
-                    length++;
-                    if (![argumentObjects[index] isKindOfClass:[NSArray class]] && ![argumentObjects[index + 1] isKindOfClass:[NSArray class]]) {
-                        break;
-                    }
-                }
-                NSArray *trueObjects = [@[@"case"] arrayByAddingObjectsFromArray:
-                                         [argumentObjects subarrayWithRange:NSMakeRange(1, length)]];
-                trueExpression = [NSExpression mgl_expressionWithJSONObject:trueObjects];
-                rightBranchIndex = length + 1;
-            } else {
-                trueExpression = [NSExpression mgl_expressionWithJSONObject:argumentObjects[1]];
-            }
+            NSArray *caseExpressions = argumentObjects;
+            NSExpression *firstConditional = [NSExpression expressionWithFormat:@"%@", [NSPredicate mgl_predicateWithJSONObject:caseExpressions[0]]];
+            NSMutableArray *arguments = [NSMutableArray array];
             
-            NSExpression *falseExpression;
-            if ([argumentObjects[rightBranchIndex] isKindOfClass:[NSArray class]] ) {
-                NSArray *falseObjects = [@[@"case"] arrayByAddingObjectsFromArray:
-                                         [argumentObjects subarrayWithRange:NSMakeRange(rightBranchIndex, argumentObjects.count - rightBranchIndex)]];
-                falseExpression = [NSExpression mgl_expressionWithJSONObject:falseObjects];
-            } else {
-                falseExpression = [NSExpression mgl_expressionWithJSONObject:argumentObjects[rightBranchIndex]];
+            for (NSUInteger index = 1; index < caseExpressions.count; index++) {
+                if ([caseExpressions[index] isKindOfClass:[NSArray class]]) {
+                    NSPredicate *conditional = [NSPredicate mgl_predicateWithJSONObject:caseExpressions[index]];
+                    NSExpression *argument = [NSExpression expressionWithFormat:@"%@", conditional];
+                    [arguments addObject:argument];
+                } else {
+                    [arguments addObject:[NSExpression mgl_expressionWithJSONObject:caseExpressions[index]]];
+                }
+                
             }
             
-            return [NSExpression expressionForConditional:conditional trueExpression:trueExpression falseExpression:falseExpression];
+            return [NSExpression expressionForFunction:firstConditional selectorName:@"mgl_case:" arguments:arguments];
         } else {
             [NSException raise:NSInvalidArgumentException
                         format:@"Expression operator %@ not yet implemented.", op];
@@ -685,6 +671,20 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) {
                 }];
                 [expressionObject addObject:self.operand.mgl_jsonExpressionObject];
                 return expressionObject;
+            } else if ([function isEqualToString:@"mgl_case:"]) {
+                NSPredicate *firstConditional = (NSPredicate *)self.operand.constantValue;
+                NSMutableArray *expressionObject = [NSMutableArray arrayWithObjects:@"case", firstConditional.mgl_jsonExpressionObject, nil];
+                
+                for (NSExpression *option in self.arguments) {
+                    if ([option respondsToSelector:@selector(constantValue)] && [option.constantValue isKindOfClass:[NSComparisonPredicate class]]) {
+                        NSPredicate *predicate = (NSPredicate *)option.constantValue;
+                        [expressionObject addObject:predicate.mgl_jsonExpressionObject];
+                    } else {
+                        [expressionObject addObject:option.mgl_jsonExpressionObject];
+                    }
+                }
+                
+                return expressionObject;
             } else if ([function isEqualToString:@"median:"] ||
                        [function isEqualToString:@"mode:"] ||
                        [function isEqualToString:@"stddev:"] ||