summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-12-24 15:57:13 +0100
committerClaude Paroz <claude@2xlibre.net>2013-12-24 15:57:13 +0100
commitd17404aa90cf0a439828e7f14105f3f522ab3bcc (patch)
tree730107165c5a61aca0fa1e15db95da28ce3e657e /docs
parent542198c1d059b3ecf64477c1c10c0518d229345b (diff)
Dropped support for GEOS < 3.1
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/geos.txt20
-rw-r--r--docs/ref/contrib/gis/install/geolibs.txt3
-rw-r--r--docs/ref/contrib/gis/model-api.txt3
-rw-r--r--docs/releases/1.7.txt2
4 files changed, 4 insertions, 24 deletions
diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt
index d557af96a3..a1f92b31c7 100644
--- a/docs/ref/contrib/gis/geos.txt
+++ b/docs/ref/contrib/gis/geos.txt
@@ -282,10 +282,6 @@ Returns the EWKB of this Geometry in hexadecimal form. This is an
extension of the WKB specification that includes the SRID value
that are a part of this geometry.
-.. note::
-
- GEOS 3.1 is *required* if you want valid 3D HEXEWKB.
-
.. attribute:: GEOSGeometry.json
Returns the GeoJSON representation of the geometry.
@@ -329,10 +325,6 @@ Return the EWKB representation of this Geometry as a Python buffer.
This is an extension of the WKB specification that includes any SRID
value that are a part of this geometry.
-.. note::
-
- GEOS 3.1 is *required* if you want valid 3D EWKB.
-
.. attribute:: GEOSGeometry.wkt
Returns the Well-Known Text of the geometry (an OGC standard).
@@ -533,10 +525,6 @@ a :class:`Polygon`).
.. attribute:: GEOSGeometry.prepared
-.. note::
-
- Support for prepared geometries requires GEOS 3.1.
-
Returns a GEOS ``PreparedGeometry`` for the contents of this geometry.
``PreparedGeometry`` objects are optimized for the contains, intersects,
and covers operations. Refer to the :ref:`prepared-geometries` documentation
@@ -710,10 +698,6 @@ Geometry Collections
more efficient (faster) than trying to union the geometries together
individually. [#fncascadedunion]_
- .. note::
-
- GEOS 3.1 is *required* to peform cascaded unions.
-
``GeometryCollection``
----------------------
@@ -740,10 +724,6 @@ geometry can be orders of magnitude faster -- the more complex the geometry
that is prepared, the larger the speedup in the operation. For more information,
please consult the `GEOS wiki page on prepared geometries <http://trac.osgeo.org/geos/wiki/PreparedGeometry>`_.
-.. note::
-
- GEOS 3.1 is *required* in order to use prepared geometries.
-
For example::
>>> from django.contrib.gis.geos import Point, Polygon
diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt
index 508bf7809c..a529a497d2 100644
--- a/docs/ref/contrib/gis/install/geolibs.txt
+++ b/docs/ref/contrib/gis/install/geolibs.txt
@@ -10,7 +10,7 @@ geospatial libraries:
======================== ==================================== ================================ ==========================
Program Description Required Supported Versions
======================== ==================================== ================================ ==========================
-:ref:`GEOS <ref-geos>` Geometry Engine Open Source Yes 3.3, 3.2, 3.1, 3.0
+:ref:`GEOS <ref-geos>` Geometry Engine Open Source Yes 3.3, 3.2, 3.1
`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
:ref:`GeoIP <ref-geoip>` IP-based geolocation library No 1.4
@@ -20,7 +20,6 @@ Program Description Required
..
Libs release dates:
- GEOS 3.0.0 2008-08-14
GEOS 3.1.0 2009-03-11
GEOS 3.2.0 2009-12-14
GEOS 3.3.0 2011-05-30
diff --git a/docs/ref/contrib/gis/model-api.txt b/docs/ref/contrib/gis/model-api.txt
index 81b619e338..10cc2957d8 100644
--- a/docs/ref/contrib/gis/model-api.txt
+++ b/docs/ref/contrib/gis/model-api.txt
@@ -172,8 +172,7 @@ three-dimensonal support.
.. note::
- At this time 3D support requires that GEOS 3.1 be installed, and is
- limited only to the PostGIS spatial backend.
+ At this time 3D support is limited to the PostGIS spatial backend.
``geography``
-------------
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 3a1568fe45..21449b4e7c 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -722,6 +722,8 @@ Miscellaneous
``select_related('foo').select_related('bar')``. Previously the latter would
have been equivalent to ``select_related('bar')``.
+* GeoDjango dropped support for GEOS < 3.1.
+
Features deprecated in 1.7
==========================