diff options
| author | Tim Graham <timograham@gmail.com> | 2015-09-02 19:55:55 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-09-23 19:31:10 -0400 |
| commit | 5d383549eee498e4903fe290613d726a68615aca (patch) | |
| tree | 593b9b4d1d5145af9ef6e47f7c4f73a0f391e2ab /docs | |
| parent | b6ea1961eb6816dee4370fb0ebd49dba29478db1 (diff) | |
Refs #24152 -- Removed deprecated GeoQuerySet aggregate methods.
Per deprecation timeline.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/contrib/gis/geoquerysets.txt | 66 | ||||
| -rw-r--r-- | docs/releases/1.2.txt | 3 |
2 files changed, 1 insertions, 68 deletions
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt index d4b83e86c8..9a42bd7a15 100644 --- a/docs/ref/contrib/gis/geoquerysets.txt +++ b/docs/ref/contrib/gis/geoquerysets.txt @@ -1216,72 +1216,6 @@ Returns the number of points in the first linestring in the geometry field in a ``num_points`` attribute on each element of the ``GeoQuerySet``; otherwise sets with ``None``. -Spatial Aggregates -================== - -Aggregate Methods ------------------ - -.. deprecated:: 1.8 - - Aggregate methods are now deprecated. Prefer using their function-based - equivalents. - -``collect`` -~~~~~~~~~~~ - -.. method:: GeoQuerySet.collect(**kwargs) - -.. deprecated:: 1.8 - - Use the :class:`Collect` aggregate instead. - -Shortcut for ``aggregate(Collect(<field>))``. - -``extent`` -~~~~~~~~~~ - -.. method:: GeoQuerySet.extent(**kwargs) - -.. deprecated:: 1.8 - - Use the :class:`Extent` aggregate instead. - -Shortcut for ``aggregate(Extent(<field>))``. - -``extent3d`` -~~~~~~~~~~~~ - -.. method:: GeoQuerySet.extent3d(**kwargs) - -.. deprecated:: 1.8 - - Use the :class:`Extent` aggregate instead. - -Shortcut for ``aggregate(Extent3D(<field>))``. - -``make_line`` -~~~~~~~~~~~~~ - -.. method:: GeoQuerySet.make_line(**kwargs) - -.. deprecated:: 1.8 - - Use the :class:`MakeLine` aggregate instead. - -Shortcut for ``aggregate(MakeLine(<field>))``. - -``unionagg`` -~~~~~~~~~~~~ - -.. method:: GeoQuerySet.unionagg(**kwargs) - -.. deprecated:: 1.8 - - Use the :class:`Union` aggregate instead. - -Shortcut for ``aggregate(Union(<field>))``. - Aggregate Functions ------------------- diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt index 368c436b39..1e36d4888b 100644 --- a/docs/releases/1.2.txt +++ b/docs/releases/1.2.txt @@ -358,8 +358,7 @@ Support for 3D geometry fields was added, and may be enabled by setting the :attr:`~django.contrib.gis.db.models.GeometryField.dim` keyword to 3 in your :class:`~django.contrib.gis.db.models.GeometryField`. The :class:`~django.contrib.gis.db.models.Extent3D` aggregate -and :meth:`~django.contrib.gis.db.models.GeoQuerySet.extent3d` ``GeoQuerySet`` -method were added as a part of this feature. +and ``extent3d()`` ``GeoQuerySet`` method were added as a part of this feature. The following :class:`~django.contrib.gis.db.models.GeoQuerySet` methods are new in 1.2: |