Merge branch 'develop'

services/management/commands/lipas_import.py

@@ -181,14 +181,19 @@ def clean_name(name):
         self._save_geometries(geometries, units_by_lipas_id)
 
     def _save_geometries(self, geometries, units_by_lipas_id):
-        # Add all geometries we found to the db
         logger.info("Updating geometries in the database...")
         for lipas_id, geometry in geometries.items():
             unit = units_by_lipas_id[lipas_id]
-            # FIXME: make sports map UI support simplified
-            # geometries and bring back simplification
-            # from commit 6cff46e0399fedbbc8266efa5230cd4ccb8a8485
-            unit.geometry = geometry
+            try:
+                line_geometry = geometry.merged
+                if isinstance(line_geometry, LineString):
+                    line_geometry = MultiLineString([line_geometry])
+                unit.geometry = line_geometry
+            except TypeError as e:
+                logger.warning(
+                    f"Failed to merge geometry for unit {unit.name_fi}: {e}",
+                )
+                unit.geometry = geometry
             unit.save()
 
     def _get_types(self):

services/management/commands/lipas_import_3d.py

@@ -1,5 +1,7 @@
 import logging
 
+from django.contrib.gis.geos import LineString, MultiLineString
+
 from services.management.commands import lipas_import
 
 logger = logging.getLogger(__name__)
@@ -27,7 +29,18 @@ def _save_geometries(self, geometries, units_by_lipas_id):
         for lipas_id, geometry in geometries.items():
             unit = units_by_lipas_id[lipas_id]
             if self._has_z_coordinate(geometry):
-                unit.geometry_3d = geometry
+                try:
+                    line_geometry = geometry.merged
+                    if isinstance(line_geometry, LineString):
+                        line_geometry = MultiLineString([line_geometry])
+                    unit.geometry_3d = line_geometry
+                    if len(line_geometry) == 0:
+                        unit.geometry_3d = geometry
+                except TypeError as e:
+                    logger.warning(
+                        f"Failed to merge 3D geometry for unit {unit.name_fi}: {e}",
+                    )
+                    unit.geometry_3d = geometry
                 unit.save()
             else:
                 logger.warning(
@@ -41,4 +54,4 @@ def _has_z_coordinate(self, geometry):
         """
         Check if a geometry has a Z-coordinate (3D).
         """
-        return "Z" in geometry.ewkt
+        return geometry.hasz

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="smbackend",
-    version="241022",
+    version="241114",
     license="AGPLv3",
     packages=find_packages(),
     include_package_data=True,