Added more spatial predicates for prepared geometries

GEOS 3.3 added crosses, disjoint, overlaps, touches and within
predicates on prepared geometries.

2 files changed, 46 insertions, 2 deletions

diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt
index a1f92b31c7..769c2cdd32 100644
--- a/docs/ref/contrib/gis/geos.txt
+++ b/docs/ref/contrib/gis/geos.txt
@@ -527,8 +527,8 @@ a :class:`Polygon`).
 
 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
-for more information.
+covers, crosses, disjoint, overlaps, touches and within operations. Refer to
+the :ref:`prepared-geometries` documentation for more information.
 
 .. attribute:: GEOSGeometry.srs
 
@@ -746,8 +746,48 @@ For example::
 
   .. method:: covers(other)
 
+  .. method:: crosses(other)
+
+    .. versionadded:: 1.7
+
+    .. note::
+
+       GEOS 3.3 is *required* to use this predicate.
+
+  .. method:: disjoint(other)
+
+    .. versionadded:: 1.7
+
+    .. note::
+
+       GEOS 3.3 is *required* to use this predicate.
+
   .. method:: intersects(other)
 
+  .. method:: overlaps(other)
+
+    .. versionadded:: 1.7
+
+    .. note::
+
+       GEOS 3.3 is *required* to use this predicate.
+
+  .. method:: touches(other)
+
+    .. versionadded:: 1.7
+
+    .. note::
+
+       GEOS 3.3 is *required* to use this predicate.
+
+  .. method:: within(other)
+
+    .. versionadded:: 1.7
+
+    .. note::
+
+       GEOS 3.3 is *required* to use this predicate.
+
 Geometry Factories
 ==================
 
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 21449b4e7c..106de20ec1 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -211,6 +211,10 @@ Minor features
 * The default OpenLayers library version included in widgets has been updated
   from 2.11 to 2.13.
 
+* Prepared geometries now also support the ``crosses``, ``disjoint``,
+  ``overlaps``, ``touches`` and ``within`` predicates, if GEOS 3.3 or later is
+  installed.
+
 :mod:`django.contrib.messages`
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^