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

xplan_tools/model/base.py

@@ -3,9 +3,12 @@
 The classes provide some utility, (de-)serialization and/or validation methods to simplify access and manipulation.
 """
 
+from __future__ import annotations
+
 import datetime
 import logging
 import re
+from copy import deepcopy
 from importlib import import_module
 from pathlib import Path
 from types import ModuleType, NoneType
@@ -22,7 +25,7 @@ from typing import (
     get_args,
     get_origin,
 )
-from uuid import UUID
+from uuid import UUID, uuid4
 
 from lxml.etree import _Element
 from osgeo import ogr
@@ -312,6 +315,46 @@ class BaseCollection(BaseModel):
         """Yields features stored in the collection."""
         return (feature for feature in self.features.values())
 
+    def make_copy(
+        self, with_id_map: bool = False
+    ) -> "BaseCollection" | tuple["BaseCollection", dict]:
+        """Return a copy of the collection with new IDs.
+
+        All feature IDs are renewed and respective references are updated.
+
+        Args:
+            with_id_map: whether to additionally return a map of old IDs to new IDs
+        """
+        id_map = {key: uuid4() for key in self.features.keys()}
+        new_features = {}
+        for old_feature in self.features.values():
+            new_id = str(id_map[old_feature.id])
+            new_feature = deepcopy(old_feature)
+            new_feature.id = new_id
+            for assocation in old_feature.get_associations():
+                old_value = getattr(old_feature, assocation)
+                if isinstance(old_value, UUID):
+                    new_value = id_map[str(old_value)]
+                    setattr(new_feature, assocation, new_value)
+                elif isinstance(old_value, list):
+                    new_list = [
+                        id_map[str(item)] if isinstance(item, UUID) else item
+                        for item in old_value
+                    ]
+                    setattr(new_feature, assocation, new_list)
+            new_features[new_id] = new_feature
+
+        new_collection = BaseCollection(
+            features=new_features,
+            srid=self.srid,
+            version=self.version,
+            appschema=self.appschema,
+        )
+        if with_id_map:
+            return new_collection, id_map
+        else:
+            return new_collection
+
     def add_style_properties(
         self, to_text: bool = False, always_populate_schriftinhalt: bool = False
     ) -> None:

xplan_tools/model/migrations/versions/f8b74c08ec07_add_refs_indexes_ensure_polygon_ccw.py

@@ -7,7 +7,6 @@ Create Date: 2026-01-08 10:58:26.988690
 
 from typing import Sequence, Union
 
-import sqlalchemy as sa
 from alembic import op
 
 from xplan_tools.settings import get_settings
@@ -25,9 +24,7 @@ schema = settings.db_schema
 def upgrade() -> None:
     """Upgrade schema.
 
-    Creates indexes on `refs.base_id` and refs.related_id` and normalizes all polygon
-    geometries in `coretable.geometry` to counter-clockwise orientation
-    using `ST_ForcePolygonCCW` in-place.
+    Creates indexes on `refs.base_id` and refs.related_id`.
     """
     op.create_index(
         op.f("ix_refs_base_id"),
@@ -43,19 +40,6 @@ def upgrade() -> None:
         schema=schema,
         if_not_exists=True,
     )
-    coretable = sa.Table(
-        "coretable",
-        sa.MetaData(),
-        sa.Column("geometry"),
-        sa.Column("geometry_type"),
-        schema=schema,
-    )
-    stmt = (
-        sa.update(coretable)
-        .values(geometry=sa.func.ST_ForcePolygonCCW(coretable.c.geometry))
-        .where(coretable.c.geometry_type == "polygon")
-    )
-    op.execute(stmt)
 
 
 def downgrade() -> None:

xplan_tools/model/orm.py

@@ -20,7 +20,6 @@ from sqlalchemy import (
     Text,
     Uuid,
     case,
-    cast,
     literal,
     select,
 )
@@ -104,13 +103,8 @@ class PGGeometry(TypeDecorator):
 
     def bind_expression(self, bindvalue):
         """Transform incoming geometries to the SRID of the DB and force CCW orientation for polygons."""
-        is_polygon = Geometry._is_polygon(cast(bindvalue, Geometry))
-        case_clause = case(
-            (is_polygon, func.ST_ForcePolygonCCW(bindvalue)),
-            else_=bindvalue,
-        )
         return func.ST_Transform(
-            case_clause,
+            bindvalue,
             func.Find_SRID(
                 get_settings().db_schema or "public", "coretable", "geometry"
             ),

xplan_tools/util/style.py

@@ -49,6 +49,10 @@ def add_style_properties_to_feature(
                         "alias", prop_info["enum_info"][value]["name"]
                     ),
                 )
+            elif prop_info["stereotype"] == "Codelist":
+                text = str(value)
+                if text.startswith("urn:"):
+                    text = text.split(f"urn:xplan:{prop_info['typename']}:")[1]
             elif prop_info["stereotype"] == "Measure":
                 text = f"{value:n} {uom_map.get(prop_info['uom'], prop_info['uom'])}"
             else:
@@ -63,8 +67,8 @@ def add_style_properties_to_feature(
         remove_namespace = re.sub(
             r"xplan:", "", remove_subindexes
         )  # xplan:|(.P_|SO_)[a-zA-Z]*\/
-        attr, path_index, datatype, sub_attr = re.match(
-            r"^(?P<attr>\w*)\[?(?P<index>\d)?]?/?(?P<datatype>\w{2}_\w*)?/?(?P<sub_attr>\w*)?$",
+        attr, path_index, datatype, sub_attr, sub_attr_index = re.match(
+            r"^(?P<attr>\w*)\[?(?P<index>\d)?]?/?(?P<datatype>\w{2}_\w*)?/?(?P<sub_attr>\w*)?\[?(?P<sub_attr_index>\d)?]?$",
             remove_namespace,
         ).groups()
 
@@ -83,6 +87,11 @@ def add_style_properties_to_feature(
         if sub_attr:
             name = sub_attr
             value = getattr(value, sub_attr)
+            if isinstance(value, list):
+                index = 0
+                if sub_attr_index:
+                    index = max(int(sub_attr_index) - 1, 0)
+                value = value[index]
 
         prop_info = model.get_property_info(name)
 

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

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

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

@@ -21,12 +21,12 @@ xplan_tools/model/appschema/xplan60.py,sha256=W85nw3dWYFYCPi0B3MR_BYCSyL7F-amw0Y
 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/base.py,sha256=Zjs1svwzXcRM9nz5JdQZna44C5Zk4pqdHlHLnRmbq_U,29614
 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
-xplan_tools/model/migrations/versions/f8b74c08ec07_add_refs_indexes_ensure_polygon_ccw.py,sha256=RCDG-vT6jiHqvg29BCnYoM1YKl9sJw_I5vamdXr62zU,1767
-xplan_tools/model/orm.py,sha256=_OPGbIx3C93RZsJZL-Rx52hWIgwqHlN_yW7Y815Om24,11936
+xplan_tools/model/migrations/versions/f8b74c08ec07_add_refs_indexes_ensure_polygon_ccw.py,sha256=7qE9tkGeOKD1zxTiNxkiZNmF_1CNwylAblQC3c8aWzU,1239
+xplan_tools/model/orm.py,sha256=THjjxFmmnIqfwYOZ_89AQJcOZdO3wM_mOk3QaG7J2rY,11720
 xplan_tools/resources/styles.py,sha256=h0ezUqZrsXMQz2bTcF0nIyoI-IxMItstHx1j1xYGi3c,45010
 xplan_tools/settings/__init__.py,sha256=yQdL0KFclWVUBE0ZMUTkktKMa9D78RDcPrHkK23Z9m8,89
 xplan_tools/settings/settings.py,sha256=bABcqw7--TU-khpE9l-2XkavlQ-xuVZwmBmJiD0yRVw,462
@@ -40,10 +40,10 @@ xplan_tools/transform/migrate_60_61.py,sha256=S-fdnTjQUf8LGnEvsOY73zZYDvyVgIhVew
 xplan_tools/transform/migrate_6x_plu.py,sha256=3w5UfjdUKFUiLma3Ppc9fAogPVxVshtUzzve0Dv0nWM,216797
 xplan_tools/transform/transformer.py,sha256=2O4Aq_eTo9e2JOUwq9tJnfv6dwOxqNDdTGPtV_SAL1w,26216
 xplan_tools/util/__init__.py,sha256=OqOorl5s8BZANbLeFE9wWlozvA64RINn9wigMkds2u8,11704
-xplan_tools/util/style.py,sha256=6Iyj-fsmnJylkJo-70wCFjfsbbwUGAS5QTN2IMJAVdI,7503
+xplan_tools/util/style.py,sha256=xFAK-QH2XEEUo7AxXWx35s7hJtmrr1XaRHiqPH3YEMM,7959
 xplan_tools/util/validate.py,sha256=3inTRLHrVonfQ9FDjtvSNKlAGem5DKtEvLqW7NxwWQs,3327
-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,,
+xplan_tools-1.14.0.dist-info/METADATA,sha256=_LdrPenkuJh4E1in4U4Jenh61EMwE1gZ4_j1wx7ohbE,4824
+xplan_tools-1.14.0.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+xplan_tools-1.14.0.dist-info/entry_points.txt,sha256=NV98QKVV3vDuWnJtWsKZvcpEH2N7SF1yHXvVMet23Ps,52
+xplan_tools-1.14.0.dist-info/licenses/LICENSE.md,sha256=b8nnCcy_4Nd_v_okJ6mDKCvi64jkexzbSfIag7TR5mU,13827
+xplan_tools-1.14.0.dist-info/RECORD,,

{xplan_tools-1.13.1.dist-info → xplan_tools-1.14.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.3.0
+Generator: poetry-core 2.3.1
 Root-Is-Purelib: true
 Tag: py3-none-any