summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2016-04-16 20:05:47 +0200
committerClaude Paroz <claude@2xlibre.net>2016-04-17 15:31:12 +0200
commit9686c888d6a0632e37b2fc70069128dc940c4b38 (patch)
tree0d2e340fba1fbf9756abf91993e483cc75fe3f4d /docs
parentd29d11b026e8acea4778dd596aaf82d55b11f44d (diff)
Fixed #25951 -- Trimmed default representation of GEOSGeometry
Thanks Sergey Fedoseev for the report.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/geoip2.txt2
-rw-r--r--docs/ref/contrib/gis/geos.txt10
-rw-r--r--docs/releases/1.10.txt26
3 files changed, 25 insertions, 13 deletions
diff --git a/docs/ref/contrib/gis/geoip2.txt b/docs/ref/contrib/gis/geoip2.txt
index cbcba9fac9..0f9a51f69a 100644
--- a/docs/ref/contrib/gis/geoip2.txt
+++ b/docs/ref/contrib/gis/geoip2.txt
@@ -47,7 +47,7 @@ Here is an example of its usage::
>>> g.lon_lat('uh.edu')
(-95.4342, 29.834)
>>> g.geos('24.124.1.80').wkt
- 'POINT (-97.0000000000000000 38.0000000000000000)'
+ 'POINT (-97 38)'
``GeoIP`` Settings
==================
diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt
index 5397fd7a52..11c1a8dcd3 100644
--- a/docs/ref/contrib/gis/geos.txt
+++ b/docs/ref/contrib/gis/geos.txt
@@ -69,11 +69,11 @@ All these constructors take the keyword argument ``srid``. For example::
>>> from django.contrib.gis.geos import GEOSGeometry, LineString, Point
>>> print(GEOSGeometry('POINT (0 0)', srid=4326))
- SRID=4326;POINT (0.0000000000000000 0.0000000000000000)
+ SRID=4326;POINT (0 0)
>>> print(LineString((0, 0), (1, 1), srid=4326))
- SRID=4326;LINESTRING (0.0000000000000000 0.0000000000000000, 1.0000000000000000 1.0000000000000000)
+ SRID=4326;LINESTRING (0 0, 1 1)
>>> print(Point(0, 0, srid=32140))
- SRID=32140;POINT (0.0000000000000000 0.0000000000000000)
+ SRID=32140;POINT (0 0)
Finally, there is the :func:`fromfile` factory method which returns a
:class:`GEOSGeometry` object from a file::
@@ -369,6 +369,10 @@ another object.
Returns the Well-Known Text of the geometry (an OGC standard).
+ .. versionchanged:: 1.10
+
+ Non-significant zeros are stripped from the output.
+
__ https://developers.google.com/kml/documentation/
Spatial Predicate Methods
diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index 37f7f65b80..aed1ab7c83 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -654,14 +654,29 @@ You can check if your database has any of the removed hashers like this::
# Unsalted MD5 passwords might not have an 'md5$$' prefix:
User.objects.filter(password__length=32)
+:mod:`django.contrib.gis`
+-------------------------
+
+* Support for SpatiaLite < 3.0 and GEOS < 3.3 is dropped.
+
+* The ``add_postgis_srs()`` backwards compatibility alias for
+ ``django.contrib.gis.utils.add_srs_entry()`` is removed.
+
+* On Oracle/GIS, the :class:`~django.contrib.gis.db.models.functions.Area`
+ aggregate function now returns a ``float`` instead of ``decimal.Decimal``.
+ (It's still wrapped in a measure of square meters.)
+
+* The default :class:`~django.contrib.gis.geos.GEOSGeometry` representation (WKT
+ output) is trimmed by default. That is, instead of
+ ``POINT (23.0000000000000000 5.5000000000000000)``, you'll get
+ ``POINT (23 5.5)``.
+
Miscellaneous
-------------
* The ``repr()`` of a ``QuerySet`` is wrapped in ``<QuerySet >`` to
disambiguate it from a plain list when debugging.
-* Support for SpatiaLite < 3.0 and GEOS < 3.3 is dropped.
-
* ``utils.version.get_version()`` returns :pep:`440` compliant release
candidate versions (e.g. '1.10rc1' instead of '1.10c1').
@@ -669,9 +684,6 @@ Miscellaneous
since pre-1.0. If you use it in your project, you can add it to your
project's settings. The default value was ``'/accounts/logout/'``.
-* The ``add_postgis_srs()`` backwards compatibility alias for
- ``django.contrib.gis.utils.add_srs_entry()`` is removed.
-
* Objects with a ``close()`` method such as files and generators passed to
:class:`~django.http.HttpResponse` are now closed immediately instead of when
the WSGI server calls ``close()`` on the response.
@@ -698,10 +710,6 @@ Miscellaneous
argument of the ``render_options()`` method is also removed, making
``selected_choices`` the first argument.
-* On Oracle/GIS, the :class:`~django.contrib.gis.db.models.functions.Area`
- aggregate function now returns a ``float`` instead of ``decimal.Decimal``.
- (It's still wrapped in a measure of square meters.)
-
* Tests that violate deferrable database constraints will now error when run on
a database that supports deferrable constraints.