test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed unneeded SpatiaLite workarounds in GIS tests.

This commit is contained in:
Sergey Fedoseev 2016-12-17 14:19:50 +05:00 committed by Tim Graham
parent 17a9e0cd07
commit af5983e4f5
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/gis_tests/geoapp/test_functions.py
View File

@ -177,8 +177,8 @@ class GISFunctionsTests(TestCase):
def test_difference(self): def test_difference(self):
geom = Point(5, 23, srid=4326) geom = Point(5, 23, srid=4326)
qs = Country.objects.annotate(diff=functions.Difference('mpoly', geom)) qs = Country.objects.annotate(diff=functions.Difference('mpoly', geom))
# SpatiaLite and Oracle do something screwy with the Texas geometry. # Oracle does something screwy with the Texas geometry.
if spatialite or oracle: if oracle:
qs = qs.exclude(name='Texas') qs = qs.exclude(name='Texas')
for c in qs: for c in qs:
@ -189,8 +189,8 @@ class GISFunctionsTests(TestCase):
"""Testing with mixed SRID (Country has default 4326).""" """Testing with mixed SRID (Country has default 4326)."""
geom = Point(556597.4, 2632018.6, srid=3857) # Spherical mercator geom = Point(556597.4, 2632018.6, srid=3857) # Spherical mercator
qs = Country.objects.annotate(difference=functions.Difference('mpoly', geom)) qs = Country.objects.annotate(difference=functions.Difference('mpoly', geom))
# SpatiaLite and Oracle do something screwy with the Texas geometry. # Oracle does something screwy with the Texas geometry.
if spatialite or oracle: if oracle:
qs = qs.exclude(name='Texas') qs = qs.exclude(name='Texas')
for c in qs: for c in qs:
self.assertTrue(c.mpoly.difference(geom).equals(c.difference)) self.assertTrue(c.mpoly.difference(geom).equals(c.difference))
@ -468,15 +468,9 @@ class GISFunctionsTests(TestCase):
difference=functions.Difference('mpoly', geom), difference=functions.Difference('mpoly', geom),
sym_difference=functions.SymDifference('mpoly', geom), sym_difference=functions.SymDifference('mpoly', geom),
union=functions.Union('mpoly', geom), union=functions.Union('mpoly', geom),
intersection=functions.Intersection('mpoly', geom),
) )
# For some reason SpatiaLite does something screwy with the Texas geometry here.
# Also, it doesn't like the null intersection.
if spatialite:
qs = qs.exclude(name='Texas')
else:
qs = qs.annotate(intersection=functions.Intersection('mpoly', geom))
if oracle: if oracle:
# Should be able to execute the queries; however, they won't be the same # Should be able to execute the queries; however, they won't be the same
# as GEOS (because Oracle doesn't use GEOS internally like PostGIS or # as GEOS (because Oracle doesn't use GEOS internally like PostGIS or