summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt3
-rw-r--r--docs/ref/contrib/gis/geos.txt4
-rw-r--r--docs/releases/1.10.txt4
3 files changed, 11 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 2b21b98179..6a312dc925 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -121,6 +121,9 @@ details on these changes.
* The ``get_coords()`` and ``set_coords()`` methods of
``django.contrib.gis.geos.Point`` will be removed.
+* The ``cascaded_union`` property of ``django.contrib.gis.geos.MultiPolygon``
+ will be removed.
+
.. _deprecation-removed-in-1.10:
1.10
diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt
index abe22aad2f..8896ac0a30 100644
--- a/docs/ref/contrib/gis/geos.txt
+++ b/docs/ref/contrib/gis/geos.txt
@@ -746,6 +746,10 @@ Geometry Collections
.. attribute:: cascaded_union
+ .. deprecated:: 1.10
+
+ Use the :attr:`GEOSGeometry.unary_union` property instead.
+
Returns a :class:`Polygon` that is the union of all of the component
polygons in this collection. The algorithm employed is significantly
more efficient (faster) than trying to union the geometries together
diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index 1c8b0b072d..33039eb73f 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -361,6 +361,10 @@ This prevents confusion about an assignment resulting in an implicit save.
:class:`~django.contrib.gis.geos.Point` are deprecated in favor of the
``tuple`` property.
+* The ``cascaded_union`` property of
+ :class:`~django.contrib.gis.geos.MultiPolygon` is deprecated in favor of the
+ :attr:`~django.contrib.gis.geos.GEOSGeometry.unary_union` property.
+
Miscellaneous
~~~~~~~~~~~~~