diff options
Diffstat (limited to 'tests/gis_tests/geoapp/test_functions.py')
| -rw-r--r-- | tests/gis_tests/geoapp/test_functions.py | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/tests/gis_tests/geoapp/test_functions.py b/tests/gis_tests/geoapp/test_functions.py index 9cf444935e..22d40a4400 100644 --- a/tests/gis_tests/geoapp/test_functions.py +++ b/tests/gis_tests/geoapp/test_functions.py @@ -89,12 +89,22 @@ class GISFunctionsTests(FuncTestMixin, TestCase): # MariaDB doesn't limit the number of decimals in bbox. if connection.ops.mariadb: chicago_json['bbox'] = [-87.650175, 41.850385, -87.650175, 41.850385] - self.assertJSONEqual( - City.objects.annotate( - geojson=functions.AsGeoJSON('point', bbox=True, crs=True, precision=5) - ).get(name='Chicago').geojson, - chicago_json, - ) + try: + self.assertJSONEqual( + City.objects.annotate( + geojson=functions.AsGeoJSON('point', bbox=True, crs=True, precision=5) + ).get(name='Chicago').geojson, + chicago_json, + ) + except AssertionError: + # Give a second chance with different coords rounding. + chicago_json['coordinates'][1] = 41.85038 + self.assertJSONEqual( + City.objects.annotate( + geojson=functions.AsGeoJSON('point', bbox=True, crs=True, precision=5) + ).get(name='Chicago').geojson, + chicago_json, + ) @skipUnlessDBFeature("has_AsGML_function") def test_asgml(self): @@ -295,11 +305,10 @@ class GISFunctionsTests(FuncTestMixin, TestCase): geom = Point(5, 23, srid=4326) qs = Country.objects.annotate(inter=functions.Intersection('mpoly', geom)) for c in qs: - expected = ( - None if connection.features.empty_intersection_returns_none - else c.mpoly.intersection(geom) - ) - self.assertEqual(c.inter, expected) + if connection.features.empty_intersection_returns_none: + self.assertIsNone(c.inter) + else: + self.assertIs(c.inter.empty, True) @skipUnlessDBFeature("has_IsValid_function") def test_isvalid(self): @@ -352,7 +361,7 @@ class GISFunctionsTests(FuncTestMixin, TestCase): State.objects.create(name='invalid', poly=invalid_geom) invalid = State.objects.filter(name='invalid').annotate(repaired=functions.MakeValid('poly')).first() self.assertIs(invalid.repaired.valid, True) - self.assertEqual(invalid.repaired, fromstr('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', srid=invalid.poly.srid)) + self.assertTrue(invalid.repaired.equals(fromstr('POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))', srid=invalid.poly.srid))) @skipUnlessDBFeature('has_MakeValid_function') def test_make_valid_multipolygon(self): @@ -365,11 +374,11 @@ class GISFunctionsTests(FuncTestMixin, TestCase): repaired=functions.MakeValid('poly'), ).get() self.assertIs(invalid.repaired.valid, True) - self.assertEqual(invalid.repaired, fromstr( + self.assertTrue(invalid.repaired.equals(fromstr( 'MULTIPOLYGON (((0 0, 0 1, 1 1, 1 0, 0 0)), ' '((10 0, 10 1, 11 1, 11 0, 10 0)))', srid=invalid.poly.srid, - )) + ))) self.assertEqual(len(invalid.repaired), 2) @skipUnlessDBFeature('has_MakeValid_function') @@ -528,14 +537,14 @@ class GISFunctionsTests(FuncTestMixin, TestCase): def test_transform(self): # Pre-transformed points for Houston and Pueblo. ptown = fromstr('POINT(992363.390841912 481455.395105533)', srid=2774) - prec = 3 # Precision is low due to version variations in PROJ and GDAL. # Asserting the result of the transform operation with the values in # the pre-transformed points. h = City.objects.annotate(pt=functions.Transform('point', ptown.srid)).get(name='Pueblo') self.assertEqual(2774, h.pt.srid) - self.assertAlmostEqual(ptown.x, h.pt.x, prec) - self.assertAlmostEqual(ptown.y, h.pt.y, prec) + # Precision is low due to version variations in PROJ and GDAL. + self.assertLess(ptown.x - h.pt.x, 1) + self.assertLess(ptown.y - h.pt.y, 1) @skipUnlessDBFeature("has_Translate_function") def test_translate(self): @@ -569,11 +578,10 @@ class GISFunctionsTests(FuncTestMixin, TestCase): return for c in qs: self.assertTrue(c.mpoly.difference(geom).equals(c.difference)) - expected_intersection = ( - None if connection.features.empty_intersection_returns_none - else c.mpoly.intersection(geom) - ) - self.assertEqual(c.intersection, expected_intersection) + if connection.features.empty_intersection_returns_none: + self.assertIsNone(c.intersection) + else: + self.assertIs(c.intersection.empty, True) self.assertTrue(c.mpoly.sym_difference(geom).equals(c.sym_difference)) self.assertTrue(c.mpoly.union(geom).equals(c.union)) |