From 2a2ed0e70a93bfd1a3d41af40870fe963dc2687d Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Tue, 6 Feb 2018 11:51:41 +0100 Subject: Fixed #29116 -- Fixed OpenLayersWidget deserialization ignoring the widget map's SRID. Regression in 6ecccad711b52f9273b1acb07a57d3f806e93928. --- django/contrib/gis/forms/widgets.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'django/contrib/gis/forms/widgets.py') diff --git a/django/contrib/gis/forms/widgets.py b/django/contrib/gis/forms/widgets.py index 0ffe2ced77..cd9bff9f68 100644 --- a/django/contrib/gis/forms/widgets.py +++ b/django/contrib/gis/forms/widgets.py @@ -2,6 +2,7 @@ import logging from django.conf import settings from django.contrib.gis import gdal +from django.contrib.gis.geometry import json_regex from django.contrib.gis.geos import GEOSException, GEOSGeometry from django.forms.widgets import Widget from django.utils import translation @@ -36,7 +37,7 @@ class BaseGeometryWidget(Widget): def deserialize(self, value): try: return GEOSGeometry(value) - except (GEOSException, ValueError) as err: + except (GEOSException, ValueError, TypeError) as err: logger.error("Error creating geometry from value '%s' (%s)", value, err) return None @@ -91,6 +92,13 @@ class OpenLayersWidget(BaseGeometryWidget): def serialize(self, value): return value.json if value else '' + def deserialize(self, value): + geom = super().deserialize(value) + # GeoJSON assumes WGS84 (4326). Use the map's SRID instead. + if geom and json_regex.match(value) and self.map_srid != 4326: + geom.srid = self.map_srid + return geom + class OSMWidget(OpenLayersWidget): """ -- cgit v1.3