Test update

* updates tests for SRID migration

konova/forms.py

@@ -369,14 +369,14 @@ class SimpleGeomForm(BaseForm):
             if self.instance is None or self.instance.geometry is None:
                 raise LookupError
             geometry = self.instance.geometry
-            geometry.geom = self.cleaned_data.get("geom", MultiPolygon(srid=DEFAULT_SRID))
+            geometry.geom = self.cleaned_data.get("geom", MultiPolygon(srid=DEFAULT_SRID_RLP))
             geometry.modified = action
 
             geometry.save()
         except LookupError:
             # No geometry or linked instance holding a geometry exist --> create a new one!
             geometry = Geometry.objects.create(
-                geom=self.cleaned_data.get("geom", MultiPolygon(srid=DEFAULT_SRID)),
+                geom=self.cleaned_data.get("geom", MultiPolygon(srid=DEFAULT_SRID_RLP)),
                 created=action,
             )
         # Start the parcel update procedure in a background process

konova/models/geometry.py

@@ -21,8 +21,7 @@ class Geometry(BaseResource):
     """
     Geometry model
     """
-    from konova.settings import DEFAULT_SRID
-    geom = MultiPolygonField(null=True, blank=True, srid=DEFAULT_SRID)
+    geom = MultiPolygonField(null=True, blank=True, srid=DEFAULT_SRID_RLP)
 
     def __str__(self):
         return str(self.id)

konova/tests/test_views.py

@@ -430,15 +430,13 @@ class BaseTestCase(TestCase):
             self.assertTrue(True)
             return
 
+        tolerance = 0.001
         if geom1.srid != geom2.srid:
-            tolerance = 0.001
             # Due to prior possible transformation of any of these geometries, we need to make sure there exists a
             # transformation from one coordinate system into the other, which is valid
-            geom1_t = geom1.transform(geom2.srid, clone=True)
-            geom2_t = geom2.transform(geom1.srid, clone=True)
-            self.assertTrue(geom1_t.equals_exact(geom2, tolerance) or geom2_t.equals_exact(geom1, tolerance))
-        else:
-            self.assertTrue(geom1.equals(geom2))
+            geom1.transform(geom2.srid)
+            geom2.transform(geom1.srid)
+        self.assertTrue(geom1.equals_exact(geom2, tolerance) or geom2.equals_exact(geom1, tolerance))
 
 
 class BaseViewTestCase(BaseTestCase):