Kaavasuositukset kaavakohteille

arho_feature_template/core/lambda_service.py

@@ -9,7 +9,8 @@
 from qgis.PyQt.QtNetwork import QNetworkAccessManager, QNetworkProxy, QNetworkReply, QNetworkRequest
 from qgis.PyQt.QtWidgets import QMessageBox
 
-from arho_feature_template.utils.misc_utils import get_active_plan_id, get_plan_name, get_settings
+from arho_feature_template.project.layers.plan_layers import PlanLayer
+from arho_feature_template.utils.misc_utils import get_active_plan_id, get_settings
 
 
 class LambdaService(QObject):
@@ -113,7 +114,7 @@ def _process_json_reply(self, response_json: dict):
         if plan_json:
             geographical_area = plan_json.get("geographicalArea")
             if geographical_area:
-                outline_name = get_plan_name(plan_id, language="fin")
+                outline_name = PlanLayer.get_plan_name(plan_id)
                 outline_json = {
                     "type": "Feature",
                     "properties": {"name": outline_name},

arho_feature_template/core/models.py

@@ -11,11 +11,9 @@
 
 from arho_feature_template.exceptions import ConfigSyntaxError
 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
+from arho_feature_template.utils.misc_utils import LANGUAGE, get_layer_by_name, iface
 
 if TYPE_CHECKING:
-    from typing import Literal
-
     from qgis.core import QgsFeature, QgsGeometry
 
 
@@ -149,7 +147,6 @@ def initialize(
         cls,
         config_path: Path = DEFAULT_PLAN_REGULATIONS_CONFIG_PATH,
         type_of_plan_regulations_layer_name="Kaavamääräyslaji",
-        language: Literal["fin", "eng", "swe"] = "fin",
     ) -> RegulationLibrary:
         # Initialize RegulationLibrary and RegulationConfigs from QGIS layer and config file
 
@@ -165,7 +162,7 @@ def initialize(
 
         # 3. Initialize regulation configs from layer. Storing them by their ID is handy for adding childs later
         id_to_regulation_map: dict[str, RegulationConfig] = {
-            feature["id"]: RegulationConfig.from_feature(feature, language) for feature in layer.getFeatures()
+            feature["id"]: RegulationConfig.from_feature(feature) for feature in layer.getFeatures()
         }
 
         # 4. Add information from config file (value, unit, category only) and link child regulations
@@ -226,7 +223,7 @@ class RegulationConfig:
 
     # NOTE: Perhaps this ("model_from_feature") should be method of PlanTypeLayer class?
     @classmethod
-    def from_feature(cls, feature: QgsFeature, language: str = "fin") -> RegulationConfig:
+    def from_feature(cls, feature: QgsFeature) -> RegulationConfig:
         """
         Initialize PlanRegulationConfig from QgsFeature.
 
@@ -235,8 +232,8 @@ def from_feature(cls, feature: QgsFeature, language: str = "fin") -> RegulationC
         return cls(
             id=feature["id"],
             regulation_code=feature["value"],
-            name=feature["name"][language],
-            description=feature["description"][language],
+            name=feature["name"][LANGUAGE],
+            description=feature["description"][LANGUAGE],
             status=feature["status"],
             level=feature["level"],
             parent_id=feature["parent_id"],
@@ -265,6 +262,16 @@ class Regulation:
     # value_number_pair: tuple[Number, Number] | None
 
 
+@dataclass
+class Proposition:
+    name: str
+    value: str
+    theme_id: str | None = None
+    proposition_number: int | None = None
+    regulation_group_id_: int | None = None
+    id_: int | None = None
+
+
 @dataclass
 class RegulationGroup:
     type_code_id: str | None
@@ -273,6 +280,7 @@ class RegulationGroup:
     color_code: str | None
     group_number: int | None = None
     regulations: list[Regulation] = field(default_factory=list)
+    propositions: list[Proposition] = field(default_factory=list)
     id_: int | None = None
 
     @classmethod
@@ -308,6 +316,7 @@ def from_config_data(cls, data: dict) -> RegulationGroup:
             color_code=data.get("color_code"),
             group_number=data.get("group_number"),
             regulations=regulations,
+            propositions=[],
             id_=None,
         )
 

arho_feature_template/core/plan_manager.py

@@ -33,6 +33,7 @@
     OtherPointLayer,
     PlanFeatureLayer,
     PlanLayer,
+    PlanPropositionLayer,
     PlanRegulationLayer,
     RegulationGroupAssociationLayer,
     RegulationGroupLayer,
@@ -42,6 +43,7 @@
 from arho_feature_template.resources.libraries.regulation_groups import regulation_group_library_config_files
 from arho_feature_template.utils.db_utils import get_existing_database_connection_names
 from arho_feature_template.utils.misc_utils import (
+    LANGUAGE,
     check_layer_changes,
     get_active_plan_id,
     handle_unsaved_changes,
@@ -51,7 +53,7 @@
 if TYPE_CHECKING:
     from qgis.core import QgsFeature
 
-    from arho_feature_template.core.models import Regulation, RegulationGroup
+    from arho_feature_template.core.models import Proposition, Regulation, RegulationGroup
 
 logger = logging.getLogger(__name__)
 
@@ -377,9 +379,9 @@ def unload(self):
 
 def regulation_group_library_from_active_plan() -> RegulationGroupLibrary:
     category_features = list(PlanRegulationGroupTypeLayer.get_features())
-    category_id_to_name: dict[str, str] = {category["id"]: category["name"]["fin"] for category in category_features}
+    category_id_to_name: dict[str, str] = {category["id"]: category["name"][LANGUAGE] for category in category_features}
     category_regulation_group_map: dict[str, list[QgsFeature]] = {
-        feature["name"]["fin"]: [] for feature in category_features
+        feature["name"][LANGUAGE]: [] for feature in category_features
     }
 
     for feat in RegulationGroupLayer.get_features():
@@ -517,6 +519,12 @@ def save_regulation_group(regulation_group: RegulationGroup, plan_id: str | None
             regulation.regulation_group_id_ = feature["id"]  # Updating regulation group ID
             save_regulation(regulation)
 
+    # Handle propositions
+    if regulation_group.propositions:
+        for proposition in regulation_group.propositions:
+            proposition.regulation_group_id_ = feature["id"]  # Updating regulation group ID
+            save_proposition(proposition)
+
     return feature
 
 
@@ -545,3 +553,17 @@ def save_regulation(regulation: Regulation) -> QgsFeature:
     )
 
     return feature
+
+
+def save_proposition(proposition: Proposition) -> QgsFeature:
+    feature = PlanPropositionLayer.feature_from_model(proposition)
+    layer = PlanPropositionLayer.get_from_project()
+
+    _save_feature(
+        feature=feature,
+        layer=layer,
+        id_=proposition.id_,
+        edit_text="Kaavasuosituksen lisäys" if proposition.id_ is None else "Kaavasuosituksen muokkaus",
+    )
+
+    return feature

arho_feature_template/gui/components/code_combobox.py

@@ -7,6 +7,7 @@
 from qgis.PyQt.QtWidgets import QComboBox, QTreeWidget, QTreeWidgetItem
 
 from arho_feature_template.exceptions import LayerNotFoundError
+from arho_feature_template.utils.misc_utils import LANGUAGE
 
 if TYPE_CHECKING:
     from arho_feature_template.project.layers.code_layers import (
@@ -33,7 +34,7 @@ def populate_from_code_layer(self, layer_type: type[AbstractCodeLayer]) -> None:
             return
 
         for i, feature in enumerate(layer.getFeatures(), start=1):
-            self.addItem(feature["name"]["fin"])
+            self.addItem(feature["name"][LANGUAGE])
             self.setItemData(i, feature["id"])
 
     def value(self) -> str:
@@ -47,8 +48,6 @@ def set_value(self, value: str | None) -> None:
         index = self.findData(value)
         if index != -1:
             self.setCurrentIndex(index)
-        else:
-            self.setCurrentIndex(0)  # Set selection to NULL if item with `value` was not found
 
 
 class HierarchicalCodeComboBox(QComboBox):
@@ -83,9 +82,9 @@ def populate_from_code_layer(self, layer_type: type[AbstractCodeLayer]) -> None:
             item = QTreeWidgetItem()
             items[code_feature["id"]] = item
 
-            text = code_feature["name"]["fin"]
+            text = code_feature["name"][LANGUAGE]
             item.setText(0, text)
-            description = code_feature["description"]["fin"]
+            description = code_feature["description"][LANGUAGE]
             item.setToolTip(0, description)
             item.setData(0, Qt.UserRole, code_feature["id"])
 
@@ -119,7 +118,6 @@ def _find_item_recursive(self, item: QTreeWidgetItem, value: str) -> QTreeWidget
     def set_value(self, value: str | None) -> None:
         # Set selection to NULL if `value` is None
         if value is None:
-            self.setCurrentIndex(self.null_index)
             return
 
         # Loop top level tree items
@@ -136,5 +134,3 @@ def set_value(self, value: str | None) -> None:
                 self.setCurrentIndex(idx.row())
                 self.setRootModelIndex(self.null_index.parent())
                 return
-
-        self.setCurrentIndex(self.null_index)  # Set selection to NULL if item with `value` was not found

arho_feature_template/gui/components/plan_proposition_widget.py

@@ -0,0 +1,111 @@
+from __future__ import annotations
+
+from importlib import resources
+from typing import TYPE_CHECKING
+
+from qgis.core import QgsApplication
+from qgis.PyQt import uic
+from qgis.PyQt.QtCore import Qt, pyqtSignal
+from qgis.PyQt.QtWidgets import QFormLayout, QLabel, QMenu, QTextEdit, QToolButton, QWidget
+
+from arho_feature_template.core.models import Proposition
+from arho_feature_template.gui.components.code_combobox import CodeComboBox
+from arho_feature_template.gui.components.plan_regulation_input_widgets import IntegerInputWidget
+from arho_feature_template.project.layers.code_layers import PlanThemeLayer
+
+if TYPE_CHECKING:
+    from qgis.PyQt.QtWidgets import QLineEdit, QPushButton
+
+ui_path = resources.files(__package__) / "plan_proposition_widget.ui"
+FormClass, _ = uic.loadUiType(ui_path)
+
+
+class PropositionWidget(QWidget, FormClass):  # type: ignore
+    """A widget representation of a plan proposition."""
+
+    delete_signal = pyqtSignal(QWidget)
+
+    def __init__(self, proposition: Proposition, parent=None):
+        super().__init__(parent)
+        self.setupUi(self)
+
+        # TYPES
+        self.name: QLineEdit
+        self.value_label: QLabel
+        self.text_input: QTextEdit
+        self.add_field_btn: QPushButton
+        self.del_btn: QPushButton
+        self.form_layout: QFormLayout
+        self.expand_hide_btn: QToolButton
+
+        # INIT
+        self.proposition = proposition
+        self.proposition_number_widget: IntegerInputWidget | None = None
+        self.theme_widget: CodeComboBox | None = None
+
+        # List of widgets for hiding / showing
+        self.widgets: list[tuple[QLabel, QWidget]] = [(self.value_label, self.text_input)]
+
+        add_field_menu = QMenu(self)
+        add_field_menu.addAction("Suositusnumero").triggered.connect(self._add_proposition_number)
+        add_field_menu.addAction("Kaavoitusteema").triggered.connect(self._add_theme)
+        self.add_field_btn.setMenu(add_field_menu)
+        self.add_field_btn.setIcon(QgsApplication.getThemeIcon("mActionAdd.svg"))
+
+        self.del_btn.setIcon(QgsApplication.getThemeIcon("mActionDeleteSelected.svg"))
+        self.del_btn.clicked.connect(lambda: self.delete_signal.emit(self))
+
+        self.expanded = True
+        self.expand_hide_btn.clicked.connect(self._on_expand_hide_btn_clicked)
+
+        self.name.setText(proposition.name)
+        self.text_input.setText(proposition.value)
+        if proposition.theme_id:
+            self._add_theme(proposition.theme_id)
+        if proposition.proposition_number:
+            self._add_proposition_number(proposition.proposition_number)
+
+    def _add_widgets(self, label: QLabel, widget: QWidget):
+        self.form_layout.addRow(label, widget)
+        self.widgets.append((label, widget))
+        if not self.expanded:
+            self._on_expand_hide_btn_clicked()
+
+    def _add_proposition_number(self, default_value: int | None = None):
+        if not self.proposition_number_widget:
+            self.proposition_number_widget = IntegerInputWidget(default_value, None, True)
+            self._add_widgets(QLabel("Suositusnumero"), self.proposition_number_widget)
+
+    def _add_theme(self, default_value: str | None = None):
+        if not self.theme_widget:
+            self.theme_widget = CodeComboBox()
+            self.theme_widget.populate_from_code_layer(PlanThemeLayer)
+            if default_value:
+                self.theme_widget.set_value(default_value)
+            self._add_widgets(QLabel("Kaavoitusteema"), self.theme_widget)
+
+    def _on_expand_hide_btn_clicked(self):
+        if self.expanded:
+            for label, value_widget in self.widgets:
+                self.form_layout.removeWidget(label)
+                label.hide()
+                self.form_layout.removeWidget(value_widget)
+                value_widget.hide()
+            self.expand_hide_btn.setArrowType(Qt.ArrowType.DownArrow)
+            self.expanded = False
+        else:
+            for label, value_widget in self.widgets:
+                self.form_layout.addRow(label, value_widget)
+                label.show()
+                value_widget.show()
+            self.expand_hide_btn.setArrowType(Qt.ArrowType.UpArrow)
+            self.expanded = True
+
+    def into_model(self) -> Proposition:
+        return Proposition(
+            name=self.name.text(),
+            value=self.text_input.toPlainText(),
+            theme_id=self.theme_widget.value() if self.theme_widget else None,
+            proposition_number=self.proposition_number_widget.get_value() if self.proposition_number_widget else None,
+            id_=self.proposition.id_,
+        )