diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2017-01-12 14:17:20 -0800 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2017-01-12 16:19:14 -0800 |
| commit | 85fc75db8ddb5e045d5612fb38925535a8bb1804 (patch) | |
| tree | 603023d18db4b32a1eca6fa7e41235959d8ae19f | |
| parent | 0a1987f0915c478e0ec0057e9400c7d711980373 (diff) | |
| download | qtlocation-mapboxgl-85fc75db8ddb5e045d5612fb38925535a8bb1804.tar.gz | |
[ios, macos] Fixed nilling out predicate
| -rw-r--r-- | platform/darwin/src/MGLCircleStyleLayer.mm | 2 | ||||
| -rw-r--r-- | platform/darwin/src/MGLFillStyleLayer.mm | 2 | ||||
| -rw-r--r-- | platform/darwin/src/MGLLineStyleLayer.mm | 2 | ||||
| -rw-r--r-- | platform/darwin/src/MGLStyleLayer.mm.ejs | 4 | ||||
| -rw-r--r-- | platform/darwin/src/MGLSymbolStyleLayer.mm | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/platform/darwin/src/MGLCircleStyleLayer.mm b/platform/darwin/src/MGLCircleStyleLayer.mm index d454f21dd6..7ef1e0892a 100644 --- a/platform/darwin/src/MGLCircleStyleLayer.mm +++ b/platform/darwin/src/MGLCircleStyleLayer.mm @@ -80,7 +80,7 @@ namespace mbgl { { MGLAssertStyleLayerIsValid(); - self.rawLayer->setFilter(predicate.mgl_filter); + self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter()); } - (NSPredicate *)predicate diff --git a/platform/darwin/src/MGLFillStyleLayer.mm b/platform/darwin/src/MGLFillStyleLayer.mm index 136d4a11c9..560a1cab18 100644 --- a/platform/darwin/src/MGLFillStyleLayer.mm +++ b/platform/darwin/src/MGLFillStyleLayer.mm @@ -75,7 +75,7 @@ namespace mbgl { { MGLAssertStyleLayerIsValid(); - self.rawLayer->setFilter(predicate.mgl_filter); + self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter()); } - (NSPredicate *)predicate diff --git a/platform/darwin/src/MGLLineStyleLayer.mm b/platform/darwin/src/MGLLineStyleLayer.mm index 7d0d5ba6a5..f3b9f22df9 100644 --- a/platform/darwin/src/MGLLineStyleLayer.mm +++ b/platform/darwin/src/MGLLineStyleLayer.mm @@ -87,7 +87,7 @@ namespace mbgl { { MGLAssertStyleLayerIsValid(); - self.rawLayer->setFilter(predicate.mgl_filter); + self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter()); } - (NSPredicate *)predicate diff --git a/platform/darwin/src/MGLStyleLayer.mm.ejs b/platform/darwin/src/MGLStyleLayer.mm.ejs index c7e379eaa7..c3b9e92243 100644 --- a/platform/darwin/src/MGLStyleLayer.mm.ejs +++ b/platform/darwin/src/MGLStyleLayer.mm.ejs @@ -117,7 +117,7 @@ namespace mbgl { { MGLAssertStyleLayerIsValid(); - self.rawLayer->setFilter(predicate.mgl_filter); + self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter()); } - (NSPredicate *)predicate @@ -260,4 +260,4 @@ namespace mbgl { <% } -%> @end -<% } -%>
\ No newline at end of file +<% } -%> diff --git a/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/darwin/src/MGLSymbolStyleLayer.mm index d753442c61..c84f218cac 100644 --- a/platform/darwin/src/MGLSymbolStyleLayer.mm +++ b/platform/darwin/src/MGLSymbolStyleLayer.mm @@ -134,7 +134,7 @@ namespace mbgl { { MGLAssertStyleLayerIsValid(); - self.rawLayer->setFilter(predicate.mgl_filter); + self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::NullFilter()); } - (NSPredicate *)predicate |