summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2016-01-26 11:06:29 +0100
committerClaude Paroz <claude@2xlibre.net>2016-01-28 08:50:38 +0100
commit54236a2c1cda4666c164c7edbfb4396e2b01604a (patch)
tree99a84fac00be26508225fb60498e5057ce02a3ed /django
parent31817dd2eb69db54eb559716aae42fe55ada5fea (diff)
Fixed #26138 -- Ensured geometry_field's geometry is always serialized
Thanks Bernd Schlapsi for the report.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/gis/serializers/geojson.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/django/contrib/gis/serializers/geojson.py b/django/contrib/gis/serializers/geojson.py
index f26147a59a..b26ec2e809 100644
--- a/django/contrib/gis/serializers/geojson.py
+++ b/django/contrib/gis/serializers/geojson.py
@@ -18,6 +18,9 @@ class Serializer(JSONSerializer):
super(Serializer, self)._init_options()
self.geometry_field = self.json_kwargs.pop('geometry_field', None)
self.srid = self.json_kwargs.pop('srid', 4326)
+ if (self.selected_fields is not None and self.geometry_field is not None
+ and self.geometry_field not in self.selected_fields):
+ self.selected_fields = list(self.selected_fields) + [self.geometry_field]
def start_serialization(self):
self._init_options()