xplan-tools 1.13.0__py3-none-any.whl → 1.13.1__py3-none-any.whl

xplan_tools/model/appschema/xplan54.py

@@ -16990,7 +16990,7 @@ class BPAbstandsMass(BPGeometrieobjekt):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "tbd",
+                "uom": "unknown",
             },
         ),
     ] = None

xplan_tools/model/appschema/xplan60.py

@@ -21837,7 +21837,7 @@ class BPAbstandsMass(BPLinienobjekt):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "tbd",
+                "uom": "unknown",
             },
         ),
     ] = None

xplan_tools/model/appschema/xplan61.py

@@ -24370,7 +24370,7 @@ class BPAbstandsMass(BPLinienobjekt):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "tbd",
+                "uom": "unknown",
             },
         ),
     ] = None

xplan_tools/model/appschema/xtrasse20.py

@@ -125,7 +125,7 @@ class IPEinAusspeisung(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MW",
             },
         ),
     ] = None
@@ -137,7 +137,7 @@ class IPEinAusspeisung(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MWh",
             },
         ),
     ] = None
@@ -149,7 +149,7 @@ class IPEinAusspeisung(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MW",
             },
         ),
     ] = None
@@ -161,7 +161,7 @@ class IPEinAusspeisung(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MWh",
             },
         ),
     ] = None
@@ -11120,7 +11120,7 @@ class PFSEnergiekopplungsanlage(PFSMultiFlaechenobjekt):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MW",
             },
         ),
     ] = None

xplan_tools/model/appschema/xwp09.py

@@ -398,7 +398,7 @@ class WPEnergieTraegerMenge(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "1",
-                "uom": "unknown",
+                "uom": "MWh/a",
             },
         ),
     ]
@@ -668,7 +668,7 @@ class WPEnergieTraegerVerbrauch(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MWh/a",
             },
         ),
     ] = None
@@ -680,7 +680,7 @@ class WPEnergieTraegerVerbrauch(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MWh/a",
             },
         ),
     ] = None
@@ -692,7 +692,7 @@ class WPEnergieTraegerVerbrauch(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MWh/a",
             },
         ),
     ] = None
@@ -704,7 +704,7 @@ class WPEnergieTraegerVerbrauch(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MWh/a",
             },
         ),
     ] = None
@@ -716,7 +716,7 @@ class WPEnergieTraegerVerbrauch(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "1",
-                "uom": "unknown",
+                "uom": "MWh/a",
             },
         ),
     ]
@@ -886,7 +886,7 @@ class WPPotenzialanalyseAggregiert(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MWh",
             },
         ),
     ] = None
@@ -898,7 +898,7 @@ class WPPotenzialanalyseAggregiert(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MWh",
             },
         ),
     ] = None
@@ -995,7 +995,7 @@ class WPSektorVerbrauch(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "1",
-                "uom": "unknown",
+                "uom": "MWh/a",
             },
         ),
     ]
@@ -1084,7 +1084,7 @@ class WPWaermeSpeicher(WPPunktobjekt):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MWh",
             },
         ),
     ] = None
@@ -1132,7 +1132,7 @@ class WPWaermeerzeugungsanlage(WPPunktobjekt):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "1",
-                "uom": "unknown",
+                "uom": "MW",
             },
         ),
     ]
@@ -1601,7 +1601,7 @@ class WPZielszenarioIndikatoren(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "tCO2/MWh",
             },
         ),
     ] = None
@@ -1659,7 +1659,7 @@ class WPZielszenarioIndikatoren(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "1",
-                "uom": "unknown",
+                "uom": "MWh",
             },
         ),
     ]
@@ -1671,7 +1671,7 @@ class WPZielszenarioIndikatoren(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "vH/a",
             },
         ),
     ] = None
@@ -2264,7 +2264,7 @@ class WPGasErzeugung(WPPunktobjekt):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MW",
             },
         ),
     ] = None
@@ -2584,7 +2584,7 @@ class WPGasNetz(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "1",
-                "uom": "unknown",
+                "uom": "m",
             },
         ),
     ]
@@ -2915,7 +2915,7 @@ class WPGasSpeicher(WPPunktobjekt):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MWh",
             },
         ),
     ] = None
@@ -2993,7 +2993,7 @@ class WPGrossverbraucher(WPPunktobjekt):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MWh",
             },
         ),
     ] = None
@@ -3164,7 +3164,7 @@ class WPMassnahme(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MWh/a",
             },
         ),
     ] = None
@@ -3176,7 +3176,7 @@ class WPMassnahme(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "tCO2e/a",
             },
         ),
     ] = None
@@ -3630,7 +3630,7 @@ class WPPotenzialEnergieEinsparung(WPGeometrieobjekt):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "1",
-                "uom": "unknown",
+                "uom": "MWh/a",
             },
         ),
     ]
@@ -3698,7 +3698,7 @@ class WPPotenzialWaermeSpeicherung(WPGeometrieobjekt):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "1",
-                "uom": "unknown",
+                "uom": "MWh",
             },
         ),
     ]
@@ -3941,7 +3941,7 @@ class WPWaermeNetz(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "1",
-                "uom": "unknown",
+                "uom": "°C",
             },
         ),
     ]
@@ -3953,7 +3953,7 @@ class WPWaermeNetz(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "1",
-                "uom": "unknown",
+                "uom": "m",
             },
         ),
     ]
@@ -4251,7 +4251,7 @@ class WPWaermeerzeugerAngaben(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "MW",
             },
         ),
     ] = None
@@ -4412,7 +4412,7 @@ class WPWaermeliniendichte(WPLinienobjekt):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "1",
-                "uom": "unknown",
+                "uom": "MWh/(m*a)",
             },
         ),
     ]
@@ -4460,7 +4460,7 @@ class WPAbwasserNetzAbschnitt(WPLinienobjekt):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "1",
-                "uom": "unknown",
+                "uom": "m3/s",
             },
         ),
     ]
@@ -4623,7 +4623,7 @@ class WPBestandsanalyseAggregiert(BaseFeature):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "tCO2/MWh",
             },
         ),
     ] = None
@@ -5303,7 +5303,7 @@ class WPGebaeudeBaublock(WPBaublock):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "0..1",
-                "uom": "unknown",
+                "uom": "ha",
             },
         ),
     ] = None
@@ -5334,7 +5334,7 @@ class WPWaermeverbrauch(WPBaublock):
                 "typename": "Measure",
                 "stereotype": "Measure",
                 "multiplicity": "1",
-                "uom": "unknown",
+                "uom": "MWh/(ha*a)",
             },
         ),
     ]

xplan_tools/model/base.py

@@ -634,13 +634,20 @@ class BaseFeature(BaseModel, GMLAdapter, CoretableAdapter, JsonFGAdapter):
     @model_validator(mode="before")
     @classmethod
     def _deserialization_hook(cls, data: Any, info: ValidationInfo) -> Any:
-        """Provides deserialization for different formats/representations before validation."""
+        """Provides deserialization for different formats/representations before validation and prepares data."""
         if isinstance(data, _Element):
             data = cls._from_etree(data, info)
         elif isinstance(data, Feature):
             data = cls._from_coretable(data)
         elif isinstance(data, dict) and data.get("featureType", None):
             data = cls._from_jsonfg(data, info)
+        else:
+            return data
+        # add uom if encoding is missing it
+        for key, value in data.items():
+            prop_info = cls.get_property_info(key)
+            if prop_info["stereotype"] == "Measure" and isinstance(data[key], str):
+                data[key] = {"value": value, "uom": prop_info["uom"]}
         return data
 
     @model_validator(mode="after")

{xplan_tools-1.13.0.dist-info → xplan_tools-1.13.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xplan-tools
-Version: 1.13.0
+Version: 1.13.1
 Summary: Manage XPlanung data
 License: EUPL-1.2-or-later
 License-File: LICENSE.md

{xplan_tools-1.13.0.dist-info → xplan_tools-1.13.1.dist-info}/RECORD

@@ -16,12 +16,12 @@ xplan_tools/model/appschema/inspire_base.py,sha256=-PizgUNWTKGZKvSMejAZmraW4nvJr
 xplan_tools/model/appschema/inspire_base2.py,sha256=m5NH25fJcAcaT9RXO8BeEZT4qDaXf0bmqKVdjieiEY4,9827
 xplan_tools/model/appschema/inspire_plu40.py,sha256=vgUs3vFj6DAaGuT3G5EGUB90H35S-3zOwG7Uy4T9-1E,33568
 xplan_tools/model/appschema/xplan41.py,sha256=brr9fZeWiecxe1ZY76GhGBuCiAAr8lyOS_7KpAnWb28,990645
-xplan_tools/model/appschema/xplan54.py,sha256=FtktDeb6Bjvo6Fni3lpk1m9fBXVmL3lpV2eXy6dA9ZI,1011373
-xplan_tools/model/appschema/xplan60.py,sha256=1HCignD1W4bA9DZvZhoEoPiTCSiDQTl6c9JGgFdS70Y,1200398
-xplan_tools/model/appschema/xplan61.py,sha256=st0f3Ih_emUCB1tMcumGAPGNtryBZl16BB-Mqr6o12s,1319024
-xplan_tools/model/appschema/xtrasse20.py,sha256=0Me-y1ydADedhK1fxe8W8fLR1228FMt4RIZU-iYJRro,537913
-xplan_tools/model/appschema/xwp09.py,sha256=Q2oDiAvKjYAbIrHQ2hlwOnbB-XoeaDgi_qJnOVW8k6Y,218599
-xplan_tools/model/base.py,sha256=xbTZyOHuyK3JkNl9DAdzDitKhS9LrJHc3c6cJJDHX5c,27583
+xplan_tools/model/appschema/xplan54.py,sha256=MTYGI6dp_jdrDMBhohWHRevjvP-Ja7PrYvMVj2IQkAg,1011377
+xplan_tools/model/appschema/xplan60.py,sha256=W85nw3dWYFYCPi0B3MR_BYCSyL7F-amw0Y6VLvEFiKk,1200402
+xplan_tools/model/appschema/xplan61.py,sha256=J0ZhbgyZD5ZOvIOYXWCo2R4AygCe0QC5u5Ope2XPoM0,1319028
+xplan_tools/model/appschema/xtrasse20.py,sha256=5zRbkFOOSOKqy5h8INzI6UvCmG0KqGAzNBQWXmfgaQw,537890
+xplan_tools/model/appschema/xwp09.py,sha256=fYpLgKnL6vEscSPWxBWmB_VU4bidyQv0C3w91I_nmms,218518
+xplan_tools/model/base.py,sha256=C8DAORkmQ0aR_4QQKK4YONO0RBYpNZk3vVGuyS5shQ4,27935
 xplan_tools/model/migrations/env.py,sha256=dJw3GH3_pJn2LuiflD1wwJi7Dq-9avm56xdRc50Wzpg,1974
 xplan_tools/model/migrations/script.py.mako,sha256=04kgeBtNMa4cCnG8CfQcKt6P6rnloIfj8wy0u_DBydM,704
 xplan_tools/model/migrations/versions/3c3445a58565_base_schema.py,sha256=nsgcqTDFkcejdT4YqRfyQeDbWAHMqZJKVyZnUm5BY9A,7857
@@ -42,8 +42,8 @@ xplan_tools/transform/transformer.py,sha256=2O4Aq_eTo9e2JOUwq9tJnfv6dwOxqNDdTGPt
 xplan_tools/util/__init__.py,sha256=OqOorl5s8BZANbLeFE9wWlozvA64RINn9wigMkds2u8,11704
 xplan_tools/util/style.py,sha256=6Iyj-fsmnJylkJo-70wCFjfsbbwUGAS5QTN2IMJAVdI,7503
 xplan_tools/util/validate.py,sha256=3inTRLHrVonfQ9FDjtvSNKlAGem5DKtEvLqW7NxwWQs,3327
-xplan_tools-1.13.0.dist-info/METADATA,sha256=9RF_9DOvPsv7KfMti44bJRpAj64nVLOL9MbwCqjUrxA,4824
-xplan_tools-1.13.0.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-xplan_tools-1.13.0.dist-info/entry_points.txt,sha256=NV98QKVV3vDuWnJtWsKZvcpEH2N7SF1yHXvVMet23Ps,52
-xplan_tools-1.13.0.dist-info/licenses/LICENSE.md,sha256=b8nnCcy_4Nd_v_okJ6mDKCvi64jkexzbSfIag7TR5mU,13827
-xplan_tools-1.13.0.dist-info/RECORD,,
+xplan_tools-1.13.1.dist-info/METADATA,sha256=snQDjzBtxlSLcGODMFq85g4qF63ooP1sBTn0Pj12hM0,4824
+xplan_tools-1.13.1.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+xplan_tools-1.13.1.dist-info/entry_points.txt,sha256=NV98QKVV3vDuWnJtWsKZvcpEH2N7SF1yHXvVMet23Ps,52
+xplan_tools-1.13.1.dist-info/licenses/LICENSE.md,sha256=b8nnCcy_4Nd_v_okJ6mDKCvi64jkexzbSfIag7TR5mU,13827
+xplan_tools-1.13.1.dist-info/RECORD,,