Update macOS app

10 files changed, 13 insertions, 212 deletions

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..25a88ed97a 100644
--- a/platform/darwin/src/NSPredicate+MGLAdditions.mm
+++ b/platform/darwin/src/NSPredicate+MGLAdditions.mm
@@ -1,210 +1,11 @@
-#import "NSPredicate+MGLPrivateAdditions.h"
+#import "NSPredicate+MGLAdditions.h"
 
 #import "MGLValueEvaluator.h"
 #import "MGLStyleValue_Private.h"
 
 #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)
+@implementation NSPredicate (MGLAdditions)
 
 - (mbgl::style::Filter)mgl_filter
 {
@@ -224,8 +25,8 @@ public:
 
 + (instancetype)mgl_predicateWithFilter:(mbgl::style::Filter)filter
 {
-    FilterEvaluator evaluator;
-    return mbgl::style::Filter::visit(filter, evaluator);
+    id jsonObject = MGLJSONObjectFromMBGLExpression(*filter.expression);
+    return [NSPredicate mgl_predicateWithJSONObject:jsonObject];
 }
 
 @end
diff --git a/platform/darwin/test/MGLPredicateTests.mm b/platform/darwin/test/MGLPredicateTests.mm
index b725c63140..4d8ad56fb9 100644
--- a/platform/darwin/test/MGLPredicateTests.mm
+++ b/platform/darwin/test/MGLPredicateTests.mm
@@ -24,7 +24,7 @@ namespace mbgl {
 @implementation MGLPredicateTests
 
 - (void)testPredication {
-    XCTAssertNil([NSPredicate mgl_predicateWithFilter:mbgl::style::NullFilter()]);
+    XCTAssertNil([NSPredicate mgl_predicateWithFilter:mbgl::style::Filter()]);
     
     {
         mbgl::style::EqualsFilter filter = { .key = "a", .value = std::string("b") };
diff --git a/test/style/style_layer.test.cpp b/test/style/style_layer.test.cpp
index 77acca2868..624ed088c3 100644
--- a/test/style/style_layer.test.cpp
+++ b/test/style/style_layer.test.cpp
@@ -211,7 +211,7 @@ TEST(Layer, Observer) {
         EXPECT_EQ(layer.get(), &layer_);
         filterChanged = true;
     };
-    layer->setFilter(NullFilter());
+    layer->setFilter(Filter());
     EXPECT_TRUE(filterChanged);
 
     // Notifies observer on visibility change.