Implement attribute saving for feature template form:

- plan features are saved
- plan regulation groups are saved
- plan regulations are saved

Notes:
- saving additional information for regulations is not implemented yet
- saving value ranges for regulations is not implemented yet
- saving files for regulations is not implemented yet
- reading saved features into forms and updating them is not implemented yet
- saving regulation groups in new plan regulation group form is not implemented yet
- using existing regulation groups for plan features is not implemented yet

- plan feature target layer selection is hard coded for now
- underground type is hard coded for now

- plan organisation needs to be set to Toimija code layer to make a new plan

- PlanRegulationSet could be refactored into PlanTypeLayer class
- save_data methods could be refactored to reduce code repetition

Author: nmaarnio

arho_feature_template/core/feature_template_library.py

@@ -157,16 +157,8 @@ def ask_for_feature_attributes(self, feature: QgsFeature) -> None:
         if not self.active_template:
             return
 
-        attribute_form = TemplateAttributeForm(self.active_template.config)
-
-        if attribute_form.exec_():
-            layer = get_vector_layer_from_project(self.active_template.config.feature.layer)
-            # Save the feature
-            attribute_form.set_feature_attributes(feature)
-
-            layer.beginEditCommand("Create feature from template")
-            layer.addFeature(feature)
-            layer.commitChanges(stopEditing=False)
+        attribute_form = TemplateAttributeForm(self.active_template.config, feature)
+        attribute_form.exec_()
 
     def get_library_names(self) -> list[str]:
         return list(self.library_configs.keys())

arho_feature_template/core/models.py

@@ -10,6 +10,7 @@
 import yaml
 
 from arho_feature_template.exceptions import ConfigSyntaxError
+from arho_feature_template.project.layers.plan_layers import PlanFeatureLayer, PlanRegulationLayer, RegulationGroupLayer
 from arho_feature_template.qgis_plugin_tools.tools.resources import resources_path
 from arho_feature_template.utils.misc_utils import get_layer_by_name, iface
 
@@ -219,20 +220,38 @@ class Regulation:
     files: list[str] = field(default_factory=list)
     theme: str | None = None
     topic_tag: str | None = None
+    regulation_group_id_: int | None = None
     id_: int | None = None
     # value_string: str | None
     # value_number: Number | None
     # value_number_pair: tuple[Number, Number] | None
 
+    def save_data(self):
+        feature = PlanRegulationLayer.feature_from_model(self)
+        layer = PlanRegulationLayer.get_from_project()
+
+        if not layer.isEditable():
+            layer.startEditing()
+        layer.beginEditCommand("Kaavamääräyksen lisäys" if self.id_ is None else "Kaavamääräyksen muokkaus")
+
+        if self.id_ is None:
+            layer.addFeature(feature)
+        else:
+            layer.updateFeature(feature)
+
+        layer.endEditCommand()
+        layer.commitChanges(stopEditing=False)
+
+        # TODO: associations?
+
 
 @dataclass
 class RegulationGroup:
-    type_code: str | None
+    type_code: str
     name: str | None
     short_name: str | None
     color_code: str | None
-    letter_code: str | None
-    regulations: list[Regulation]
+    regulations: list[Regulation] = field(default_factory=list)
     id_: int | None = None
 
     @classmethod
@@ -254,26 +273,76 @@ def from_config_data(cls, data: dict) -> RegulationGroup:
                         files=reg_data.get("files") if reg_data.get("files") else [],
                         theme=reg_data.get("theme"),
                         topic_tag=reg_data.get("topic_tag"),
+                        regulation_group_id_=None,
                         id_=None,
                     )
                 )
             else:
                 iface.messageBar().pushWarning("", f"Could not find plan regulation {reg_code}!")
         return cls(
-            type_code=None,
+            type_code="landUseRegulations",
             name=data.get("name"),
-            short_name=data.get("color_code"),
+            short_name=data.get("short_name"),
             color_code=data.get("color_code"),
-            letter_code=data.get("letter_code"),
             regulations=regulations,
             id_=None,
         )
 
+    def save_data(self):
+        feature = RegulationGroupLayer.feature_from_model(self)
+        layer = RegulationGroupLayer.get_from_project()
+
+        if not layer.isEditable():
+            layer.startEditing()
+        layer.beginEditCommand("Kaavamääräysryhmän lisäys" if self.id_ is None else "Kaavamääräysryhmän muokkaus")
+
+        if self.id_ is None:
+            layer.addFeature(feature)
+        else:
+            layer.updateFeature(feature)
+
+        layer.endEditCommand()
+        layer.commitChanges(stopEditing=False)
+
+        if self.regulations:
+            for regulation in self.regulations:
+                regulation.regulation_group_id_ = feature["id"]  # Updating regulation group ID
+                regulation.save_data()
+
+        # TODO: associations?
+
     # @classmethod
     # def from_database(cls) -> RegulationGroup:
     #     pass
 
 
+@dataclass
+class PlanFeature:
+    geom: QgsGeometry
+    feature_layer_class: type[PlanFeatureLayer]
+    type_of_underground: int
+    name: str | None = None
+    description: str | None = None
+    plan_id: int | None = None
+    id_: int | None = None
+
+    def save_data(self):
+        feature = self.feature_layer_class.feature_from_model(self)
+        layer = self.feature_layer_class.get_from_project()
+
+        if not layer.isEditable():
+            layer.startEditing()
+        layer.beginEditCommand("Kaavakohteen lisäys" if self.id_ is None else "Kaavakohteen muokkaus")
+
+        if self.id_ is None:
+            layer.addFeature(feature)
+        else:
+            layer.updateFeature(feature)
+
+        layer.endEditCommand()
+        layer.commitChanges(stopEditing=False)
+
+
 @dataclass
 class Plan:
     name: str

arho_feature_template/core/plan_manager.py

@@ -188,6 +188,7 @@ def save_plan(plan_data: Plan) -> QgsFeature:
     edit_message = "Kaavan lisäys" if plan_data.id_ is None else "Kaavan muokkaus"
     plan_layer.beginEditCommand(edit_message)
 
+    # plan_data.organisation_id = "99e20d66-9730-4110-815f-5947d3f8abd3"
     plan_feature = PlanLayer.feature_from_model(plan_data)
 
     if plan_data.id_ is None:

arho_feature_template/gui/plan_regulation_group_widget.py

@@ -10,7 +10,6 @@
 
 from arho_feature_template.core.models import Regulation, RegulationGroup
 from arho_feature_template.gui.plan_regulation_widget import RegulationWidget
-from arho_feature_template.project.layers.plan_layers import RegulationGroupLayer
 
 if TYPE_CHECKING:
     from qgis.PyQt.QtWidgets import QFrame, QLineEdit, QPushButton
@@ -30,7 +29,7 @@ def __init__(self, regulation_group_data: RegulationGroup):
 
         # TYPES
         self.frame: QFrame
-        self.name: QLineEdit  # "heading"
+        self.name: QLineEdit
         self.del_btn: QPushButton
 
         # INIT
@@ -53,29 +52,12 @@ def delete_regulation_widget(self, regulation_widget: RegulationWidget):
         self.regulation_widgets.remove(regulation_widget)
         regulation_widget.deleteLater()
 
-    def into_model(self, id_: int | None) -> RegulationGroup:
+    def into_model(self) -> RegulationGroup:
         return RegulationGroup(
             type_code=self.regulation_group_data.type_code,
             name=self.name.text(),
             short_name=self.regulation_group_data.short_name,
             color_code=self.regulation_group_data.color_code,
-            letter_code=self.regulation_group_data.letter_code,
-            regulations=[widget.save_data(id_) for widget in self.regulation_widgets],
-            id_=id_,
+            regulations=[widget.into_model() for widget in self.regulation_widgets],
+            id_=self.regulation_group_data.id_,
         )
-
-    def save_data(self):
-        if not self.regulation_group_data.id_:
-            new_feature = True
-            id_ = "new_id_here"  # TODO: Implement creating new ID
-        else:
-            new_feature = False
-            id_ = self.regulation_group_data.id_
-
-        model = self.into_model(id_)
-        regulation_feature = RegulationGroupLayer.feature_from_model(model)
-        layer = RegulationGroupLayer.get_from_project()
-        if new_feature:
-            layer.addFeature(regulation_feature)
-        else:
-            layer.updateFeature(regulation_feature)

arho_feature_template/gui/plan_regulation_widget.py

@@ -24,7 +24,6 @@
     MultilineTextInputWidget,
     SinglelineTextInputWidget,
 )
-from arho_feature_template.project.layers.plan_layers import PlanRegulationLayer
 from arho_feature_template.utils.misc_utils import get_additional_information_name, get_layer_by_name, iface
 
 if TYPE_CHECKING:
@@ -34,7 +33,6 @@
 FormClass, _ = uic.loadUiType(ui_path)
 
 # TO BE REPLACED
-ADDITIONAL_INFORMATION_TYPES_WITH_INPUT = ["kayttotarkoituskohdistus"]
 LANGUAGE = "fin"
 
 
@@ -87,7 +85,6 @@ def _init_widgets(self):
         value_type = self.config.value_type
         if value_type:
             self._add_value_input(value_type, self.config.unit, self.regulation.value)
-            #   if self.regulation else None)
 
         # Additional information
         if self.regulation.additional_information:
@@ -267,14 +264,3 @@ def into_model(self) -> Regulation:
             topic_tag=self.topic_tag_widget.get_value() if self.topic_tag_widget else None,
             id_=self.regulation.id_,
         )
-
-    def save_data(self, regulation_group_id: int | None) -> Regulation:
-        model = self.into_model()
-        regulation_feature = PlanRegulationLayer.feat_from_model(model, regulation_group_id)
-        layer = PlanRegulationLayer.get_from_project()
-        if model.id_ is None:
-            layer.addFeature(regulation_feature)
-        else:
-            layer.updateFeature(regulation_feature)
-
-        return model

arho_feature_template/gui/template_attribute_form.py

@@ -15,15 +15,18 @@
     QScrollArea,
     QSizePolicy,
     QSpacerItem,
+    QTextEdit,
     QTreeWidget,
     QTreeWidgetItem,
 )
 
-from arho_feature_template.core.models import RegulationGroup, RegulationGroupLibrary
+from arho_feature_template.core.models import PlanFeature, RegulationGroup, RegulationGroupLibrary
 from arho_feature_template.gui.plan_regulation_group_widget import RegulationGroupWidget
+from arho_feature_template.project.layers.plan_layers import LandUseAreaLayer, PlanFeatureLayer
 from arho_feature_template.qgis_plugin_tools.tools.resources import resources_path
 
 if TYPE_CHECKING:
+    from qgis.core import QgsFeature
     from qgis.PyQt.QtWidgets import QWidget
 
     from arho_feature_template.core.template_library_config import FeatureTemplate
@@ -35,21 +38,29 @@
 class TemplateAttributeForm(QDialog, FormClass):  # type: ignore
     """Parent class for feature template forms for adding and modifying feature attribute data."""
 
-    def __init__(self, feature_template_config: FeatureTemplate):
+    def __init__(
+        self,
+        feature_template_config: FeatureTemplate,
+        base_feature: QgsFeature,
+        feature_layer_class: type[PlanFeatureLayer] = LandUseAreaLayer,  # NOTE: All are now saved to LandUseAreaLayer
+    ):
         super().__init__()
         self.setupUi(self)
 
         # TYPES
+        self.geom = base_feature.geometry()
+        self.feature_layer_class = feature_layer_class
         self.feature_name: QLineEdit
-        self.feature_description: QLineEdit
-        self.feature_underground: QLineEdit
+        self.feature_description: QTextEdit
+        self.feature_type_of_underground: QComboBox
         self.plan_regulation_group_scrollarea: QScrollArea
         self.plan_regulation_group_scrollarea_contents: QWidget
         self.plan_regulation_group_libraries_combobox: QComboBox
         self.plan_regulation_groups_tree: QTreeWidget
         self.button_box: QDialogButtonBox
 
         # INIT
+        self.regulation_group_widgets: list[RegulationGroupWidget] = []
         self.scroll_area_spacer = None
         self.setWindowTitle(feature_template_config.name)
         self.init_plan_regulation_group_libraries()
@@ -73,15 +84,17 @@ def add_selected_plan_regulation_group(self, item: QTreeWidgetItem, column: int)
         self.add_plan_regulation_group(regulation_group)
 
     def add_plan_regulation_group(self, definition: RegulationGroup):
-        new_plan_regulation_group = RegulationGroupWidget(definition)
-        new_plan_regulation_group.delete_signal.connect(self.remove_plan_regulation_group)
+        regulation_group_widget = RegulationGroupWidget(definition)
+        regulation_group_widget.delete_signal.connect(self.remove_plan_regulation_group)
         self._remove_spacer()
-        self.plan_regulation_group_scrollarea_contents.layout().addWidget(new_plan_regulation_group)
+        self.plan_regulation_group_scrollarea_contents.layout().addWidget(regulation_group_widget)
+        self.regulation_group_widgets.append(regulation_group_widget)
         self._add_spacer()
 
-    def remove_plan_regulation_group(self, plan_regulation_group_widget: RegulationGroupWidget):
-        self.plan_regulation_group_scrollarea_contents.layout().removeWidget(plan_regulation_group_widget)
-        plan_regulation_group_widget.deleteLater()
+    def remove_plan_regulation_group(self, regulation_group_widget: RegulationGroupWidget):
+        self.plan_regulation_group_scrollarea_contents.layout().removeWidget(regulation_group_widget)
+        self.regulation_group_widgets.remove(regulation_group_widget)
+        regulation_group_widget.deleteLater()
 
     def init_plan_regulation_group_libraries(self):
         katja_asemakaava_path = Path(os.path.join(resources_path(), "katja_asemakaava.yaml"))
@@ -100,5 +113,22 @@ def init_plan_regulation_group_library(self, library: RegulationGroupLibrary):
                 regulation_group_item.setText(0, group_definition.name)
                 regulation_group_item.setData(0, Qt.UserRole, group_definition)
 
+    def into_model(self) -> PlanFeature:
+        return PlanFeature(
+            name=self.feature_name.text(),
+            type_of_underground=self.feature_type_of_underground.currentIndex(),
+            description=self.feature_description.toPlainText(),
+            geom=self.geom,
+            feature_layer_class=self.feature_layer_class,
+            id_=None,
+        )
+
     def _on_ok_clicked(self):
+        # Plan feature data
+        self.into_model().save_data()
+
+        # Regulation group data
+        for regulation_group_widget in self.regulation_group_widgets:
+            regulation_group_widget.into_model().save_data()
+
         self.accept()

arho_feature_template/gui/template_attribute_form.ui

@@ -40,6 +40,16 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="1">
+       <widget class="QTextEdit" name="feature_description">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
       <item row="2" column="0">
        <widget class="QLabel" name="feature_underground_label">
         <property name="text">
@@ -48,7 +58,7 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="QComboBox" name="feature_underground">
+       <widget class="QComboBox" name="feature_type_of_underground">
         <item>
          <property name="text">
           <string>Maanpäällinen</string>
@@ -61,16 +71,6 @@
         </item>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QTextEdit" name="feature_description">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>