test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #25580 -- Allowed `None` to be set as SRID value.

This commit is contained in:
Sergey Fedoseev 2015-10-21 10:21:29 +05:00 committed by Claude Paroz
parent 48888a1a67
commit a272db7008
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/geos/geometry.py
View File

@ -366,7 +366,7 @@ class GEOSGeometry(GEOSBase, ListMixin):
def set_srid(self, srid): def set_srid(self, srid):
"Sets the SRID for the geometry." "Sets the SRID for the geometry."
capi.geos_set_srid(self.ptr, srid) capi.geos_set_srid(self.ptr, 0 if srid is None else srid)
srid = property(get_srid, set_srid) srid = property(get_srid, set_srid)
# #### Output Routines #### # #### Output Routines ####

4
tests/gis_tests/geos_tests/test_geos.py
View File

@ -650,6 +650,10 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
p3 = fromstr(p1.hex, srid=-1) # -1 is intended. p3 = fromstr(p1.hex, srid=-1) # -1 is intended.
self.assertEqual(-1, p3.srid) self.assertEqual(-1, p3.srid)
# Testing that geometry SRID could be set to its own value
pnt_wo_srid = Point(1, 1)
pnt_wo_srid.srid = pnt_wo_srid.srid
@skipUnless(HAS_GDAL, "GDAL is required.") @skipUnless(HAS_GDAL, "GDAL is required.")
def test_custom_srid(self): def test_custom_srid(self):
""" Test with a srid unknown from GDAL """ """ Test with a srid unknown from GDAL """