Merge pull request #1583 from dbauszus-glx/categorized-featurefilter

Theme filter and layer.featureFilter to filter features in style.

lib/layer/_layer.mjs

@@ -26,7 +26,6 @@ import formats from './format/_format.mjs';
 import fade from './fade.mjs';
 import changeEnd from './changeEnd.mjs'
 import featureHover from './featureHover.mjs';
-import featureFilter from './featureFilter.mjs';
 import * as featureFormats from './featureFormats.mjs';
 import * as featureFields from './featureFields.mjs';
 import featureStyle from './featureStyle.mjs';
@@ -43,7 +42,6 @@ export default {
   featureFormats,
   featureFields,
   featureHover,
-  featureFilter,
   featureStyle,
   fade,
   styleParser,

lib/layer/changeEnd.mjs

@@ -1,7 +1,7 @@
 /**
 ### mapp.layer.changeEnd(layer)
 
-@module /layer/featureFilter
+@module /layer/changeEnd
 */
 
 export default function (layer) {

lib/layer/featureStyle.mjs

@@ -50,19 +50,6 @@ export default function featureStyle(layer) {
       return null
     }
 
-    // A filter flag is set either in the layer styles object or in the theme.
-    if ((layer.style.filter || layer.style.theme?.filter)
-
-      // The current filter contains field keys.
-      && layer.filter.current && Object.keys(layer.filter.current).length
-
-      // Check whether the feature should be caught by layer feature filter.
-      && mapp.layer.featureFilter(layer.filter.current, feature)) {
-
-      // The feature will not be visible.
-      return null
-    }
-
     // Set style.default as feature.style.
     feature.style = layer.style.default
 
@@ -72,6 +59,9 @@ export default function featureStyle(layer) {
       mapp.layer.themes[layer.style.theme?.type]?.(layer.style.theme, feature)
     }
 
+    // The feature must not be displayed.
+    if (feature.style === null) return;
+
     // Style cluster point features.
     clusterStyle(feature, layer)
 

lib/layer/themes/categorized.mjs

@@ -70,6 +70,12 @@ export default function categorized(theme, feature) {
 
   if (!cat) return;
 
+  if (cat.style === null) {
+
+    feature.style = null;
+    return;
+  }
+
   // Spread cat style to retain scale property
   feature.style = {
     ...feature.style,