diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-10-05 11:10:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-05 11:10:07 -0700 |
| commit | 6877e3efe73fb6e103c2635f1e4b1c1866b17d5c (patch) | |
| tree | 543d9ce97c9ea273c419aec4f4233a55c9917c64 | |
| parent | f438bb68b0ee7243e987d453f659c95c504c32ce (diff) | |
| download | qtlocation-mapboxgl-6877e3efe73fb6e103c2635f1e4b1c1866b17d5c.tar.gz | |
[ios, macos] Remove support for CONTAINS operator (#6590)
* [ios, macos] Removed support for CONTAINS operator
* [ios, macos] Removed CONTAINS test
| -rw-r--r-- | platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm | 7 | ||||
| -rw-r--r-- | platform/darwin/test/MGLFilterTests.mm | 12 |
2 files changed, 1 insertions, 18 deletions
diff --git a/platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm b/platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm index 19c264aa40..aa0e456bb1 100644 --- a/platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm +++ b/platform/darwin/src/NSComparisonPredicate+MGLAdditions.mm @@ -68,12 +68,6 @@ filter.values = self.rightExpression.mgl_filterValues; return filter; } - case NSContainsPredicateOperatorType: { - auto filter = mbgl::style::InFilter(); - filter.key = [self.rightExpression.constantValue UTF8String]; - filter.values = self.leftExpression.mgl_filterValues; - return filter; - } case NSBetweenPredicateOperatorType: { auto filter = mbgl::style::AllFilter(); auto gteFilter = mbgl::style::GreaterThanEqualsFilter(); @@ -91,6 +85,7 @@ case NSBeginsWithPredicateOperatorType: case NSEndsWithPredicateOperatorType: case NSCustomSelectorPredicateOperatorType: + case NSContainsPredicateOperatorType: [NSException raise:@"Unsupported operator type" format:@"NSPredicateOperatorType:%lu is not supported.", (unsigned long)self.predicateOperatorType]; } diff --git a/platform/darwin/test/MGLFilterTests.mm b/platform/darwin/test/MGLFilterTests.mm index 6fbe5f0157..d73313e27d 100644 --- a/platform/darwin/test/MGLFilterTests.mm +++ b/platform/darwin/test/MGLFilterTests.mm @@ -74,18 +74,6 @@ [self.mapView.style addLayer:layer]; } -- (void)testContainsPredicate -{ - // core does not have a "contains" filter but we can achieve the equivalent by creating an `mbgl::style::InFilter` - // and searching the value for the key - NSPredicate *expectedPredicate = [NSPredicate predicateWithFormat:@"park IN %@", @[@"park", @"neighbourhood"]]; - NSPredicate *containsPredicate = [NSPredicate predicateWithFormat:@"%@ CONTAINS %@", @[@"park", @"neighbourhood"], @"park"]; - - layer.predicate = containsPredicate; - XCTAssertEqualObjects(layer.predicate, expectedPredicate); - [self.mapView.style addLayer:layer]; -} - - (void)testBetweenPredicate { // core does not have a "between" filter but we can achieve the equivalent by creating a set of greater than or equal / less than or equal |