summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSergey Fedoseev <fedoseev.sergey@gmail.com>2015-11-01 01:28:46 +0500
committerClaude Paroz <claude@2xlibre.net>2015-11-01 20:41:52 +0100
commitb78226cd3d2dd578ac57341e0c55754b31ab66ba (patch)
tree996a728964a11a6c981ce765f989b5dc6da1571b /docs
parent06627ef2caa6854540b50b6f6309c7d12ccfb56a (diff)
Fixed #25655 -- Dropped support for GEOS < 3.3
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/geos.txt25
-rw-r--r--docs/ref/contrib/gis/install/geolibs.txt3
-rw-r--r--docs/releases/1.10.txt2
3 files changed, 2 insertions, 28 deletions
diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt
index 776e70c5a3..f1a45acd24 100644
--- a/docs/ref/contrib/gis/geos.txt
+++ b/docs/ref/contrib/gis/geos.txt
@@ -160,11 +160,6 @@ WKB / EWKB ``buffer``
GeoJSON ``str`` or ``unicode``
============= ======================
-.. note::
-
- The new 3D/4D WKT notation with an intermediary Z or M (like
- ``POINT Z (3, 4, 5)``) is only supported with GEOS 3.3.0 or later.
-
Properties
~~~~~~~~~~
@@ -748,36 +743,16 @@ For example::
.. method:: crosses(other)
- .. note::
-
- GEOS 3.3 is *required* to use this predicate.
-
.. method:: disjoint(other)
- .. note::
-
- GEOS 3.3 is *required* to use this predicate.
-
.. method:: intersects(other)
.. method:: overlaps(other)
- .. note::
-
- GEOS 3.3 is *required* to use this predicate.
-
.. method:: touches(other)
- .. note::
-
- GEOS 3.3 is *required* to use this predicate.
-
.. method:: within(other)
- .. note::
-
- GEOS 3.3 is *required* to use this predicate.
-
Geometry Factories
==================
diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt
index 8a466bb507..40cb118d03 100644
--- a/docs/ref/contrib/gis/install/geolibs.txt
+++ b/docs/ref/contrib/gis/install/geolibs.txt
@@ -8,7 +8,7 @@ geospatial libraries:
======================== ==================================== ================================ ============================
Program Description Required Supported Versions
======================== ==================================== ================================ ============================
-:doc:`GEOS <../geos>` Geometry Engine Open Source Yes 3.4, 3.3, 3.2
+:doc:`GEOS <../geos>` Geometry Engine Open Source Yes 3.4, 3.3
`PROJ.4`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 4.9, 4.8, 4.7, 4.6, 4.5, 4.4
:doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes (SQLite only) 2.0, 1.11, 1.10, 1.9, 1.8, 1.7
:doc:`GeoIP <../geoip>` IP-based geolocation library No 1.4
@@ -21,7 +21,6 @@ totally fine with GeoDjango. Your mileage may vary.
..
Libs release dates:
- GEOS 3.2.0 2009-12-14
GEOS 3.3.0 2011-05-30
GEOS 3.4.0 2013-08-11
GDAL 1.7.1 2010-02-08
diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index 29edcf8c10..8846dce242 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -299,7 +299,7 @@ Miscellaneous
:mod:`django.contrib.gis`
~~~~~~~~~~~~~~~~~~~~~~~~~
-* Support for SpatiaLite < 3.0 is dropped.
+* Support for SpatiaLite < 3.0 and GEOS < 3.3 is dropped.
.. _deprecated-features-1.10: