p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplified Transform GIS function by setting output_field.

This commit is contained in:
Sergey Fedoseev 2016-12-08 20:48:26 +06:00 committed by Simon Charette
parent 413216fb9f
commit 82fd779af5
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/contrib/gis/db/models/functions.py
View File

@ -425,6 +425,8 @@ class Transform(GeoFunc):
expression, expression,
self._handle_param(srid, 'srid', six.integer_types), self._handle_param(srid, 'srid', six.integer_types),
] ]
if 'output_field' not in extra:
extra['output_field'] = GeometryField(srid=srid)
super(Transform, self).__init__(*expressions, **extra) super(Transform, self).__init__(*expressions, **extra)
@property @property
@ -432,13 +434,6 @@ class Transform(GeoFunc):
# Make srid the resulting srid of the transformation # Make srid the resulting srid of the transformation
return self.source_expressions[self.geom_param_pos + 1].value return self.source_expressions[self.geom_param_pos + 1].value
def convert_value(self, value, expression, connection, context):
value = super(Transform, self).convert_value(value, expression, connection, context)
if not connection.ops.postgis and not value.srid:
# Some backends do not set the srid on the returning geometry
value.srid = self.srid
return value
class Translate(Scale): class Translate(Scale):
def as_sqlite(self, compiler, connection): def as_sqlite(self, compiler, connection):