diff options
| author | Claude Paroz <claude@2xlibre.net> | 2016-01-26 11:06:29 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2016-01-28 08:52:28 +0100 |
| commit | ca6ab72bb76fefac0188b95e60320466cc8d7610 (patch) | |
| tree | 8dba548c7533c5c960fb3370cc25ace315fde179 /django | |
| parent | e47f0c12471b6688b2ace9a0732bf79125ee9086 (diff) | |
[1.9.x] Fixed #26138 -- Ensured geometry_field's geometry is always serialized
Thanks Bernd Schlapsi for the report.
Backport of 54236a2c1c from master.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/gis/serializers/geojson.py | 3 |
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() |