Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Fixed #15378 -- Now properly handle OGR layers that have feat…

…ures with invalid geometries. Thanks, kunitoki for bug report and initial patch.

Backport of r15813 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit ddb1cee0e5a0fcb0c87ff39e6becd46ba981a29b 1 parent e8dcaa4
@jbronn jbronn authored
View
3  django/contrib/gis/tests/layermap/models.py
@@ -43,6 +43,9 @@ class ICity1(CityBase):
class ICity2(ICity1):
dt_time = models.DateTimeField(auto_now=True)
+class Invalid(models.Model):
+ point = models.PointField()
+
# Mapping dictionaries for the models above.
co_mapping = {'name' : 'Name',
'state' : {'name' : 'State'}, # ForeignKey's use another mapping dictionary for the _related_ Model (State in this case).
View
14 django/contrib/gis/tests/layermap/tests.py
@@ -4,16 +4,19 @@
from django.utils.copycompat import copy
-from django.contrib.gis.gdal import DataSource
+from django.contrib.gis.gdal import DataSource, OGRException
from django.contrib.gis.tests.utils import mysql
from django.contrib.gis.utils.layermapping import LayerMapping, LayerMapError, InvalidDecimal, MissingForeignKey
-from models import City, County, CountyFeat, Interstate, ICity1, ICity2, State, city_mapping, co_mapping, cofeat_mapping, inter_mapping
+from models import \
+ City, County, CountyFeat, Interstate, ICity1, ICity2, Invalid, State, \
+ city_mapping, co_mapping, cofeat_mapping, inter_mapping
shp_path = os.path.realpath(os.path.join(os.path.dirname(__file__), os.pardir, 'data'))
city_shp = os.path.join(shp_path, 'cities', 'cities.shp')
co_shp = os.path.join(shp_path, 'counties', 'counties.shp')
inter_shp = os.path.join(shp_path, 'interstates', 'interstates.shp')
+invalid_shp = os.path.join(shp_path, 'invalid', 'emptypoints.shp')
# Dictionaries to hold what's expected in the county shapefile.
NAMES = ['Bexar', 'Galveston', 'Harris', 'Honolulu', 'Pueblo']
@@ -266,3 +269,10 @@ def test06_model_inheritance(self):
self.assertEqual(6, ICity1.objects.count())
self.assertEqual(3, ICity2.objects.count())
+ def test07_invalid_layer(self):
+ "Tests LayerMapping on invalid geometries. See #15378."
+ invalid_mapping = {'point': 'POINT'}
+ lm = LayerMapping(Invalid, invalid_shp, invalid_mapping,
+ source_srs=4326)
+ lm.save(silent=True)
+
View
5 django/contrib/gis/utils/layermapping.py
@@ -292,7 +292,10 @@ def feature_kwargs(self, feat):
if isinstance(model_field, GeometryField):
# Verify OGR geometry.
- val = self.verify_geom(feat.geom, model_field)
+ try:
+ val = self.verify_geom(feat.geom, model_field)
+ except OGRException:
+ raise LayerMapError('Could not retrieve geometry from feature.')
elif isinstance(model_field, models.base.ModelBase):
# The related _model_, not a field was passed in -- indicating
# another mapping for the related Model.
Please sign in to comment.
Something went wrong with that request. Please try again.