Only list relevant layers in custom filter layer selection

qgis · Feb 28, 2024 · 88aa083 · 88aa083
1 parent 2cf8031
commit 88aa083
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/plugins/MapFilter.jsx b/plugins/MapFilter.jsx
@@ -430,7 +430,7 @@ class MapFilter extends React.Component {
         }
         const layerNames = this.props.layers.reduce((res, layer) => {
             if (layer.role === LayerRole.THEME) {
-                return [...res, ...LayerUtils.getSublayerNames(layer)];
+                return [...res, ...LayerUtils.getSublayerNames(layer, true, lyr => !!lyr.geometryType)];
             }
             return res;
         }, []);

diff --git a/utils/LayerUtils.js b/utils/LayerUtils.js
@@ -540,9 +540,9 @@ const LayerUtils = {
             }
         }
     },
-    getSublayerNames(layer, toplevel = true) {
-        return [toplevel && layer.sublayers ? null : layer.name].concat((layer.sublayers || []).reduce((list, sublayer) => {
-            return list.concat([...this.getSublayerNames(sublayer, false)]);
+    getSublayerNames(layer, toplevel = true, filter = null) {
+        return [(toplevel && layer.sublayers) || (filter && !filter(layer)) ? null : layer.name].concat((layer.sublayers || []).reduce((list, sublayer) => {
+            return list.concat([...this.getSublayerNames(sublayer, false, filter)]);
         }, [])).filter(x => x);
     },
     mergeSubLayers(baselayer, addlayer) {