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

Fixed #29978 -- Catched GDALException in GeometryField.to_python

This commit is contained in:
Claude Paroz 2018-11-22 11:21:58 +01:00
parent 31408446b3
commit d7e18a509e
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/gis/forms/fields.py
View File

@ -1,4 +1,5 @@
from django import forms from django import forms
from django.contrib.gis.gdal import GDALException
from django.contrib.gis.geos import GEOSException, GEOSGeometry from django.contrib.gis.geos import GEOSException, GEOSGeometry
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
@ -36,7 +37,10 @@ class GeometryField(forms.Field):
if not isinstance(value, GEOSGeometry): if not isinstance(value, GEOSGeometry):
if hasattr(self.widget, 'deserialize'): if hasattr(self.widget, 'deserialize'):
value = self.widget.deserialize(value) try:
value = self.widget.deserialize(value)
except GDALException:
value = None
else: else:
try: try:
value = GEOSGeometry(value) value = GEOSGeometry(value)

28
tests/gis_tests/test_geoforms.py
View File

@ -69,19 +69,31 @@ class GeometryFieldTest(SimpleTestCase):
def test_to_python(self): def test_to_python(self):
""" """
Testing to_python returns a correct GEOSGeometry object or to_python() either returns a correct GEOSGeometry object or
a ValidationError a ValidationError.
""" """
good_inputs = [
'POINT(5 23)',
'MULTIPOLYGON(((0 0, 0 1, 1 1, 1 0, 0 0)))',
'LINESTRING(0 0, 1 1)',
]
bad_inputs = [
'POINT(5)',
'MULTI POLYGON(((0 0, 0 1, 1 1, 1 0, 0 0)))',
'BLAH(0 0, 1 1)',
'{"type": "FeatureCollection", "features": ['
'{"geometry": {"type": "Point", "coordinates": [508375, 148905]}, "type": "Feature"}]}',
]
fld = forms.GeometryField() fld = forms.GeometryField()
# to_python returns the same GEOSGeometry for a WKT # to_python returns the same GEOSGeometry for a WKT
for wkt in ('POINT(5 23)', 'MULTIPOLYGON(((0 0, 0 1, 1 1, 1 0, 0 0)))', 'LINESTRING(0 0, 1 1)'): for geo_input in good_inputs:
with self.subTest(wkt=wkt): with self.subTest(geo_input=geo_input):
self.assertEqual(GEOSGeometry(wkt, srid=fld.widget.map_srid), fld.to_python(wkt)) self.assertEqual(GEOSGeometry(geo_input, srid=fld.widget.map_srid), fld.to_python(geo_input))
# but raises a ValidationError for any other string # but raises a ValidationError for any other string
for wkt in ('POINT(5)', 'MULTI POLYGON(((0 0, 0 1, 1 1, 1 0, 0 0)))', 'BLAH(0 0, 1 1)'): for geo_input in bad_inputs:
with self.subTest(wkt=wkt): with self.subTest(geo_input=geo_input):
with self.assertRaises(forms.ValidationError): with self.assertRaises(forms.ValidationError):
fld.to_python(wkt) fld.to_python(geo_input)
def test_to_python_different_map_srid(self): def test_to_python_different_map_srid(self):
f = forms.GeometryField(widget=OpenLayersWidget) f = forms.GeometryField(widget=OpenLayersWidget)