summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSergey Fedoseev <fedoseev.sergey@gmail.com>2015-11-09 22:36:12 +0500
committerTim Graham <timograham@gmail.com>2015-11-18 19:17:16 -0500
commit034dfbfc057b6090f9f2589731b8f58a70e4f885 (patch)
tree6d3d8a6437992f29ff17e2628ce667fe2c5924de /docs
parent1e35dd1a053b620f065101c02069c8e142ebf8ec (diff)
Fixed #25654 -- Added the GEOSGeometry.unary_union property.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/geos.txt15
-rw-r--r--docs/releases/1.10.txt4
-rw-r--r--docs/spelling_wordlist3
3 files changed, 22 insertions, 0 deletions
diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt
index 7415acea97..fffaf61fe7 100644
--- a/docs/ref/contrib/gis/geos.txt
+++ b/docs/ref/contrib/gis/geos.txt
@@ -497,6 +497,21 @@ geometry is a point.
Computes and returns a :class:`Point` guaranteed to be on the interior
of this geometry.
+.. attribute:: GEOSGeometry.unary_union
+
+.. versionadded:: 1.10
+
+Computes the union of all the elements of this geometry.
+
+The result obeys the following contract:
+
+* Unioning a set of :class:`LineString`\s has the effect of fully noding and
+ dissolving the linework.
+
+* Unioning a set of :class:`Polygon`\s will always return a :class:`Polygon` or
+ :class:`MultiPolygon` geometry (unlike :meth:`GEOSGeometry.union`, which may
+ return geometries of lower dimension if a topology collapse occurs).
+
Other Properties & Methods
~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index d16075f00f..bcda61f09c 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -64,6 +64,10 @@ Minor features
* :ref:`Distance lookups <distance-lookups>` now accept expressions as the
distance value parameter.
+* The new :attr:`GEOSGeometry.unary_union
+ <django.contrib.gis.geos.GEOSGeometry.unary_union>` property computes the
+ union of all the elements of this geometry.
+
:mod:`django.contrib.messages`
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index ba7c5650b3..a75430e871 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -421,6 +421,7 @@ linebreaks
linebreaksbr
linenumbers
linestring
+linework
Livni
ljust
loaddata
@@ -520,6 +521,7 @@ nestable
neuroscientist
newforms
nginx
+noding
nonspatial
nullable
OAuth
@@ -877,6 +879,7 @@ unicode
uninstall
uninstalling
uninstalls
+unioning
uniterated
unittest
unittests