Set active_plan_id in update_selected_plan-function instead.

- Move setting active_plan_id to update_selected_plan()
- Removed "Vahvista kaava" button for now, it will be created properly later.
- Removed settings button from toolbar.

Author: Mtk112

arho_feature_template/core/plan_manager.py

@@ -64,7 +64,6 @@ def feature_added(self):
             new_feature = self.kaava_layer.getFeature(new_feature_id)
             if new_feature.isValid():
                 feature_id_value = new_feature["id"]
-                QgsExpressionContextUtils.setProjectVariable(QgsProject.instance(), "active_plan_id", feature_id_value)
                 update_selected_plan(LandUsePlan(feature_id_value))
             else:
                 iface.messageBar().pushMessage("Error", "Invalid feature retrieved.", level=3)
@@ -93,7 +92,6 @@ def load_land_use_plan(self):
                 return
 
             plan = LandUsePlan(selected_plan_id)
-            QgsExpressionContextUtils.setProjectVariable(QgsProject.instance(), "active_plan_id", selected_plan_id)
             update_selected_plan(plan)
 
     def clear_all_filters(self):

arho_feature_template/core/update_plan.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from qgis.core import QgsMapLayer, QgsProject, QgsVectorLayer
+from qgis.core import QgsExpressionContextUtils, QgsMapLayer, QgsProject, QgsVectorLayer
 from qgis.utils import iface
 
 
@@ -24,6 +24,7 @@ class LandUsePlan:
 def update_selected_plan(new_plan: LandUsePlan):
     """Update the project layers based on the selected land use plan."""
     plan_id = new_plan.id
+    QgsExpressionContextUtils.setProjectVariable(QgsProject.instance(), "active_plan_id", plan_id)
 
     for layer_name, field_name in LAYER_PLAN_ID_MAP.items():
         # Set the filter on each layer using the plan_id

arho_feature_template/plugin.py

@@ -4,7 +4,7 @@
 
 from qgis.PyQt.QtCore import QCoreApplication, Qt, QTranslator
 from qgis.PyQt.QtGui import QIcon
-from qgis.PyQt.QtWidgets import QAction, QMessageBox, QWidget
+from qgis.PyQt.QtWidgets import QAction, QWidget
 from qgis.utils import iface
 
 from arho_feature_template.core.feature_template_library import FeatureTemplater, TemplateGeometryDigitizeMapTool
@@ -13,7 +13,6 @@
 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
-from arho_feature_template.utils.misc_utils import get_active_plan_id, get_lambda_settings
 
 if TYPE_CHECKING:
     from qgis.gui import QgisInterface, QgsMapTool
@@ -164,15 +163,6 @@ def initGui(self) -> None:  # noqa N802
             add_to_toolbar=True,
         )
 
-        self.validate_plan_action = self.add_action(
-            "",
-            text="Vahvista kaava",
-            triggered_callback=self.validate_plan,
-            add_to_menu=True,
-            add_to_toolbar=True,
-            status_tip="Vahvista kaava",
-        )
-
         self.plugin_settings_action = self.add_action(
             "",
             text="Asetukset",
@@ -192,18 +182,6 @@ def add_new_plan(self):
     def load_existing_land_use_plan(self):
         self.plan_manager.load_land_use_plan()
 
-    def validate_plan(self):
-        """Validate the plan."""
-        lambda_host, lambda_port = get_lambda_settings()
-        active_plan = get_active_plan_id()
-
-        # Testing.
-        QMessageBox.information(
-            None,
-            "Lambda asetukset",
-            f"Lambdan isäntä: {lambda_host}\nLambdan portti: {lambda_port}\nAktiivinen kaava: {active_plan}",
-        )
-
     def open_settings(self):
         """Open the plugin settings dialog."""
         settings = PluginSettings()