mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Added SpatialFeatures.empty_intersection_returns_none.

Browse Source
This commit is contained in:
Tim Graham
2020-11-11 22:23:22 -05:00
committed by Mariusz Felisiak
parent 4c62cdaa10
commit 9f91122ed8
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ from django.db import NotSupportedError, connection
from django.db.models import IntegerField, Sum, Value
from django.test import TestCase, skipUnlessDBFeature
from ..utils import FuncTestMixin, mariadb, mysql, oracle, postgis, spatialite
from ..utils import FuncTestMixin, mariadb, mysql, oracle, postgis
from .models import City, Country, CountryWebMercator, State, Track
@@ -295,11 +295,10 @@ class GISFunctionsTests(FuncTestMixin, TestCase):
geom = Point(5, 23, srid=4326)
qs = Country.objects.annotate(inter=functions.Intersection('mpoly', geom))
for c in qs:
if spatialite or (mysql and not connection.features.supports_empty_geometry_collection) or oracle:
# When the intersection is empty, some databases return None.
expected = None
else:
expected = c.mpoly.intersection(geom)
expected = (
None if connection.features.empty_intersection_returns_none
else c.mpoly.intersection(geom)
)
self.assertEqual(c.inter, expected)
@skipUnlessDBFeature("has_IsValid_function")
@@ -570,8 +569,11 @@ class GISFunctionsTests(FuncTestMixin, TestCase):
return
for c in qs:
self.assertTrue(c.mpoly.difference(geom).equals(c.difference))
if not (spatialite or mysql):
self.assertEqual(c.mpoly.intersection(geom), c.intersection)
expected_intersection = (
None if connection.features.empty_intersection_returns_none
else c.mpoly.intersection(geom)
)
self.assertEqual(c.intersection, expected_intersection)
self.assertTrue(c.mpoly.sym_difference(geom).equals(c.sym_difference))
self.assertTrue(c.mpoly.union(geom).equals(c.union))