add plan regulation group associations

Author: nmaarnio

arho_feature_template/core/plan_manager.py

@@ -27,6 +27,7 @@
     PlanFeatureLayer,
     PlanLayer,
     PlanRegulationLayer,
+    RegulationGroupAssociationLayer,
     RegulationGroupLayer,
     plan_layers,
 )
@@ -229,7 +230,7 @@ def save_plan(plan_data: Plan) -> QgsFeature:
         for regulation_group in plan_data.general_regulations:
             plan_id = plan_feature["id"]
             regulation_group_feature = save_regulation_group(regulation_group, plan_id)
-            save_regulation_grop_assosiation(plan_id, regulation_group_feature["id"])
+            save_regulation_group_association(regulation_group_feature["id"], plan_id=plan_id)
 
     return plan_feature
 
@@ -250,11 +251,9 @@ def save_plan_feature(plan_feature: PlanFeature, plan_id: str | None = None) ->
     if not layer_class:
         msg = f"Could not find plan feature layer class for layer name {plan_feature.layer_name}"
         raise ValueError(msg)
-    feature = layer_class.feature_from_model(plan_feature)
-    layer = layer_class.get_from_project()
 
-    if plan_id:
-        feature["plan_id"] = plan_id
+    feature = layer_class.feature_from_model(plan_feature, plan_id)
+    layer = layer_class.get_from_project()
 
     _save_feature(
         feature=feature,
@@ -266,7 +265,8 @@ def save_plan_feature(plan_feature: PlanFeature, plan_id: str | None = None) ->
     # Handle regulation groups
     if plan_feature.regulation_groups:
         for group in plan_feature.regulation_groups:
-            save_regulation_group(group)
+            regulation_group_feature = save_regulation_group(group)
+            save_regulation_group_association(regulation_group_feature["id"], plan_feature.layer_name, feature["id"])
 
     return feature
 
@@ -291,8 +291,15 @@ def save_regulation_group(regulation_group: RegulationGroup, plan_id: str | None
     return feature
 
 
-def save_regulation_grop_assosiation(plan_id: str, regulation_group_id: str):
-    pass
+def save_regulation_group_association(
+    regulation_group_id: str, layer_name: str | None = None, feature_id: str | None = None, plan_id: str | None = None
+) -> QgsFeature:
+    feature = RegulationGroupAssociationLayer.feature_from(regulation_group_id, layer_name, feature_id, plan_id)
+    layer = RegulationGroupAssociationLayer.get_from_project()
+
+    _save_feature(feature=feature, layer=layer, id_=None, edit_text="")
+
+    return feature
 
 
 def save_regulation(regulation: Regulation) -> QgsFeature:

arho_feature_template/project/layers/plan_layers.py

@@ -155,6 +155,42 @@ class RegulationGroupAssociationLayer(AbstractPlanLayer):
         )
     )
 
+    layer_name_to_attribute_map: ClassVar[dict[str, str]] = {
+        LandUsePointLayer.name: "land_use_point_id",
+        OtherAreaLayer.name: "other_area_id",
+        OtherPointLayer.name: "other_point_id",
+        LandUseAreaLayer.name: "land_use_area_id",
+        LineLayer.name: "line_id",
+    }
+
+    @classmethod
+    def feature_from(
+        cls,
+        regulation_group_id: str | None,
+        layer_name: str | None = None,
+        feature_id: str | None = None,
+        plan_id: str | None = None,
+    ) -> QgsFeature:
+        layer = cls.get_from_project()
+
+        feature = QgsVectorLayerUtils.createFeature(layer)
+        feature["plan_regulation_group_id"] = regulation_group_id
+
+        if layer_name:
+            if feature_id is None:
+                msg = "Plan feature ID must be provided to create association for regulation group and plan feature."
+                raise ValueError(msg)
+            attribute = cls.layer_name_to_attribute_map[layer_name]
+            feature[attribute] = feature_id
+
+        feature["plan_id"] = (
+            plan_id
+            if plan_id
+            else QgsExpressionContextUtils.projectScope(QgsProject.instance()).variable("active_plan_id")
+        )
+
+        return feature
+
 
 class PlanRegulationLayer(AbstractPlanLayer):
     name = "Kaavamääräys"