diff options
Diffstat (limited to 'ishtar_common/tests.py')
| -rw-r--r-- | ishtar_common/tests.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 818967c64..053e19e7c 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -88,7 +88,6 @@ from ishtar_common.utils import ( move_dict_data, rename_and_simplify_media_name, try_fix_file, - reverse_coordinates, EachCharacterTypeValidator, ) from ishtar_common.tasks import launch_export @@ -3777,7 +3776,7 @@ class GeoVectorFormTest(TestCase): self.assertIn("id_point_2d", content) self._test_post_create_pre_geo(c, geom_type) data = self._init_default_data(geom_type) - data.update({geom_type: reverse_coordinates(point_2d.ewkt)}) + data.update({geom_type: point_2d.ewkt}) edited_geo = self._test_post_geo(c, geom_type, data) self.assertEqual(edited_geo.point_2d.coords, point_2d.coords) self.assertEqual(edited_geo.point_2d.srid, point_2d.srid) @@ -3794,7 +3793,7 @@ class GeoVectorFormTest(TestCase): self._test_post_create_pre_geo(c, geom_type) data = self._init_default_data(geom_type) data.update({ - "point_3d": reverse_coordinates(point.ewkt), + "point_3d": point.ewkt, "z": 10 }) edited_geo = self._test_post_geo(c, geom_type, data) @@ -3817,7 +3816,7 @@ class GeoVectorFormTest(TestCase): edited_geo = self._test_post_geo(c, geom_type, data) self.assertEqual( list(edited_geo.multi_points.coords), - [tuple(reversed(t)) for t in points.coords] + list(points.coords) ) self.assertEqual(edited_geo.multi_points.srid, 4326) @@ -3862,7 +3861,7 @@ class GeoVectorFormTest(TestCase): edited_geo = self._test_post_geo(c, geom_type, data) self.assertEqual( list(edited_geo.multi_polygon.coords), - [tuple(tuple(t[::-1] for t in tu) for tu in tup) for tup in multi_polygon.coords] + list(multi_polygon.coords) ) self.assertEqual(edited_geo.multi_polygon.srid, 4326) @@ -3906,8 +3905,7 @@ class GeoVectorFormTest(TestCase): data = self._init_default_data(geom_type) data.update({geom_type: point_2d_for_edit.ewkt}) edited_geo = self._test_post_geo(c, geom_type, data, geo_vector) - # Old version of django reverse coordinates - self.assertEqual(edited_geo.point_2d.coords, point_2d_for_edit.coords[::-1]) + self.assertEqual(edited_geo.point_2d.coords, point_2d_for_edit.coords) self.assertEqual(edited_geo.point_2d.srid, point_2d_for_edit.srid) def test_edit_geo_vector_point3d(self): @@ -3927,7 +3925,7 @@ class GeoVectorFormTest(TestCase): self._test_get_edit_geo(geo_vector, content) data = self._init_default_data(geom_type) data.update({"z": 20}) - data.update({geom_type: reverse_coordinates(point_for_edit.ewkt)}) + data.update({geom_type: point_for_edit.ewkt}) edited_geo = self._test_post_geo(c, geom_type, data, geo_vector) # Old version of django reverse coordinates self.assertEqual(edited_geo.point_3d.coords, point_for_edit.coords) @@ -3954,7 +3952,7 @@ class GeoVectorFormTest(TestCase): # Old version of django reverse coordinates self.assertEqual( list(edited_geo.multi_points.coords), - [tuple(reversed(t)) for t in points_edit.coords] + list(points_edit.coords) ) self.assertEqual(edited_geo.multi_points.srid, 4326) @@ -3986,7 +3984,7 @@ class GeoVectorFormTest(TestCase): # Old version of django reverse coordinates self.assertEqual( list(edited_geo.multi_line.coords), - [tuple(t[::-1] for t in tu) for tu in lines_edit.coords] + list(lines_edit.coords) ) self.assertEqual(edited_geo.multi_line.srid, 4326) @@ -4018,7 +4016,7 @@ class GeoVectorFormTest(TestCase): # Old version of django reverse coordinates self.assertEqual( list(edited_geo.multi_polygon.coords), - [tuple(tuple(t[::-1] for t in tu) for tu in tup) for tup in multi_polygon_edit.coords] + list(multi_polygon_edit.coords) ) self.assertEqual(edited_geo.multi_polygon.srid, 4326) |