mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-22 17:16:24 +00:00
Code Issues 25 Releases Wiki Activity

Fixed #35883 -- Confirmed support for GDAL 3.9.

Browse Source 
Updated test for change to exportToXML() which now errors out on unsupported projection methods. See https://github.com/OSGeo/gdal/issues/9223.

Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>
This commit is contained in:
David Smith 2024-11-02 15:47:07 +00:00 committed by Sarah Boyce
parent f7601aed51
commit cd4497254e
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/gdal/libgdal.py
View File

@ -22,6 +22,7 @@ if lib_path:
elif os.name == "nt": elif os.name == "nt":
# Windows NT shared libraries # Windows NT shared libraries
lib_names = [ lib_names = [
"gdal309",
"gdal308", "gdal308",
"gdal307", "gdal307",
"gdal306", "gdal306",
@ -36,6 +37,7 @@ elif os.name == "posix":
lib_names = [ lib_names = [
"gdal", "gdal",
"GDAL", "GDAL",
"gdal3.9.0",
"gdal3.8.0", "gdal3.8.0",
"gdal3.7.0", "gdal3.7.0",
"gdal3.6.0", "gdal3.6.0",

9
docs/ref/contrib/gis/install/geolibs.txt
View File

@ -5,16 +5,16 @@ Installing Geospatial libraries
GeoDjango uses and/or provides interfaces for the following open source GeoDjango uses and/or provides interfaces for the following open source
geospatial libraries: geospatial libraries:
======================== ==================================== ================================ ====================================== ======================== ==================================== ================================ ===========================================
Program Description Required Supported Versions Program Description Required Supported Versions
======================== ==================================== ================================ ====================================== ======================== ==================================== ================================ ===========================================
:doc:`GEOS <../geos>` Geometry Engine Open Source Yes 3.12, 3.11, 3.10, 3.9, 3.8 :doc:`GEOS <../geos>` Geometry Engine Open Source Yes 3.12, 3.11, 3.10, 3.9, 3.8
`PROJ`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 9.x, 8.x, 7.x, 6.x `PROJ`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 9.x, 8.x, 7.x, 6.x
:doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes 3.8, 3.7, 3.6, 3.5, 3.4, 3.3, 3.2, 3.1 :doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes 3.9, 3.8, 3.7, 3.6, 3.5, 3.4, 3.3, 3.2, 3.1
:doc:`GeoIP <../geoip2>` IP-based geolocation library No 2 :doc:`GeoIP <../geoip2>` IP-based geolocation library No 2
`PostGIS`__ Spatial extensions for PostgreSQL Yes (PostgreSQL only) 3.4, 3.3, 3.2, 3.1 `PostGIS`__ Spatial extensions for PostgreSQL Yes (PostgreSQL only) 3.4, 3.3, 3.2, 3.1
`SpatiaLite`__ Spatial extensions for SQLite Yes (SQLite only) 5.1, 5.0, 4.3 `SpatiaLite`__ Spatial extensions for SQLite Yes (SQLite only) 5.1, 5.0, 4.3
======================== ==================================== ================================ ====================================== ======================== ==================================== ================================ ===========================================
Note that older or more recent versions of these libraries *may* also work Note that older or more recent versions of these libraries *may* also work
totally fine with GeoDjango. Your mileage may vary. totally fine with GeoDjango. Your mileage may vary.
@ -34,6 +34,7 @@ totally fine with GeoDjango. Your mileage may vary.
GDAL 3.6.0 2022-11-03 GDAL 3.6.0 2022-11-03
GDAL 3.7.0 2023-05-10 GDAL 3.7.0 2023-05-10
GDAL 3.8.0 2023-11-13 GDAL 3.8.0 2023-11-13
GDAL 3.9.0 2024-05-10
PostGIS 3.1.0 2020-12-18 PostGIS 3.1.0 2020-12-18
PostGIS 3.2.0 2021-12-18 PostGIS 3.2.0 2021-12-18
PostGIS 3.3.0 2022-08-27 PostGIS 3.3.0 2022-08-27

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

@ -1,4 +1,5 @@
from django.contrib.gis.gdal import ( from django.contrib.gis.gdal import (
GDAL_VERSION,
AxisOrder, AxisOrder,
CoordTransform, CoordTransform,
GDALException, GDALException,
@ -353,7 +354,8 @@ class SpatialRefTest(SimpleTestCase):
self.assertEqual(srs.name, "DHDN / Soldner 39 Langschoß") self.assertEqual(srs.name, "DHDN / Soldner 39 Langschoß")
self.assertEqual(srs.wkt, wkt) self.assertEqual(srs.wkt, wkt)
self.assertIn("Langschoß", srs.pretty_wkt) self.assertIn("Langschoß", srs.pretty_wkt)
self.assertIn("Langschoß", srs.xml) if GDAL_VERSION < (3, 9):
self.assertIn("Langschoß", srs.xml)
def test_axis_order(self): def test_axis_order(self):
wgs84_trad = SpatialReference(4326, axis_order=AxisOrder.TRADITIONAL) wgs84_trad = SpatialReference(4326, axis_order=AxisOrder.TRADITIONAL)