summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSergey Fedoseev <fedoseev.sergey@gmail.com>2016-06-10 11:50:07 +0500
committerTim Graham <timograham@gmail.com>2016-06-21 15:46:27 -0400
commit5ce660cd65a4ffcf74d94ba987fe03a16b7436a0 (patch)
tree5604cabb82104ac37dfec47da76cddb240156ef1 /docs
parent20d1cb33c2ec1242e16c49deb88e8c70517b2d1a (diff)
Fixed #25940 -- Added OGRGeometry.from_gml() and GEOSGeometry.from_gml().
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/gdal.txt6
-rw-r--r--docs/ref/contrib/gis/geos.txt6
-rw-r--r--docs/releases/1.11.txt3
3 files changed, 14 insertions, 1 deletions
diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt
index da81ce5e03..9bd2df8dad 100644
--- a/docs/ref/contrib/gis/gdal.txt
+++ b/docs/ref/contrib/gis/gdal.txt
@@ -448,6 +448,12 @@ coordinate transformation::
__ http://www.gdal.org/classOGRGeometry.html
+ .. classmethod:: from_gml(gml_string)
+
+ .. versionadded:: 1.11
+
+ Constructs an :class:`OGRGeometry` from the given GML string.
+
.. classmethod:: from_bbox(bbox)
Constructs a :class:`Polygon` from the given bounding-box (a 4-tuple).
diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt
index 811a9ba946..e6d609736e 100644
--- a/docs/ref/contrib/gis/geos.txt
+++ b/docs/ref/contrib/gis/geos.txt
@@ -198,6 +198,12 @@ WKB / EWKB ``buffer``
GeoJSON ``str`` or ``unicode``
======================= ======================
+.. classmethod:: GEOSGeometry.from_gml(gml_string)
+
+ .. versionadded:: 1.11
+
+ Constructs a :class:`GEOSGeometry` from the given GML string.
+
Properties
~~~~~~~~~~
diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index 9a1cc81d8d..001fb1ead1 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -74,7 +74,8 @@ Minor features
:mod:`django.contrib.gis`
~~~~~~~~~~~~~~~~~~~~~~~~~
-* ...
+* The new :meth:`.GEOSGeometry.from_gml` and :meth:`.OGRGeometry.from_gml`
+ methods allow creating geometries from GML.
:mod:`django.contrib.messages`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~