use get_active_plan_id util function and implement set_active_plan_id util function

Author: nmaarnio

arho_feature_template/core/plan_manager.py

@@ -4,7 +4,7 @@
 import logging
 from typing import TYPE_CHECKING
 
-from qgis.core import QgsExpressionContextUtils, QgsProject, QgsVectorLayer, QgsWkbTypes
+from qgis.core import QgsProject, QgsVectorLayer, QgsWkbTypes
 from qgis.gui import QgsMapToolDigitizeFeature
 from qgis.PyQt.QtWidgets import QDialog, QMessageBox
 
@@ -55,6 +55,7 @@
     get_active_plan_id,
     handle_unsaved_changes,
     iface,
+    set_active_plan_id,
 )
 
 if TYPE_CHECKING:
@@ -227,8 +228,7 @@ def edit_plan(self):
         if not plan_layer:
             return
 
-        active_plan_id = QgsExpressionContextUtils.projectScope(QgsProject.instance()).variable("active_plan_id")
-        feature = PlanLayer.get_feature_by_id(active_plan_id, no_geometries=False)
+        feature = PlanLayer.get_feature_by_id(get_active_plan_id(), no_geometries=False)
         if feature is None:
             iface.messageBar().pushWarning("", "No active/open plan found!")
             return
@@ -328,7 +328,7 @@ def set_active_plan(self, plan_id: str | None):
         if previously_in_edit_mode:
             plan_layer.rollBack()
 
-        QgsExpressionContextUtils.setProjectVariable(QgsProject.instance(), "active_plan_id", plan_id)
+        set_active_plan_id(plan_id)
         for layer in plan_layers:
             layer.apply_filter(plan_id)
 

arho_feature_template/project/layers/plan_layers.py

@@ -6,7 +6,7 @@
 from textwrap import dedent
 from typing import Any, ClassVar, Generator
 
-from qgis.core import QgsExpressionContextUtils, QgsFeature, QgsProject, QgsVectorLayerUtils
+from qgis.core import QgsFeature, QgsVectorLayerUtils
 
 from arho_feature_template.core.models import (
     AdditionalInformation,
@@ -197,11 +197,7 @@ def feature_from_model(cls, model: RegulationGroup, plan_id: str | None = None)
         feature["short_name"] = model.short_name if model.short_name else None
         feature["name"] = {LANGUAGE: model.name if model.name else None}
         feature["type_of_plan_regulation_group_id"] = model.type_code_id
-        feature["plan_id"] = (
-            plan_id
-            if plan_id
-            else QgsExpressionContextUtils.projectScope(QgsProject.instance()).variable("active_plan_id")
-        )
+        feature["plan_id"] = plan_id if plan_id else get_active_plan_id()
         feature["id"] = model.id_ if model.id_ else feature["id"]
         return feature
 

arho_feature_template/utils/misc_utils.py

@@ -86,6 +86,11 @@ def handle_unsaved_changes() -> bool:
     return True
 
 
+def set_active_plan_id(plan_id: str | None):
+    """Store the given plan ID as the active plan ID as a project variable."""
+    QgsExpressionContextUtils.setProjectVariable(QgsProject.instance(), "active_plan_id", plan_id)
+
+
 def get_active_plan_id():
     """Retrieve the active plan ID stored as a project variable."""
     return QgsExpressionContextUtils.projectScope(QgsProject.instance()).variable("active_plan_id")