diff options
| author | Leo <86375512+select-case@users.noreply.github.com> | 2023-01-11 23:00:10 +0530 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-01-13 12:31:41 +0100 |
| commit | 5da5f3773ec281a027f99c9b56add47d076650b5 (patch) | |
| tree | 390c95297340c369be2d1dd264e7943e12ef3d6f /tests/gis_tests | |
| parent | c2118d72d61746f2462fca695dbf3adf44ebf8f7 (diff) | |
| download | django-5da5f3773ec281a027f99c9b56add47d076650b5.tar.gz | |
Fixed #34234 -- Dropped support for PROJ 4.
Diffstat (limited to 'tests/gis_tests')
| -rw-r--r-- | tests/gis_tests/gdal_tests/test_srs.py | 4 | ||||
| -rw-r--r-- | tests/gis_tests/geos_tests/test_geos.py | 4 | ||||
| -rw-r--r-- | tests/gis_tests/test_spatialrefsys.py | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/tests/gis_tests/gdal_tests/test_srs.py b/tests/gis_tests/gdal_tests/test_srs.py index 8a2973cf00..fd25dcbc34 100644 --- a/tests/gis_tests/gdal_tests/test_srs.py +++ b/tests/gis_tests/gdal_tests/test_srs.py @@ -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())) diff --git a/tests/gis_tests/geos_tests/test_geos.py b/tests/gis_tests/geos_tests/test_geos.py index f510b925ff..9b6068009d 100644 --- a/tests/gis_tests/geos_tests/test_geos.py +++ b/tests/gis_tests/geos_tests/test_geos.py @@ -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), ) diff --git a/tests/gis_tests/test_spatialrefsys.py b/tests/gis_tests/test_spatialrefsys.py index 7151e8d3d6..512fd217c3 100644 --- a/tests/gis_tests/test_spatialrefsys.py +++ b/tests/gis_tests/test_spatialrefsys.py @@ -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", |