FIlter layers after new plan is committed.

After committing new plan feature, filter layers based on the id of the new plan. The id is retrieved by comparing ids before and after commit.

Author: Mtk112

arho_feature_template/core/create_land_use_plan.py

@@ -8,38 +8,43 @@
 @dataclass
 class LandUsePlan:
     id: str
-    name: str
 
 
 # To be replaced later
 LAYER_PLAN_ID_MAP = {
-    "land_use_plan": "id",
-    "land_use_area": "plan_id",
+    "Kaava": "id",
+    "Maankäytön kohteet": "plan_id",
+    "Muut pisteet": "plan_id",
+    "Viivat": "plan_id",
+    "Aluevaraus": "plan_id",
     "Osa-alue": "plan_id",
 }
 
 
 def update_selected_plan(new_plan: LandUsePlan):
     """Update the project layers based on the selected land use plan."""
     plan_id = new_plan.id
+
     for layer_name, field_name in LAYER_PLAN_ID_MAP.items():
+        # Set the filter on each layer using the plan_id
         set_filter_for_vector_layer(layer_name, field_name, plan_id)
 
 
 def set_filter_for_vector_layer(layer_name: str, field_name: str, field_value: str):
-    # Get layer and perform checks
+    """Set a filter for the given vector layer."""
     layers = QgsProject.instance().mapLayersByName(layer_name)
+
     if not _check_layer_count(layers):
         return
+
     layer = layers[0]
-    if not _check_vector_layer(layer):
-        return
 
-    # Perform the filtering
-    query = f"{field_name} = {field_value}"
-    if not layer.setSubsetString(query):
-        # TODO: Convert to log msg?
-        iface.messageBar().pushMessage("Error", f"Failed to filter layer {layer_name} with query {query}", level=3)
+    # Create the filter expression directly based on the plan_id
+    expression = f"\"{field_name}\" = '{field_value}'"  # Properly formatted filter expression
+
+    # Apply the filter to the layer
+    if not layer.setSubsetString(expression):
+        iface.messageBar().pushMessage("Error", f"Failed to filter layer {layer_name} with query {expression}", level=3)
 
 
 def _check_layer_count(layers: list) -> bool:

arho_feature_template/core/update_plan.py

@@ -3,15 +3,14 @@
 import os
 from typing import TYPE_CHECKING, Callable, cast
 
-from qgis.core import QgsProject, QgsWkbTypes
+from qgis.core import QgsProject, QgsVectorLayer
 from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QAction, QWidget
 from qgis.utils import iface
 
 from arho_feature_template.core.feature_template_library import FeatureTemplater, TemplateGeometryDigitizeMapTool
-
-# from arho_feature_template.core.update_plan import LandUsePlan, update_selected_plan
+from arho_feature_template.core.update_plan import LandUsePlan, update_selected_plan
 from arho_feature_template.qgis_plugin_tools.tools.custom_logging import setup_logger, teardown_logger
 from arho_feature_template.qgis_plugin_tools.tools.i18n import setup_translation
 from arho_feature_template.qgis_plugin_tools.tools.resources import plugin_name
@@ -139,7 +138,6 @@ def initGui(self) -> None:  # noqa N802
 
         iface.mapCanvas().mapToolSet.connect(self.templater.digitize_map_tool.deactivate)
 
-        # Add main plugin action to the toolbar
         self.template_dock_action = self.add_action(
             "",
             "Feature Templates",
@@ -171,8 +169,18 @@ def on_map_tool_changed(self, new_tool: QgsMapTool, old_tool: QgsMapTool) -> Non
         if not isinstance(new_tool, TemplateGeometryDigitizeMapTool):
             self.template_dock_action.setChecked(False)
 
+    def clear_all_filters(self):
+        """Clear filters for all vector layers in the project."""
+        layers = QgsProject.instance().mapLayers().values()
+
+        for layer in layers:
+            if isinstance(layer, QgsVectorLayer):
+                layer.setSubsetString("")
+
     def digitize_new_plan(self):
-        # Activate and start editing the Kaava-layer
+        # Filtered layers are not editable, so clear filters first.
+        self.clear_all_filters()
+        # Find and set the "Kaava" layer
         layers = QgsProject.instance().mapLayersByName("Kaava")
         if not layers:
             iface.messageBar().pushMessage("Error", "Layer 'Kaava' not found", level=3)
@@ -185,23 +193,36 @@ def digitize_new_plan(self):
 
         iface.setActiveLayer(kaava_layer)
 
-        if kaava_layer.geometryType() != QgsWkbTypes.PolygonGeometry:
-            iface.messageBar().pushMessage("Error", "Layer 'Kaava' is not a polygon layer", level=3)
-            return
-
-        kaava_layer.featureAdded.connect(self.commit_new_plan)
-
         iface.actionAddFeature().trigger()
+        kaava_layer.featureAdded.connect(self.feature_added)
 
-    def commit_new_plan(self):
+    def feature_added(self):
         kaava_layer = iface.activeLayer()
+        feature_ids_before_commit = kaava_layer.allFeatureIds()
+        if kaava_layer.isEditable():
+            if not kaava_layer.commitChanges():
+                iface.messageBar().pushMessage("Error", "Failed to commit changes to the layer.", level=3)
+                return
+        else:
+            iface.messageBar().pushMessage("Error", "Layer is not editable.", level=3)
+            return
+        feature_ids_after_commit = kaava_layer.allFeatureIds()
+
+        # Finds the feature id that was committed by comparing ids before commit to features after commit.
+        new_feature_id = next((fid for fid in feature_ids_after_commit if fid not in feature_ids_before_commit), None)
+        if new_feature_id is not None:
+            new_feature = kaava_layer.getFeature(new_feature_id)
 
-        kaava_layer.featureAdded.disconnect()
+            if new_feature.isValid():
+                feature_id_value = new_feature["id"]  # UUID of the new feature
+                iface.messageBar().pushMessage("Info", f"Feature 'id' field value: {feature_id_value}", level=0)
 
-        if kaava_layer.commitChanges():
-            iface.messageBar().pushMessage("Info", "Feature committed successfully", level=0)
+                # plan = LandUsePlan(feature_id_value)
+                update_selected_plan(LandUsePlan(feature_id_value))
+            else:
+                iface.messageBar().pushMessage("Error", "Invalid feature retrieved.", level=3)
         else:
-            iface.messageBar().pushMessage("Error", "Failed to commit feature", level=3)
+            iface.messageBar().pushMessage("Error", "No new feature was added.", level=3)
 
     def load_existing_land_use_plan(self) -> None:
         """Open existing land use plan."""