Commit 0514fbb2 authored by Claude Paroz's avatar Claude Paroz
Browse files

[1.6.x] Fixed #21003 -- Ensured geometry widget return value has SRID 

Thanks Mathieu Leplatre for the report and initial patch.
Backport of dd656073 from master.
parent bd0319a2

django/contrib/gis/forms/fields.py

+14 −11
Original line number Diff line number Diff line
@@ -47,10 +47,15 @@ class GeometryField(forms.Field): 
        """

        if value in self.empty_values:

            return None



        if not isinstance(value, GEOSGeometry):

            try:

            return GEOSGeometry(value)

                value = GEOSGeometry(value)

                if not value.srid:

                    value.srid = self.widget.map_srid

            except (GEOSException, ValueError, TypeError):

                raise forms.ValidationError(self.error_messages['invalid_geom'], code='invalid_geom')

        return value



    def clean(self, value):

        """
@@ -83,16 +88,14 @@ class GeometryField(forms.Field): 
    def _has_changed(self, initial, data):

        """ Compare geographic value of data with its initial value. """



        # Ensure we are dealing with a geographic object

        if isinstance(initial, six.string_types):

        try:

                initial = GEOSGeometry(initial)

            except (GEOSException, ValueError):

                initial = None

            data = self.to_python(data)

            initial = self.to_python(initial)

        except ValidationError:

            return True



        # Only do a geographic comparison if both values are available

        if initial and data:

            data = fromstr(data)

            data.transform(initial.srid)

            # If the initial value was not added by the browser, the geometry

            # provided may be slightly different, the first time it is saved.

django/contrib/gis/forms/widgets.py

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class BaseGeometryWidget(Widget): 


    def deserialize(self, value):

        try:

            return GEOSGeometry(value)

            return GEOSGeometry(value, self.map_srid)

        except (GEOSException, ValueError) as err:

            logger.error(

                "Error creating geometry from value '%s' (%s)" % (

django/contrib/gis/tests/test_geoforms.py

+5 −0
Original line number Diff line number Diff line
@@ -280,3 +280,8 @@ class CustomGeometryWidgetTest(SimpleTestCase): 
        # Force deserialize use due to a string value

        self.assertIn(escape(point.json), widget.render('p', point.json))

        self.assertEqual(widget.deserialize_called, 1)



        form = PointForm(data={'p': point.json})

        self.assertTrue(form.is_valid())

        # Ensure that resulting geometry has srid set

        self.assertEqual(form.cleaned_data['p'].srid, 4326)