[ios, macos] Fixed nilling out predicate
This commit is contained in:
committed by
Minh Nguyễn
parent
0a1987f091
commit
85fc75db8d
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
<% } -%>
|
||||
<% } -%>
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user