mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #34234 -- Dropped support for PROJ 4.

Browse Source
This commit is contained in:
Leo
2023-01-11 23:00:10 +05:30
committed by Mariusz Felisiak
parent c2118d72d6
commit 5da5f3773e
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/gis_tests/gdal_tests/test_srs.py
View File

@@ -19,8 +19,6 @@ class TestSRS:
setattr(self, key, value)
WGS84_proj = "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs "
# Some Spatial Reference examples
srlist = (
TestSRS(
@@ -245,7 +243,7 @@ class SpatialRefTest(SimpleTestCase):
"+no_defs",
]
srs1 = SpatialReference(srlist[0].wkt)
srs2 = SpatialReference(WGS84_proj)
srs2 = SpatialReference("+proj=longlat +datum=WGS84 +no_defs")
self.assertTrue(all(part in proj_parts for part in srs1.proj.split()))
self.assertTrue(all(part in proj_parts for part in srs2.proj.split()))

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

@@ -892,8 +892,8 @@ class GEOSTest(SimpleTestCase, TestDataMixin):
# Test conversion from custom to a known srid
c2w = gdal.CoordTransform(
gdal.SpatialReference(
"+proj=mill +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 +R_A +ellps=WGS84 "
"+datum=WGS84 +units=m +no_defs"
"+proj=mill +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 +R_A +datum=WGS84 "
"+units=m +no_defs"
),
gdal.SpatialReference(4326),
)

4
tests/gis_tests/test_spatialrefsys.py
View File

@@ -11,10 +11,8 @@ test_srs = (
"auth_srid": 4326,
# Only the beginning, because there are differences depending on installed libs
"srtext": 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84"',
# +ellps=WGS84 has been removed in the 4326 proj string in proj-4.8
"proj_re": (
r"\+proj=longlat (\+ellps=WGS84 )?(\+datum=WGS84 |\+towgs84=0,0,0,0,0,0,0 )"
r"\+no_defs ?"
r"\+proj=longlat (\+datum=WGS84 |\+towgs84=0,0,0,0,0,0,0 )\+no_defs ?"
),
"spheroid": "WGS 84",
"name": "WGS 84",