Commit 85e13681 authored by Justin Bronn's avatar Justin Bronn
Browse files

Fixed #11785 -- Clarified error message when the layer geometry type doesn't... 

Fixed #11785 -- Clarified error message when the layer geometry type doesn't match the model field.  Thanks, esizikov for bug report and initial patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@12880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 87302ac0

django/contrib/gis/utils/layermapping.py

+2 −1
Original line number Diff line number Diff line
@@ -205,7 +205,8 @@ class LayerMapping(object): 
                # Making sure that the OGR Layer's Geometry is compatible.

                ltype = self.layer.geom_type

                if not (ltype.name.startswith(gtype.name) or self.make_multi(ltype, model_field)):

                    raise LayerMapError('Invalid mapping geometry; model has %s%s, layer is %s.' %

                    raise LayerMapError('Invalid mapping geometry; model has %s%s, '

                                        'layer geometry type is %s.' %

                                        (fld_name, (coord_dim == 3 and '(dim=3)') or '', ltype))



                # Setting the `geom_field` attribute w/the name of the model field