1 files changed, 73 insertions, 2 deletions

diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm
index b095091b17..a7759cda9d 100644
--- a/platform/darwin/src/NSExpression+MGLAdditions.mm
+++ b/platform/darwin/src/NSExpression+MGLAdditions.mm
@@ -1,5 +1,12 @@
 #import "NSExpression+MGLAdditions.h"
 
+#import "MGLTypes.h"
+#if TARGET_OS_IPHONE
+    #import "UIColor+MGLAdditions.h"
+#else
+    #import "NSColor+MGLAdditions.h"
+#endif
+
 @implementation NSExpression (MGLAdditions)
 
 - (std::vector<mbgl::Value>)mgl_aggregateMBGLValue {
@@ -56,6 +63,9 @@
             // We use long long here to avoid any truncation.
             return { (int64_t)number.longLongValue };
         }
+    } else if ([value isKindOfClass:[MGLColor class]]) {
+        auto hexString = [(MGLColor *)value mgl_color].stringify();
+        return { hexString };
     } else if (value && value != [NSNull null]) {
         [NSException raise:NSInvalidArgumentException
                     format:@"Can’t convert %s:%@ to mbgl::Value", [value objCType], value];
@@ -63,9 +73,70 @@
     return {};
 }
 
+- (std::vector<mbgl::FeatureType>)mgl_aggregateFeatureType {
+    if ([self.constantValue isKindOfClass:[NSArray class]] || [self.constantValue isKindOfClass:[NSSet class]]) {
+        std::vector<mbgl::FeatureType> convertedValues;
+        for (id value in self.constantValue) {
+            NSExpression *expression = value;
+            if (![expression isKindOfClass:[NSExpression class]]) {
+                expression = [NSExpression expressionForConstantValue:expression];
+            }
+            convertedValues.push_back(expression.mgl_featureType);
+        }
+        return convertedValues;
+    }
+    [NSException raise:NSInvalidArgumentException
+                format:@"Constant value expression must contain an array or set."];
+    return {};
+}
+
+- (mbgl::FeatureType)mgl_featureType {
+    id value = self.constantValue;
+    if ([value isKindOfClass:NSString.class]) {
+        if ([value isEqualToString:@"Point"]) {
+            return mbgl::FeatureType::Point;
+        }
+        if ([value isEqualToString:@"LineString"]) {
+            return mbgl::FeatureType::LineString;
+        }
+        if ([value isEqualToString:@"Polygon"]) {
+            return mbgl::FeatureType::Polygon;
+        }
+    } else if ([value isKindOfClass:NSNumber.class]) {
+        switch ([value integerValue]) {
+            case 1:
+                return mbgl::FeatureType::Point;
+            case 2:
+                return mbgl::FeatureType::LineString;
+            case 3:
+                return mbgl::FeatureType::Polygon;
+            default:
+                break;
+        }
+    }
+    return mbgl::FeatureType::Unknown;
+}
+
+- (std::vector<mbgl::FeatureIdentifier>)mgl_aggregateFeatureIdentifier {
+    if ([self.constantValue isKindOfClass:[NSArray class]] || [self.constantValue isKindOfClass:[NSSet class]]) {
+        std::vector<mbgl::FeatureIdentifier> convertedValues;
+        for (id value in self.constantValue) {
+            NSExpression *expression = value;
+            if (![expression isKindOfClass:[NSExpression class]]) {
+                expression = [NSExpression expressionForConstantValue:expression];
+            }
+            convertedValues.push_back(expression.mgl_featureIdentifier);
+        }
+        return convertedValues;
+    }
+    [NSException raise:NSInvalidArgumentException
+                format:@"Constant value expression must contain an array or set."];
+    return {};
+}
+
 - (mbgl::FeatureIdentifier)mgl_featureIdentifier {
     mbgl::Value mbglValue = self.mgl_constantMBGLValue;
-    
+
     if (mbglValue.is<std::string>()) {
         return mbglValue.get<std::string>();
     }
@@ -78,7 +149,7 @@
     if (mbglValue.is<int64_t>()) {
         return mbglValue.get<int64_t>();
     }
-    
+
     return {};
 }