Skip to content

Commit

Permalink
[1.9.x] Fixed #25498 -- Documented ST_Distance/ST_Distance_Sphere dif…
Browse files Browse the repository at this point in the history
…ference

Thanks Bibhas Debnath for the report and Tim Graham for the review.
Backport of 617b1a2 from master.
  • Loading branch information
claudep committed Oct 11, 2015
1 parent 86dc488 commit 66319cc
Showing 1 changed file with 18 additions and 17 deletions.
35 changes: 18 additions & 17 deletions docs/ref/contrib/gis/geoquerysets.txt
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,8 @@ distance lookup but :lookup:`dwithin`, an optional
third element, ``'spheroid'``, may be included to tell GeoDjango
to use the more accurate spheroid distance calculation functions on
fields with a geodetic coordinate system (e.g., ``ST_Distance_Spheroid``
would be used instead of ``ST_Distance_Sphere``).
would be used instead of ``ST_Distance_Sphere``). The simpler ``ST_Distance``
function is used with projected coordinate systems.

.. fieldlookup:: distance_gt

Expand All @@ -535,13 +536,13 @@ Example::

Zipcode.objects.filter(poly__distance_gt=(geom, D(m=5)))

========== ===============================================
========== ==================================================
Backend SQL Equivalent
========== ===============================================
PostGIS ``ST_Distance(poly, geom) > 5``
========== ==================================================
PostGIS ``ST_Distance/ST_Distance_Sphere(poly, geom) > 5``
Oracle ``SDO_GEOM.SDO_DISTANCE(poly, geom, 0.05) > 5``
SpatiaLite ``Distance(poly, geom) > 5``
========== ===============================================
========== ==================================================

.. fieldlookup:: distance_gte

Expand All @@ -555,13 +556,13 @@ Example::

Zipcode.objects.filter(poly__distance_gte=(geom, D(m=5)))

========== ================================================
========== ===================================================
Backend SQL Equivalent
========== ================================================
PostGIS ``ST_Distance(poly, geom) >= 5``
========== ===================================================
PostGIS ``ST_Distance/ST_Distance_Sphere(poly, geom) >= 5``
Oracle ``SDO_GEOM.SDO_DISTANCE(poly, geom, 0.05) >= 5``
SpatiaLite ``Distance(poly, geom) >= 5``
========== ================================================
========== ===================================================

.. fieldlookup:: distance_lt

Expand All @@ -575,13 +576,13 @@ Example::

Zipcode.objects.filter(poly__distance_lt=(geom, D(m=5)))

========== ===============================================
========== ==================================================
Backend SQL Equivalent
========== ===============================================
PostGIS ``ST_Distance(poly, geom) < 5``
========== ==================================================
PostGIS ``ST_Distance/ST_Distance_Sphere(poly, geom) < 5``
Oracle ``SDO_GEOM.SDO_DISTANCE(poly, geom, 0.05) < 5``
SpatiaLite ``Distance(poly, geom) < 5``
========== ===============================================
========== ==================================================

.. fieldlookup:: distance_lte

Expand All @@ -595,13 +596,13 @@ Example::

Zipcode.objects.filter(poly__distance_lte=(geom, D(m=5)))

========== ================================================
========== ===================================================
Backend SQL Equivalent
========== ================================================
PostGIS ``ST_Distance(poly, geom) <= 5``
========== ===================================================
PostGIS ``ST_Distance/ST_Distance_Sphere(poly, geom) <= 5``
Oracle ``SDO_GEOM.SDO_DISTANCE(poly, geom, 0.05) <= 5``
SpatiaLite ``Distance(poly, geom) <= 5``
========== ================================================
========== ===================================================

.. fieldlookup:: dwithin

Expand Down

0 comments on commit 66319cc

Please sign in to comment.