Z-axis geometry upload fix

* adds clamping of 3D geometries to 2D geometries if uploaded using the map importer
* extends tests for payment-document linkage
* fixes bug in team-admin selection where autocomplete could not be resolved properly

konova/forms/geometry_form.py

@@ -10,6 +10,7 @@ import json
 from django.contrib.gis import gdal
 from django.contrib.gis.forms import MultiPolygonField
 from django.contrib.gis.geos import MultiPolygon, Polygon
+from django.contrib.gis.geos.prototypes.io import WKTWriter
 from django.utils.translation import gettext_lazy as _
 
 from konova.forms.base_form import BaseForm
@@ -74,9 +75,21 @@ class SimpleGeomForm(BaseForm):
         # this case)
         features = []
         features_json = geom.get("features", [])
+        accepted_ogr_types = [
+            "Polygon",
+            "Polygon25D",
+            "MultiPolygon",
+            "MultiPolygon25D",
+        ]
         for feature in features_json:
-            g = gdal.OGRGeometry(json.dumps(feature.get("geometry", feature)), srs=DEFAULT_SRID_RLP)
-            if g.geom_type not in ["Polygon", "MultiPolygon"]:
+            feature_geom = json.dumps(feature.get("geometry", feature))
+            g = gdal.OGRGeometry(feature_geom, srs=DEFAULT_SRID_RLP)
+
+            flatten_geometry = g.coord_dim > 2
+            if flatten_geometry:
+                g = self.__flatten_geom_to_2D(g)
+
+            if g.geom_type not in accepted_ogr_types:
                 self.add_error("geom", _("Only surfaces allowed. Points or lines must be buffered."))
                 is_valid = False
                 return is_valid
@@ -131,3 +144,13 @@ class SimpleGeomForm(BaseForm):
         # Start the parcel update procedure in a background process
         celery_update_parcels.delay(geometry.id)
         return geometry
+
+    def __flatten_geom_to_2D(self, geom):
+        """
+        Enforces a given OGRGeometry from higher dimensions into 2D
+
+        """
+        wkt_w = WKTWriter(dim=2)
+        g_wkt = wkt_w.write(geom.geos).decode("utf-8")
+        geom = gdal.OGRGeometry(g_wkt)
+        return geom

konova/tests/test_views.py

@@ -115,6 +115,19 @@ class BaseTestCase(TestCase):
         """
         return f"{prefix}{generate_random_string(3, True)}"
 
+    def create_dummy_document(self, DocumentModel, instance):
+        """ Creates a document db entry which can be used for tests
+
+        """
+        doc = DocumentModel.objects.create(
+            title="TEST_doc",
+            comment="",
+            file=None,
+            date_of_creation="1970-01-01",
+            instance=instance,
+        )
+        return doc
+
     def create_dummy_intervention(self):
         """ Creates an intervention which can be used for tests