remove redundant Unit class

Author: nmaarnio

arho_feature_template/core/plan_regulation_config.py

@@ -46,14 +46,14 @@ class ValueType(Enum):
     VERSIONED_TEXT = "kieliversioitu teksti"
 
 
-class Unit(Enum):
-    SQUARE_METERS = "k-m2"
-    CUBIC_METERS = "m3"
-    EFFICIENCY_RATIO = "k-m2/m2"
-    PERCENTAGE = "prosentti"
-    AREA_RATIO = "m2/k-m2"
-    DEGREES = "°"
-    DECIBEL = "dB"
+# class Unit(Enum):
+#     SQUARE_METERS = "k-m2"
+#     CUBIC_METERS = "m3"
+#     EFFICIENCY_RATIO = "k-m2/m2"
+#     PERCENTAGE = "prosentti"
+#     AREA_RATIO = "m2/k-m2"
+#     DEGREES = "°"
+#     DECIBEL = "dB"
 
 
 def get_name_mapping_for_plan_regulations(layer_name: str) -> dict[str, dict[str, str]] | None:
@@ -129,7 +129,7 @@ def initialize(
                 if data:
                     regulation_config.category_only = data.get("category_only", False)
                     regulation_config.value_type = ValueType(data["value_type"]) if "value_type" in data else None
-                    regulation_config.unit = Unit(data["unit"]) if "unit" in data else None
+                    regulation_config.unit = data["unit"] if "unit" in data else None
 
                 # Top-level, add to list
                 if not regulation_config.parent_id:
@@ -173,7 +173,7 @@ class PlanRegulationConfig:
 
     category_only: bool = False
     value_type: ValueType | None = None
-    unit: Unit | None = None
+    unit: str | None = None
 
     @classmethod
     def from_feature(cls, feature: QgsFeature, language: str = "fin") -> PlanRegulationConfig:

arho_feature_template/gui/plan_regulation_widget.py

@@ -19,7 +19,7 @@
     QWidget,
 )
 
-from arho_feature_template.core.plan_regulation_config import PlanRegulationConfig, Unit, ValueType
+from arho_feature_template.core.plan_regulation_config import PlanRegulationConfig, ValueType
 from arho_feature_template.utils.misc_utils import get_additional_information_name, get_layer_by_name
 
 if TYPE_CHECKING:
@@ -116,7 +116,7 @@ def _check_number_or_none(value: str | Number | None, error_msg: str):
             raise ValueError(error_msg)
 
     def _add_value_input(
-        self, value_type: ValueType, unit: Unit | None, default_value: str | Number | list[int] | None = None
+        self, value_type: ValueType, unit: str | None, default_value: str | Number | list[int] | None = None
     ):
         base_error_msg = f"Invalid type for default value {type(default_value)}."
         if value_type in [ValueType.DECIMAL, ValueType.POSITIVE_DECIMAL]:
@@ -214,7 +214,7 @@ def _add_widgets_to_form(self, label: QLabel, widget: QWidget):
         if not self.expanded:
             self._on_expand_hide_btn_clicked()
 
-    def add_decimal_input(self, value_type: ValueType, unit: Unit | None, default_value: Number | None = None):
+    def add_decimal_input(self, value_type: ValueType, unit: str | None, default_value: Number | None = None):
         value_widget = QgsDoubleSpinBox()
         label = QLabel("Arvo")
         if value_type == ValueType.POSITIVE_DECIMAL:
@@ -225,24 +225,24 @@ def add_decimal_input(self, value_type: ValueType, unit: Unit | None, default_va
             label.setToolTip("Tyyppi: desimaali")
         value_widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
         if unit:
-            value_widget.setSuffix(f" {unit.value}")
+            value_widget.setSuffix(f" {unit}")
         if default_value:
             value_widget.setValue(default_value)
         self._add_widgets_to_form(label, value_widget)
 
-    def add_positive_integer_input(self, unit: Unit | None, default_value: int | None = None):
+    def add_positive_integer_input(self, unit: str | None, default_value: int | None = None):
         value_widget = QgsSpinBox()
         value_widget.setMinimum(0)
         value_widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
         if unit:
-            value_widget.setSuffix(f" {unit.value}")
+            value_widget.setSuffix(f" {unit}")
         label = QLabel("Arvo")
         label.setToolTip("Tyyppi: kokonaisluku (positiivinen)")
         if default_value:
             value_widget.setValue(default_value)
         self._add_widgets_to_form(label, value_widget)
 
-    def add_positive_integer_range_input(self, unit: Unit | None, default_values: list[int] | None = None):
+    def add_positive_integer_range_input(self, unit: str | None, default_values: list[int] | None = None):
         min_widget = QgsSpinBox()
         min_widget.setMinimum(0)
         min_label = QLabel("Arvo minimi")
@@ -253,8 +253,8 @@ def add_positive_integer_range_input(self, unit: Unit | None, default_values: li
         max_label = QLabel("Arvo maksimi")
         max_label.setToolTip("Tyyppi: kokonaisluku arvoväli (positiivinen)")
         if unit:
-            min_widget.setSuffix(f" {unit.value}")
-            max_widget.setSuffix(f" {unit.value}")
+            min_widget.setSuffix(f" {unit}")
+            max_widget.setSuffix(f" {unit}")
         if default_values:
             min_widget.setValue(default_values[0])
             max_widget.setValue(default_values[1])