diff options
| author | Claude Paroz <claude@2xlibre.net> | 2013-07-06 17:25:46 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2013-07-06 17:25:46 +0200 |
| commit | c94093c5bae0f8d9c29a2eeda2de2ea85a0c3ca6 (patch) | |
| tree | 44dfc6823721c94f954caa4aa04bd54dc4e37e3e | |
| parent | de676f94b7de1db0c04d089d087e301701135449 (diff) | |
[gis] Dropped official support for GDAL < 1.6
| -rw-r--r-- | django/contrib/gis/gdal/geometries.py | 8 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/install/geolibs.txt | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/django/contrib/gis/gdal/geometries.py b/django/contrib/gis/gdal/geometries.py index 0d75620b4e..d75e8cd288 100644 --- a/django/contrib/gis/gdal/geometries.py +++ b/django/contrib/gis/gdal/geometries.py @@ -198,14 +198,6 @@ class OGRGeometry(GDALBase): def _get_coord_dim(self): "Returns the coordinate dimension of the Geometry." - if isinstance(self, GeometryCollection) and GDAL_VERSION < (1, 5, 2): - # On GDAL versions prior to 1.5.2, there exists a bug in which - # the coordinate dimension of geometry collections is always 2: - # http://trac.osgeo.org/gdal/ticket/2334 - # Here we workaround by returning the coordinate dimension of the - # first geometry in the collection instead. - if len(self): - return capi.get_coord_dim(capi.get_geom_ref(self.ptr, 0)) return capi.get_coord_dim(self.ptr) def _set_coord_dim(self, dim): diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index 4470c13f8d..508bf7809c 100644 --- a/docs/ref/contrib/gis/install/geolibs.txt +++ b/docs/ref/contrib/gis/install/geolibs.txt @@ -12,7 +12,7 @@ Program Description Required ======================== ==================================== ================================ ========================== :ref:`GEOS <ref-geos>` Geometry Engine Open Source Yes 3.3, 3.2, 3.1, 3.0 `PROJ.4`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 4.8, 4.7, 4.6, 4.5, 4.4 -:ref:`GDAL <ref-gdal>` Geospatial Data Abstraction Library No (but, required for SQLite) 1.9, 1.8, 1.7, 1.6, 1.5 +:ref:`GDAL <ref-gdal>` Geospatial Data Abstraction Library No (but, required for SQLite) 1.9, 1.8, 1.7, 1.6 :ref:`GeoIP <ref-geoip>` IP-based geolocation library No 1.4 `PostGIS`__ Spatial extensions for PostgreSQL Yes (PostgreSQL only) 2.0, 1.5, 1.4, 1.3 `SpatiaLite`__ Spatial extensions for SQLite Yes (SQLite only) 3.0, 2.4, 2.3 @@ -24,7 +24,6 @@ Program Description Required GEOS 3.1.0 2009-03-11 GEOS 3.2.0 2009-12-14 GEOS 3.3.0 2011-05-30 - GDAL 1.5.0 2007-12-20 GDAL 1.6.0 2008-12-04 GDAL 1.7.1 2010-02-08 GDAL 1.8.0 2011-01-13 |