summaryrefslogtreecommitdiff
path: root/django/contrib/gis/forms/widgets.py
diff options
context:
space:
mode:
authorSergey Fedoseev <fedoseev.sergey@gmail.com>2017-03-30 18:38:26 +0500
committerTim Graham <timograham@gmail.com>2017-03-30 09:38:26 -0400
commit6ecccad711b52f9273b1acb07a57d3f806e93928 (patch)
tree30cb5636f781ef36d48a18cdd631c0a1c976b6c6 /django/contrib/gis/forms/widgets.py
parent068d75688f28f9a1530b771ae1d625f41e98cd82 (diff)
Fixed #25873 -- Made GEOSGeometry handle the srid parameter more predictably.
Diffstat (limited to 'django/contrib/gis/forms/widgets.py')
-rw-r--r--django/contrib/gis/forms/widgets.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/gis/forms/widgets.py b/django/contrib/gis/forms/widgets.py
index aba16f874a..53853b84f3 100644
--- a/django/contrib/gis/forms/widgets.py
+++ b/django/contrib/gis/forms/widgets.py
@@ -35,7 +35,7 @@ class BaseGeometryWidget(Widget):
def deserialize(self, value):
try:
- return GEOSGeometry(value, self.map_srid)
+ return GEOSGeometry(value)
except (GEOSException, ValueError) as err:
logger.error("Error creating geometry from value '%s' (%s)", value, err)
return None
@@ -48,7 +48,7 @@ class BaseGeometryWidget(Widget):
if value:
# Check that srid of value and map match
- if value.srid != self.map_srid:
+ if value.srid and value.srid != self.map_srid:
try:
ogr = value.ogr
ogr.transform(self.map_srid)