innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #25673 -- Made `GeometryField.from_db_value` set SRID

This commit is contained in:
Sergey Fedoseev 2015-11-04 11:30:05 +05:00 committed by Claude Paroz
parent f98126a05a
commit 5f7035cec7
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/gis/db/models/fields.py
View File

@ -257,8 +257,12 @@ class GeometryField(GeoSelectFormatMixin, BaseSpatialField):
return geom return geom
def from_db_value(self, value, expression, connection, context): def from_db_value(self, value, expression, connection, context):
if value and not isinstance(value, Geometry): if value:
if not isinstance(value, Geometry):
value = Geometry(value) value = Geometry(value)
srid = value.srid
if not srid and self.srid != -1:
value.srid = self.srid
return value return value
def get_srid(self, geom): def get_srid(self, geom):

4
tests/gis_tests/geoapp/tests.py
View File

@ -893,3 +893,7 @@ class GeoQuerySetTest(TestCase):
def test_non_concrete_field(self): def test_non_concrete_field(self):
NonConcreteModel.objects.create(point=Point(0, 0), name='name') NonConcreteModel.objects.create(point=Point(0, 0), name='name')
list(NonConcreteModel.objects.all()) list(NonConcreteModel.objects.all())
def test_values_srid(self):
for c, v in zip(City.objects.all(), City.objects.values()):
self.assertEqual(c.point.srid, v['point'].srid)