p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #25659 -- Added missing docs for Difference/Intersection/SymDifference functions. 

Complements 7127eb287f.
This commit is contained in:
Sergey Fedoseev 2015-12-03 10:42:22 +05:00 committed by Tim Graham
parent 83a710b8d3
commit 395af23ac1
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/ref/contrib/gis/functions.txt
View File

@ -186,12 +186,16 @@ Difference
.. class:: Difference(expr1, expr2, **extra) .. class:: Difference(expr1, expr2, **extra)
*Availability*: PostGIS, Oracle, SpatiaLite *Availability*: MySQL (≥ 5.6.1), PostGIS, Oracle, SpatiaLite
Accepts two geographic fields or expressions and returns the geometric Accepts two geographic fields or expressions and returns the geometric
difference, that is the part of geometry A that does not intersect with difference, that is the part of geometry A that does not intersect with
geometry B. geometry B.
.. versionchanged:: 1.10
MySQL support was added.
Distance Distance
-------- --------
@ -274,11 +278,15 @@ Intersection
.. class:: Intersection(expr1, expr2, **extra) .. class:: Intersection(expr1, expr2, **extra)
*Availability*: PostGIS, Oracle, SpatiaLite *Availability*: MySQL (≥ 5.6.1), PostGIS, Oracle, SpatiaLite
Accepts two geographic fields or expressions and returns the geometric Accepts two geographic fields or expressions and returns the geometric
intersection between them. intersection between them.
.. versionchanged:: 1.10
MySQL support was added.
Length Length
------ ------
@ -395,12 +403,16 @@ SymDifference
.. class:: SymDifference(expr1, expr2, **extra) .. class:: SymDifference(expr1, expr2, **extra)
*Availability*: PostGIS, Oracle, SpatiaLite *Availability*: MySQL (≥ 5.6.1), PostGIS, Oracle, SpatiaLite
Accepts two geographic fields or expressions and returns the geometric Accepts two geographic fields or expressions and returns the geometric
symmetric difference (union without the intersection) between the given symmetric difference (union without the intersection) between the given
parameters. parameters.
.. versionchanged:: 1.10
MySQL support was added.
Transform Transform
--------- ---------

6
docs/releases/1.10.txt
View File

@ -82,6 +82,12 @@ Minor features
* Added support for the :class:`~django.contrib.gis.db.models.MakeLine` * Added support for the :class:`~django.contrib.gis.db.models.MakeLine`
aggregate on SpatiaLite. aggregate on SpatiaLite.
* Added support for the
:class:`~django.contrib.gis.db.models.functions.Difference`,
:class:`~django.contrib.gis.db.models.functions.Intersection`, and
:class:`~django.contrib.gis.db.models.functions.SymDifference`
functions on MySQL.
:mod:`django.contrib.messages` :mod:`django.contrib.messages`
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^