[core] Convert "legacy" filters directly into expressions (#11610)

Ports the specialized filter-* expressions from GL JS, adding them to src/mbgl/style/expression/compound_expression.cpp

11 files changed, 26 insertions, 430 deletions

diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp
index 6fe6e3cb29..c7a6bcd3a3 100644
--- a/platform/android/src/style/layers/layer.cpp
+++ b/platform/android/src/style/layers/layer.cpp
@@ -157,14 +157,12 @@ namespace android {
         using namespace mbgl::style::conversion;
 
         Filter filter = layer.accept(GetFilterEvaluator());
-
-        jni::Object<gson::JsonElement> converted;
-        if (filter.is<ExpressionFilter>()) {
-            ExpressionFilter filterExpression = filter.get<ExpressionFilter>();
-            mbgl::Value expressionValue = filterExpression.expression.get()->serialize();
-            converted = gson::JsonElement::New(env, expressionValue);
+        if (filter.expression) {
+            mbgl::Value expressionValue = (*filter.expression)->serialize();
+            return gson::JsonElement::New(env, expressionValue);
+        } else {
+            return jni::Object<gson::JsonElement>();
         }
-        return converted;
     }
 
     struct SetSourceLayerEvaluator {
diff --git a/platform/darwin/src/MGLCircleStyleLayer.mm b/platform/darwin/src/MGLCircleStyleLayer.mm
index b85b3d9d4f..b03ab8a7a6 100644
--- a/platform/darwin/src/MGLCircleStyleLayer.mm
+++ b/platform/darwin/src/MGLCircleStyleLayer.mm
@@ -75,7 +75,7 @@ namespace mbgl {
 {
     MGLAssertStyleLayerIsValid();
 
-    self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter());
+    self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter());
 }
 
 - (NSPredicate *)predicate
diff --git a/platform/darwin/src/MGLFillExtrusionStyleLayer.mm b/platform/darwin/src/MGLFillExtrusionStyleLayer.mm
index ea29dff62d..4f3bfee18e 100644
--- a/platform/darwin/src/MGLFillExtrusionStyleLayer.mm
+++ b/platform/darwin/src/MGLFillExtrusionStyleLayer.mm
@@ -65,7 +65,7 @@ namespace mbgl {
 {
     MGLAssertStyleLayerIsValid();
 
-    self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter());
+    self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter());
 }
 
 - (NSPredicate *)predicate
diff --git a/platform/darwin/src/MGLFillStyleLayer.mm b/platform/darwin/src/MGLFillStyleLayer.mm
index 5be0decd4a..12e3643ce6 100644
--- a/platform/darwin/src/MGLFillStyleLayer.mm
+++ b/platform/darwin/src/MGLFillStyleLayer.mm
@@ -65,7 +65,7 @@ namespace mbgl {
 {
     MGLAssertStyleLayerIsValid();
 
-    self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter());
+    self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter());
 }
 
 - (NSPredicate *)predicate
diff --git a/platform/darwin/src/MGLHeatmapStyleLayer.mm b/platform/darwin/src/MGLHeatmapStyleLayer.mm
index b4bf4c9566..925b3ac750 100644
--- a/platform/darwin/src/MGLHeatmapStyleLayer.mm
+++ b/platform/darwin/src/MGLHeatmapStyleLayer.mm
@@ -56,7 +56,7 @@
 {
     MGLAssertStyleLayerIsValid();
 
-    self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter());
+    self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter());
 }
 
 - (NSPredicate *)predicate
diff --git a/platform/darwin/src/MGLLineStyleLayer.mm b/platform/darwin/src/MGLLineStyleLayer.mm
index b359c424a2..84412073cd 100644
--- a/platform/darwin/src/MGLLineStyleLayer.mm
+++ b/platform/darwin/src/MGLLineStyleLayer.mm
@@ -77,7 +77,7 @@ namespace mbgl {
 {
     MGLAssertStyleLayerIsValid();
 
-    self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter());
+    self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter());
 }
 
 - (NSPredicate *)predicate
diff --git a/platform/darwin/src/MGLStyleLayer.mm.ejs b/platform/darwin/src/MGLStyleLayer.mm.ejs
index ead246fb03..e7589c1f62 100644
--- a/platform/darwin/src/MGLStyleLayer.mm.ejs
+++ b/platform/darwin/src/MGLStyleLayer.mm.ejs
@@ -103,7 +103,7 @@ namespace mbgl {
 {
     MGLAssertStyleLayerIsValid();
 
-    self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter());
+    self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter());
 }
 
 - (NSPredicate *)predicate
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/darwin/src/MGLSymbolStyleLayer.mm
index 4236e04238..7ec7816c3b 100644
--- a/platform/darwin/src/MGLSymbolStyleLayer.mm
+++ b/platform/darwin/src/MGLSymbolStyleLayer.mm
@@ -142,7 +142,7 @@ namespace mbgl {
 {
     MGLAssertStyleLayerIsValid();
 
-    self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter());
+    self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter());
 }
 
 - (NSPredicate *)predicate
diff --git a/platform/darwin/src/NSPredicate+MGLAdditions.mm b/platform/darwin/src/NSPredicate+MGLAdditions.mm
index 07154cb246..4b9a4177cb 100644
--- a/platform/darwin/src/NSPredicate+MGLAdditions.mm
+++ b/platform/darwin/src/NSPredicate+MGLAdditions.mm
@@ -5,205 +5,6 @@
 
 #include <mbgl/style/conversion/filter.hpp>
 
-class FilterEvaluator {
-public:
-
-    NSArray *getPredicates(std::vector<mbgl::style::Filter> filters) {
-        NSMutableArray *predicates = [NSMutableArray arrayWithCapacity:filters.size()];
-        for (auto filter : filters) {
-            [predicates addObject:mbgl::style::Filter::visit(filter, FilterEvaluator())];
-        }
-        return predicates;
-    }
-
-    template <typename MBGLType>
-    NSExpression *getValues(std::vector<MBGLType> values) {
-        NSMutableArray *array = [NSMutableArray arrayWithCapacity:values.size()];
-        for (auto value : values) {
-            id constantValue = MBGLType::visit(value, ValueEvaluator());
-            [array addObject:[NSExpression expressionForConstantValue:constantValue]];
-        }
-        return [NSExpression expressionForAggregate:array];
-    }
-    
-    NSString *getFeatureTypeString(mbgl::FeatureType type) {
-        switch (type) {
-            case mbgl::FeatureType::Point:
-                return @"Point";
-                
-            case mbgl::FeatureType::LineString:
-                return @"LineString";
-                
-            case mbgl::FeatureType::Polygon:
-                return @"Polygon";
-                
-            default:
-                NSCAssert(NO, @"Unrecognized feature type %hhu", type);
-                return nil;
-        }
-    }
-    
-    NSExpression *getFeatureTypeStrings(std::vector<mbgl::FeatureType> values) {
-        NSMutableArray *array = [NSMutableArray arrayWithCapacity:values.size()];
-        for (auto value : values) {
-            id typeString = getFeatureTypeString(value);
-            [array addObject:[NSExpression expressionForConstantValue:typeString]];
-        }
-        return [NSExpression expressionForAggregate:array];
-    }
-
-    NSPredicate *operator()(mbgl::style::NullFilter filter) {
-        return nil;
-    }
-
-    NSPredicate *operator()(mbgl::style::EqualsFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K == %@", @(filter.key.c_str()), mbgl::Value::visit(filter.value, ValueEvaluator())];
-    }
-
-    NSPredicate *operator()(mbgl::style::NotEqualsFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K != %@", @(filter.key.c_str()), mbgl::Value::visit(filter.value, ValueEvaluator())];
-    }
-
-    NSPredicate *operator()(mbgl::style::GreaterThanFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K > %@", @(filter.key.c_str()), mbgl::Value::visit(filter.value, ValueEvaluator())];
-    }
-
-    NSPredicate *operator()(mbgl::style::GreaterThanEqualsFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K >= %@", @(filter.key.c_str()), mbgl::Value::visit(filter.value, ValueEvaluator())];
-    }
-
-    NSPredicate *operator()(mbgl::style::LessThanFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K < %@", @(filter.key.c_str()), mbgl::Value::visit(filter.value, ValueEvaluator())];
-    }
-
-    NSPredicate *operator()(mbgl::style::LessThanEqualsFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K <= %@", @(filter.key.c_str()), mbgl::Value::visit(filter.value, ValueEvaluator())];
-    }
-
-    NSPredicate *operator()(mbgl::style::InFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K IN %@", @(filter.key.c_str()), getValues(filter.values)];
-    }
-
-    NSPredicate *operator()(mbgl::style::NotInFilter filter) {
-        return [NSPredicate predicateWithFormat:@"NOT %K IN %@", @(filter.key.c_str()), getValues(filter.values)];
-    }
-    
-    NSPredicate *operator()(mbgl::style::TypeEqualsFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K == %@", @"$type", getFeatureTypeString(filter.value)];
-    }
-    
-    NSPredicate *operator()(mbgl::style::TypeNotEqualsFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K != %@", @"$type", getFeatureTypeString(filter.value)];
-    }
-    
-    NSPredicate *operator()(mbgl::style::TypeInFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K IN %@", @"$type", getFeatureTypeStrings(filter.values)];
-    }
-    
-    NSPredicate *operator()(mbgl::style::TypeNotInFilter filter) {
-        return [NSPredicate predicateWithFormat:@"NOT %K IN %@", @"$type", getFeatureTypeStrings(filter.values)];
-    }
-    
-    NSPredicate *operator()(mbgl::style::IdentifierEqualsFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K == %@", @"$id", mbgl::FeatureIdentifier::visit(filter.value, ValueEvaluator())];
-    }
-    
-    NSPredicate *operator()(mbgl::style::IdentifierNotEqualsFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K != %@", @"$id", mbgl::FeatureIdentifier::visit(filter.value, ValueEvaluator())];
-    }
-    
-    NSPredicate *operator()(mbgl::style::IdentifierInFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K IN %@", @"$id", getValues(filter.values)];
-    }
-    
-    NSPredicate *operator()(mbgl::style::IdentifierNotInFilter filter) {
-        return [NSPredicate predicateWithFormat:@"NOT %K IN %@", @"$id", getValues(filter.values)];
-    }
-
-    NSPredicate *operator()(mbgl::style::AnyFilter filter) {
-        NSArray *subpredicates = getPredicates(filter.filters);
-        if (subpredicates.count) {
-            return [NSCompoundPredicate orPredicateWithSubpredicates:subpredicates];
-        }
-        return [NSPredicate predicateWithValue:NO];
-    }
-
-    NSPredicate *operator()(mbgl::style::AllFilter filter) {
-        // Convert [all, [>=, key, lower], [<=, key, upper]] to key BETWEEN {lower, upper}
-        if (filter.filters.size() == 2) {
-            auto leftFilter = filter.filters[0];
-            auto rightFilter = filter.filters[1];
-
-            std::string lowerKey;
-            std::string upperKey;
-            mbgl::Value lowerBound;
-            mbgl::Value upperBound;
-            if (leftFilter.is<mbgl::style::GreaterThanEqualsFilter>()) {
-                lowerKey = leftFilter.get<mbgl::style::GreaterThanEqualsFilter>().key;
-                lowerBound = leftFilter.get<mbgl::style::GreaterThanEqualsFilter>().value;
-            } else if (rightFilter.is<mbgl::style::GreaterThanEqualsFilter>()) {
-                lowerKey = rightFilter.get<mbgl::style::GreaterThanEqualsFilter>().key;
-                lowerBound = rightFilter.get<mbgl::style::GreaterThanEqualsFilter>().value;
-            }
-
-            if (leftFilter.is<mbgl::style::LessThanEqualsFilter>()) {
-                upperKey = leftFilter.get<mbgl::style::LessThanEqualsFilter>().key;
-                upperBound = leftFilter.get<mbgl::style::LessThanEqualsFilter>().value;
-            } else if (rightFilter.is<mbgl::style::LessThanEqualsFilter>()) {
-                upperKey = rightFilter.get<mbgl::style::LessThanEqualsFilter>().key;
-                upperBound = rightFilter.get<mbgl::style::LessThanEqualsFilter>().value;
-            }
-
-            if (!lowerBound.is<mbgl::NullValue>() && !upperBound.is<mbgl::NullValue>()
-                && lowerKey == upperKey) {
-                return [NSPredicate predicateWithFormat:@"%K BETWEEN {%@, %@}",
-                        @(lowerKey.c_str()),
-                        mbgl::Value::visit(lowerBound, ValueEvaluator()),
-                        mbgl::Value::visit(upperBound, ValueEvaluator())];
-            }
-        }
-
-        NSArray *subpredicates = getPredicates(filter.filters);
-        if (subpredicates.count) {
-            return [NSCompoundPredicate andPredicateWithSubpredicates:subpredicates];
-        }
-        return [NSPredicate predicateWithValue:YES];
-    }
-
-    NSPredicate *operator()(mbgl::style::NoneFilter filter) {
-        NSArray *subpredicates = getPredicates(filter.filters);
-        if (subpredicates.count > 1) {
-            NSCompoundPredicate *predicate = [NSCompoundPredicate orPredicateWithSubpredicates:subpredicates];
-            return [NSCompoundPredicate notPredicateWithSubpredicate:predicate];
-        } else if (subpredicates.count) {
-            return [NSCompoundPredicate notPredicateWithSubpredicate:subpredicates.firstObject];
-        } else {
-            return [NSPredicate predicateWithValue:YES];
-        }
-    }
-
-    NSPredicate *operator()(mbgl::style::HasFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K != nil", @(filter.key.c_str())];
-    }
-
-    NSPredicate *operator()(mbgl::style::NotHasFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K == nil", @(filter.key.c_str())];
-    }
-    
-    NSPredicate *operator()(mbgl::style::HasIdentifierFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K != nil", @"$id"];
-    }
-    
-    NSPredicate *operator()(mbgl::style::NotHasIdentifierFilter filter) {
-        return [NSPredicate predicateWithFormat:@"%K == nil", @"$id"];
-    }
-    
-    NSPredicate *operator()(mbgl::style::ExpressionFilter filter) {
-        id jsonObject = MGLJSONObjectFromMBGLExpression(*filter.expression);
-        return [NSPredicate predicateWithMGLJSONObject:jsonObject];
-    }
-};
-
 @implementation NSPredicate (MGLPrivateAdditions)
 
 - (mbgl::style::Filter)mgl_filter
@@ -224,8 +25,12 @@ public:
 
 + (instancetype)mgl_predicateWithFilter:(mbgl::style::Filter)filter
 {
-    FilterEvaluator evaluator;
-    return mbgl::style::Filter::visit(filter, evaluator);
+    if (filter.expression) {
+        id jsonObject = MGLJSONObjectFromMBGLExpression(**filter.expression);
+        return [NSPredicate predicateWithMGLJSONObject:jsonObject];
+    } else {
+        return nil;
+    }
 }
 
 @end
diff --git a/platform/darwin/test/MGLPredicateTests.mm b/platform/darwin/test/MGLPredicateTests.mm
index b725c63140..4e7b3e7e4b 100644
--- a/platform/darwin/test/MGLPredicateTests.mm
+++ b/platform/darwin/test/MGLPredicateTests.mm
@@ -4,226 +4,12 @@
 #import "NSPredicate+MGLPrivateAdditions.h"
 #import "MGLValueEvaluator.h"
 
-namespace mbgl {
-    namespace style {
-        bool operator!=(const Filter &a, const Filter &b) {
-            return !(a == b);
-        }
-    }
-}
-
-#define MGLAssertEqualFilters(actual, expected, ...) \
-    XCTAssertTrue(actual.is<__typeof__(expected)>()); \
-    if (actual.is<__typeof__(expected)>()) { \
-        XCTAssertEqual(actual.get<__typeof__(expected)>(), expected, __VA_ARGS__); \
-    }
-
 @interface MGLPredicateTests : XCTestCase
 @end
 
 @implementation MGLPredicateTests
 
-- (void)testPredication {
-    XCTAssertNil([NSPredicate mgl_predicateWithFilter:mbgl::style::NullFilter()]);
-    
-    {
-        mbgl::style::EqualsFilter filter = { .key = "a", .value = std::string("b") };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithFormat:@"a = 'b'"]);
-    }
-    
-    {
-        mbgl::style::TypeEqualsFilter filter = { .value = mbgl::FeatureType::Point };
-        NSPredicate *expected = [NSPredicate predicateWithFormat:@"%K = 'Point'", @"$type"];
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], expected);
-    }
-    
-    {
-        mbgl::style::TypeEqualsFilter filter = { .value = mbgl::FeatureType::LineString };
-        NSPredicate *expected = [NSPredicate predicateWithFormat:@"%K = 'LineString'", @"$type"];
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], expected);
-    }
-    
-    {
-        mbgl::style::TypeEqualsFilter filter = { .value = mbgl::FeatureType::Polygon };
-        NSPredicate *expected = [NSPredicate predicateWithFormat:@"%K = 'Polygon'", @"$type"];
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], expected);
-    }
-    
-    {
-        mbgl::style::IdentifierEqualsFilter filter = { .value = UINT64_C(67086180) };
-        NSPredicate *expected = [NSPredicate predicateWithFormat:@"%K = 67086180", @"$id"];
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], expected);
-    }
-    
-    {
-        mbgl::style::NotHasIdentifierFilter filter;
-        NSPredicate *expected = [NSPredicate predicateWithFormat:@"%K = nil", @"$id"];
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], expected);
-    }
-    
-    {
-        mbgl::style::TypeEqualsFilter filter = { .value = mbgl::FeatureType::Unknown };
-        XCTAssertThrowsSpecificNamed([NSPredicate mgl_predicateWithFilter:filter], NSException, NSInternalInconsistencyException);
-    }
-    
-    {
-        mbgl::style::NotHasFilter filter = { .key = "a" };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithFormat:@"a = nil"]);
-    }
-    
-    {
-        mbgl::style::NotEqualsFilter filter = { .key = "a", .value = std::string("b") };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithFormat:@"a != 'b'"]);
-    }
-    
-    {
-        mbgl::style::TypeNotEqualsFilter filter = { .value = mbgl::FeatureType::Point };
-        NSPredicate *expected = [NSPredicate predicateWithFormat:@"%K != 'Point'", @"$type"];
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], expected);
-    }
-    
-    {
-        mbgl::style::IdentifierNotEqualsFilter filter = { .value = UINT64_C(67086180) };
-        NSPredicate *expected = [NSPredicate predicateWithFormat:@"%K != 67086180", @"$id"];
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], expected);
-    }
-    
-    {
-        mbgl::style::HasIdentifierFilter filter;
-        NSPredicate *expected = [NSPredicate predicateWithFormat:@"%K != nil", @"$id"];
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], expected);
-    }
-    
-    {
-        mbgl::style::HasFilter filter = { .key = "a" };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithFormat:@"a != nil"]);
-    }
-    
-    {
-        mbgl::style::LessThanFilter filter = { .key = "a", .value = std::string("b") };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithFormat:@"a < 'b'"]);
-    }
-    
-    {
-        mbgl::style::LessThanEqualsFilter filter = { .key = "a", .value = std::string("b") };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithFormat:@"a <= 'b'"]);
-    }
-    
-    {
-        mbgl::style::GreaterThanFilter filter = { .key = "a", .value = std::string("b") };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithFormat:@"a > 'b'"]);
-    }
-    
-    {
-        mbgl::style::GreaterThanEqualsFilter filter = { .key = "a", .value = std::string("b") };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithFormat:@"a >= 'b'"]);
-    }
-    
-    {
-        mbgl::style::AllFilter filter = {
-            .filters = {
-                mbgl::style::GreaterThanEqualsFilter { .key = "a", .value = std::string("b") },
-                mbgl::style::LessThanEqualsFilter { .key = "a", .value = std::string("z") },
-            },
-        };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithFormat:@"a BETWEEN {'b', 'z'}"]);
-    }
-    
-    {
-        mbgl::style::AllFilter filter = {
-            .filters = {
-                mbgl::style::LessThanEqualsFilter { .key = "a", .value = std::string("z") },
-                mbgl::style::GreaterThanEqualsFilter { .key = "a", .value = std::string("b") },
-            },
-        };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithFormat:@"a BETWEEN {'b', 'z'}"]);
-    }
-    
-    {
-        mbgl::style::InFilter filter = { .key = "a", .values = { std::string("b"), std::string("c") } };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter].predicateFormat, [NSPredicate predicateWithFormat:@"a IN {'b', 'c'}"].predicateFormat);
-    }
-    
-    {
-        mbgl::style::TypeInFilter filter = { .values = { mbgl::FeatureType::LineString, mbgl::FeatureType::Polygon } };
-        NSPredicate *expected = [NSPredicate predicateWithFormat:@"%K IN {'LineString', 'Polygon'}", @"$type"];
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter].predicateFormat, expected.predicateFormat);
-    }
-    
-    {
-        mbgl::style::IdentifierInFilter filter = { .values = { UINT64_C(67086180), UINT64_C(3709678893), UINT64_C(3352016856), UINT64_C(4189833989) } };
-        NSPredicate *expected = [NSPredicate predicateWithFormat:@"%K IN {67086180, 3709678893, 3352016856, 4189833989}", @"$id"];
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], expected);
-    }
-    
-    {
-        mbgl::style::NotInFilter filter = { .key = "a", .values = { std::string("b"), std::string("c") } };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter].predicateFormat, [NSPredicate predicateWithFormat:@"NOT a IN {'b', 'c'}"].predicateFormat);
-    }
-    
-    {
-        mbgl::style::TypeNotInFilter filter = { .values = { mbgl::FeatureType::LineString, mbgl::FeatureType::Polygon } };
-        NSPredicate *expected = [NSPredicate predicateWithFormat:@"NOT %K IN {'LineString', 'Polygon'}", @"$type"];
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter].predicateFormat, expected.predicateFormat);
-    }
-    
-    {
-        mbgl::style::IdentifierNotInFilter filter = { .values = { UINT64_C(67086180), UINT64_C(3709678893), UINT64_C(3352016856), UINT64_C(4189833989) } };
-        NSPredicate *expected = [NSPredicate predicateWithFormat:@"NOT %K IN {67086180, 3709678893, 3352016856, 4189833989}", @"$id"];
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], expected);
-    }
-    
-    {
-        mbgl::style::AllFilter filter;
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithValue:YES]);
-    }
-    
-    {
-        mbgl::style::AllFilter filter = {
-            .filters = {
-                mbgl::style::EqualsFilter { .key = "a", .value = std::string("b") },
-                mbgl::style::EqualsFilter { .key = "c", .value = std::string("d") },
-            },
-        };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithFormat:@"a == 'b' AND c == 'd'"]);
-    }
-    
-    {
-        mbgl::style::AnyFilter filter;
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithValue:NO]);
-    }
-    
-    {
-        mbgl::style::AnyFilter filter = {
-            .filters = {
-                mbgl::style::EqualsFilter { .key = "a", .value = std::string("b") },
-                mbgl::style::EqualsFilter { .key = "c", .value = std::string("d") },
-            },
-        };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithFormat:@"a == 'b' OR c == 'd'"]);
-    }
-    
-    {
-        mbgl::style::NoneFilter filter;
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithValue:YES]);
-    }
-    
-    {
-        mbgl::style::NoneFilter filter = {
-            .filters = {
-                mbgl::style::EqualsFilter { .key = "a", .value = std::string("b") },
-                mbgl::style::EqualsFilter { .key = "c", .value = std::string("d") },
-            },
-        };
-        XCTAssertEqualObjects([NSPredicate mgl_predicateWithFilter:filter], [NSPredicate predicateWithFormat:@"NOT(a == 'b' OR c == 'd')"]);
-    }
-}
-
 - (void)testUnsupportedFilterPredicates {
-    XCTAssertThrowsSpecificNamed([NSPredicate predicateWithFormat:@"1 == 2"].mgl_filter, NSException, NSInvalidArgumentException);
-    XCTAssertThrowsSpecificNamed([NSPredicate predicateWithFormat:@"1 == 1"].mgl_filter, NSException, NSInvalidArgumentException);
-    XCTAssertThrowsSpecificNamed([NSPredicate predicateWithValue:YES].mgl_filter, NSException, NSInvalidArgumentException);
-    XCTAssertThrowsSpecificNamed([NSPredicate predicateWithValue:NO].mgl_filter, NSException, NSInvalidArgumentException);
     XCTAssertThrowsSpecificNamed([NSPredicate predicateWithFormat:@"a BEGINSWITH 'L'"].mgl_filter, NSException, NSInvalidArgumentException);
     XCTAssertThrowsSpecificNamed([NSPredicate predicateWithFormat:@"a ENDSWITH 'itude'"].mgl_filter, NSException, NSInvalidArgumentException);
     XCTAssertThrowsSpecificNamed([NSPredicate predicateWithFormat:@"a LIKE 'glob?trotter'"].mgl_filter, NSException, NSInvalidArgumentException);
diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp
index 3988419265..362269b8e4 100644
--- a/platform/glfw/glfw_view.cpp
+++ b/platform/glfw/glfw_view.cpp
@@ -7,6 +7,8 @@
 #include <mbgl/style/image.hpp>
 #include <mbgl/style/transition_options.hpp>
 #include <mbgl/style/layers/fill_extrusion_layer.hpp>
+#include <mbgl/style/expression/compound_expression.hpp>
+#include <mbgl/style/expression/literal.hpp>
 #include <mbgl/util/logging.hpp>
 #include <mbgl/util/platform.hpp>
 #include <mbgl/util/string.hpp>
@@ -619,6 +621,9 @@ void GLFWView::onDidFinishLoadingStyle() {
 }
 
 void GLFWView::toggle3DExtrusions(bool visible) {
+    using namespace mbgl::style;
+    using namespace mbgl::style::expression;
+    
     show3DExtrusions = visible;
 
     // Satellite-only style does not contain building extrusions data.
@@ -634,7 +639,9 @@ void GLFWView::toggle3DExtrusions(bool visible) {
     auto extrusionLayer = std::make_unique<mbgl::style::FillExtrusionLayer>("3d-buildings", "composite");
     extrusionLayer->setSourceLayer("building");
     extrusionLayer->setMinZoom(15.0f);
-    extrusionLayer->setFilter(mbgl::style::EqualsFilter { "extrude", { std::string("true") } });
+    
+    ParsingContext parsingContext;
+    extrusionLayer->setFilter(Filter(createCompoundExpression("filter-==", createLiteral("extrude"), createLiteral("true"), parsingContext)));
 
     auto colorFn = mbgl::style::SourceFunction<mbgl::Color> { "height",
         mbgl::style::ExponentialStops<mbgl::Color> {