# Geometry form fix

* fixes bugs in tests
* refactors and simplifies geometry merging on GeometryForm

compensation/tests/ecoaccount/test_workflow.py

@@ -86,7 +86,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         new_title = self.create_dummy_string()
         new_identifier = self.create_dummy_string()
         new_comment = self.create_dummy_string()
-        new_geometry = MultiPolygon(srid=4326)  # Create an empty geometry
+        new_geometry = self.create_dummy_geometry()
         test_conservation_office = self.get_conservation_office_code()
         test_deductable_surface = self.eco_account.deductable_surface + 100
 
@@ -103,7 +103,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
             "identifier": new_identifier,
             "title": new_title,
             "comment": new_comment,
-            "geom": new_geometry.geojson,
+            "geom": self.create_geojson(new_geometry),
             "surface": test_deductable_surface,
             "conservation_office": test_conservation_office.id
         }

ema/tests/test_workflow.py

@@ -84,7 +84,7 @@ class EmaWorkflowTestCase(BaseWorkflowTestCase):
         new_title = self.create_dummy_string()
         new_identifier = self.create_dummy_string()
         new_comment = self.create_dummy_string()
-        new_geometry = MultiPolygon(srid=4326)  # Create an empty geometry
+        new_geometry = self.create_dummy_geometry()  # Create an empty geometry
         test_conservation_office = self.get_conservation_office_code()
 
         check_on_elements = {
@@ -99,7 +99,7 @@ class EmaWorkflowTestCase(BaseWorkflowTestCase):
             "identifier": new_identifier,
             "title": new_title,
             "comment": new_comment,
-            "geom": new_geometry.geojson,
+            "geom": self.create_geojson(new_geometry),
             "conservation_office": test_conservation_office.id
         }
         self.client_user.post(url, post_data)

intervention/tests/unit/test_forms.py

@@ -124,7 +124,7 @@ class EditInterventionFormTestCase(NewInterventionFormTestCase):
         self.assertIsNotNone(obj.responsible.handler)
         self.assertEqual(obj.title, data["title"])
         self.assertEqual(obj.comment, data["comment"])
-        self.assertTrue(test_geom.equals_exact(obj.geometry.geom, 0.000001))
+        self.assert_equal_geometries(test_geom, obj.geometry.geom)
 
         self.assertEqual(obj.legal.binding_date, today)
         self.assertEqual(obj.legal.registration_date, today)

konova/forms/geometry_form.py

@@ -72,9 +72,8 @@ class SimpleGeomForm(BaseForm):
         # will be rendered again on failed submit
         self.initialize_form_field("geom", self.data["geom"])
 
-        # Read geojson into gdal geometry
+        # Initialize features list with empty MultiPolygon, so that an empty input will result in a
-        # HINT: This can be simplified if the geojson format holds data in epsg:4326 (GDAL provides direct creation for
+        # proper empty MultiPolygon object
-        # this case)
         features = []
         features_json = geom.get("features", [])
         accepted_ogr_types = [
@@ -102,19 +101,22 @@ class SimpleGeomForm(BaseForm):
                 return is_valid
 
             is_valid &= self.__is_area_valid(g)
-
+            g = Polygon.from_ewkt(g.ewkt)
-            polygon = Polygon.from_ewkt(g.ewkt)
+            is_valid &= g.valid
-            is_valid &= polygon.valid
+            if not g.valid:
-            if not polygon.valid:
+                self.add_error("geom", g.valid_reason)
-                self.add_error("geom", polygon.valid_reason)
                 return is_valid
 
-            features.append(polygon)
+            if isinstance(g, Polygon):
+                features.append(g)
+            elif isinstance(g, MultiPolygon):
+                features.extend(list(g))
 
         # Unionize all geometry features into one new MultiPolygon
+        if features:
+            form_geom = MultiPolygon(*features, srid=DEFAULT_SRID_RLP).unary_union
+        else:
             form_geom = MultiPolygon(srid=DEFAULT_SRID_RLP)
-        for feature in features:
-            form_geom = form_geom.union(feature)
 
         # Make sure to convert into a MultiPolygon. Relevant if a single Polygon is provided.
         form_geom = Geometry.cast_to_multipolygon(form_geom)

konova/models/geometry.py

@@ -395,7 +395,7 @@ class Geometry(BaseResource):
             output_geom
         """
         output_geom = input_geom
-        if input_geom.geom_type != "MultiPolygon":
+        if not isinstance(input_geom, MultiPolygon):
             output_geom = MultiPolygon(input_geom, srid=DEFAULT_SRID_RLP)
         return output_geom
 

konova/tests/test_views.py

@@ -469,7 +469,7 @@ class BaseTestCase(TestCase):
         eco_account.save()
         return eco_account
 
-    def assert_equal_geometries(self, geom1: MultiPolygon, geom2: MultiPolygon, tolerance = 0.001):
+    def assert_equal_geometries(self, geom1: MultiPolygon, geom2: MultiPolygon, tolerance=0.001):
         """ Assert for geometries to be equal
 
         Transforms the geometries to matching srids before checking
@@ -491,7 +491,10 @@ class BaseTestCase(TestCase):
             # transformation from one coordinate system into the other, which is valid
             geom1.transform(geom2.srid)
             geom2.transform(geom1.srid)
-        self.assertTrue(geom1.equals_exact(geom2, tolerance) or geom2.equals_exact(geom1, tolerance))
+        self.assertTrue(
+            geom1.equals_exact(geom2, tolerance=tolerance),
+            msg=f"Difference is {abs(geom1.area - geom2.area)} with {geom1.area} and {geom2.area} in a tolerance of {tolerance}"
+        )
 
 
 class BaseViewTestCase(BaseTestCase):