p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.8.x] Updated links to latest version of PostGIS docs. 

Backport of 53d11c6821 from master
This commit is contained in:
Tim Graham 2015-03-17 18:34:15 -04:00
parent ddb95d6d53
commit 0c92913bb0
5 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/ref/contrib/gis/db-api.txt
View File

@ -166,7 +166,7 @@ to be in the units of the field.
.. note:: .. note::
In PostGIS 1.5, ``ST_Distance_Sphere`` does *not* limit the geometry types In PostGIS, ``ST_Distance_Sphere`` does *not* limit the geometry types
geographic distance queries are performed with. [#fndistsphere15]_ However, geographic distance queries are performed with. [#fndistsphere15]_ However,
these queries may take a long time, as great-circle distances must be these queries may take a long time, as great-circle distances must be
calculated on the fly for *every* row in the query. This is because the calculated on the fly for *every* row in the query. This is because the
@ -312,9 +312,9 @@ Aggregate PostGIS Oracle SpatiaLite
.. rubric:: Footnotes .. rubric:: Footnotes
.. [#fnwkt] *See* Open Geospatial Consortium, Inc., `OpenGIS Simple Feature Specification For SQL <http://www.opengis.org/docs/99-049.pdf>`_, Document 99-049 (May 5, 1999), at Ch. 3.2.5, p. 3-11 (SQL Textual Representation of Geometry). .. [#fnwkt] *See* Open Geospatial Consortium, Inc., `OpenGIS Simple Feature Specification For SQL <http://www.opengis.org/docs/99-049.pdf>`_, Document 99-049 (May 5, 1999), at Ch. 3.2.5, p. 3-11 (SQL Textual Representation of Geometry).
.. [#fnewkb] *See* `PostGIS EWKB, EWKT and Canonical Forms <http://postgis.net/docs/manual-1.5/ch04.html#EWKB_EWKT>`_, PostGIS documentation at Ch. 4.1.2. .. [#fnewkb] *See* `PostGIS EWKB, EWKT and Canonical Forms <http://postgis.net/docs/manual-2.1/using_postgis_dbmanagement.html#EWKB_EWKT>`_, PostGIS documentation at Ch. 4.1.2.
.. [#fngeojson] *See* Howard Butler, Martin Daly, Allan Doyle, Tim Schaub, & Christopher Schmidt, `The GeoJSON Format Specification <http://geojson.org/geojson-spec.html>`_, Revision 1.0 (June 16, 2008). .. [#fngeojson] *See* Howard Butler, Martin Daly, Allan Doyle, Tim Schaub, & Christopher Schmidt, `The GeoJSON Format Specification <http://geojson.org/geojson-spec.html>`_, Revision 1.0 (June 16, 2008).
.. [#fndistsphere15] *See* `PostGIS 1.5 documentation <http://postgis.net/docs/manual-1.5/ST_Distance_Sphere.html>`_ on ``ST_distance_sphere``. .. [#fndistsphere15] *See* `PostGIS documentation <http://postgis.net/docs/manual-2.1/ST_Distance_Sphere.html>`_ on ``ST_distance_sphere``.
.. [#fnmysqlidx] *See* `Creating Spatial Indexes <http://dev.mysql.com/doc/refman/5.6/en/creating-spatial-indexes.html>`_ .. [#fnmysqlidx] *See* `Creating Spatial Indexes <http://dev.mysql.com/doc/refman/5.6/en/creating-spatial-indexes.html>`_
in the MySQL Reference Manual: in the MySQL Reference Manual:

2
docs/ref/contrib/gis/install/index.txt
View File

@ -445,7 +445,7 @@ From within the Application Stack Builder (to run outside of the installer,
:menuselection:`Start --> Programs --> PostgreSQL 9.x`), select :menuselection:`Start --> Programs --> PostgreSQL 9.x`), select
:menuselection:`PostgreSQL Database Server 9.x on port 5432` from the drop down :menuselection:`PostgreSQL Database Server 9.x on port 5432` from the drop down
menu. Next, expand the :menuselection:`Categories --> Spatial Extensions` menu menu. Next, expand the :menuselection:`Categories --> Spatial Extensions` menu
tree and select :menuselection:`PostGIS 1.5 for PostgreSQL 9.x`. tree and select :menuselection:`PostGIS X.Y for PostgreSQL 9.x`.
After clicking next, you will be prompted to select your mirror, PostGIS After clicking next, you will be prompted to select your mirror, PostGIS
will be downloaded, and the PostGIS installer will begin. Select only the will be downloaded, and the PostGIS installer will begin. Select only the

8
docs/ref/contrib/gis/install/postgis.txt
View File

@ -13,7 +13,7 @@ might also need additional libraries, see `PostGIS requirements`_.
when using GeoDjango with PostGIS. when using GeoDjango with PostGIS.
.. _psycopg2: http://initd.org/psycopg/ .. _psycopg2: http://initd.org/psycopg/
.. _PostGIS requirements: http://www.postgis.org/documentation/manual-2.0/postgis_installation.html#id554707 .. _PostGIS requirements: http://postgis.net/docs/manual-2.1/postgis_installation.html#install_requirements
On Debian/Ubuntu, you are advised to install the following packages: On Debian/Ubuntu, you are advised to install the following packages:
postgresql-x.x, postgresql-x.x-postgis, postgresql-server-dev-x.x, postgresql-x.x, postgresql-x.x-postgis, postgresql-server-dev-x.x,
@ -26,9 +26,9 @@ Building from source
First download the source archive, and extract:: First download the source archive, and extract::
$ wget http://download.osgeo.org/postgis/source/postgis-2.0.3.tar.gz $ wget http://download.osgeo.org/postgis/source/postgis-2.1.5.tar.gz
$ tar xzf postgis-2.0.3.tar.gz $ tar xzf postgis-2.1.5.tar.gz
$ cd postgis-2.0.3 $ cd postgis-2.1.5
Next, configure, make and install PostGIS:: Next, configure, make and install PostGIS::

14
docs/ref/contrib/gis/model-api.txt
View File

@ -183,17 +183,15 @@ details.
.. note:: .. note::
Geography support is limited only to PostGIS 1.5+, and will Geography support is limited to PostGIS and will force the SRID to be 4326.
force the SRID to be 4326.
.. _geography-type: .. _geography-type:
Geography Type Geography Type
^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
In PostGIS 1.5, the geography type was introduced -- it provides The geography type provides native support for spatial features represented
native support for spatial features represented with geographic with geographic coordinates (e.g., WGS84 longitude/latitude). [#fngeography]_
coordinates (e.g., WGS84 longitude/latitude). [#fngeography]_
Unlike the plane used by a geometry type, the geography type uses a spherical Unlike the plane used by a geometry type, the geography type uses a spherical
representation of its data. Distance and measurement operations representation of its data. Distance and measurement operations
performed on a geography column automatically employ great circle arc performed on a geography column automatically employ great circle arc
@ -214,7 +212,7 @@ available for geography columns:
For more information, the PostGIS documentation contains a helpful section on For more information, the PostGIS documentation contains a helpful section on
determining `when to use geography data type over geometry data type determining `when to use geography data type over geometry data type
<http://postgis.net/docs/manual-1.5/ch04.html#PostGIS_GeographyVSGeometry>`_. <http://postgis.net/docs/manual-2.1/using_postgis_dbmanagement.html#PostGIS_GeographyVSGeometry>`_.
``GeoManager`` ``GeoManager``
============== ==============
@ -252,5 +250,5 @@ for example::
.. [#fnsrid] Typically, SRID integer corresponds to an EPSG (`European Petroleum Survey Group <http://www.epsg.org>`_) identifier. However, it may also be associated with custom projections defined in spatial database's spatial reference systems table. .. [#fnsrid] Typically, SRID integer corresponds to an EPSG (`European Petroleum Survey Group <http://www.epsg.org>`_) identifier. However, it may also be associated with custom projections defined in spatial database's spatial reference systems table.
.. [#fnharvard] Harvard Graduate School of Design, `An Overview of Geodesy and Geographic Referencing Systems <http://www.gsd.harvard.edu/gis/manual/projections/fundamentals/>`_. This is an excellent resource for an overview of principles relating to geographic and Cartesian coordinate systems. .. [#fnharvard] Harvard Graduate School of Design, `An Overview of Geodesy and Geographic Referencing Systems <http://www.gsd.harvard.edu/gis/manual/projections/fundamentals/>`_. This is an excellent resource for an overview of principles relating to geographic and Cartesian coordinate systems.
.. [#fnthematic] Terry A. Slocum, Robert B. McMaster, Fritz C. Kessler, & Hugh H. Howard, *Thematic Cartography and Geographic Visualization* (Prentice Hall, 2nd edition), at Ch. 7.1.3. .. [#fnthematic] Terry A. Slocum, Robert B. McMaster, Fritz C. Kessler, & Hugh H. Howard, *Thematic Cartography and Geographic Visualization* (Prentice Hall, 2nd edition), at Ch. 7.1.3.
.. [#fndist] This limitation does not apply to PostGIS 1.5. It should be noted that even in previous versions of PostGIS, this isn't impossible using GeoDjango; you could for example, take a known point in a projected coordinate system, buffer it to the appropriate radius, and then perform an intersection operation with the buffer transformed to the geographic coordinate system. .. [#fndist] This limitation does not apply to PostGIS.
.. [#fngeography] Please refer to the `PostGIS Geography Type <http://postgis.net/docs/manual-1.5/ch04.html#PostGIS_Geography>`_ documentation for more details. .. [#fngeography] Please refer to the `PostGIS Geography Type <http://postgis.net/docs/manual-2.1/using_postgis_dbmanagement.html#PostGIS_Geography>`_ documentation for more details.

6
docs/ref/contrib/gis/testing.txt
View File

@ -36,10 +36,10 @@ When GeoDjango's spatial backend initializes on PostGIS, it has to perform
an SQL query to determine the version in order to figure out what an SQL query to determine the version in order to figure out what
features are available. Advanced users wishing to prevent this additional features are available. Advanced users wishing to prevent this additional
query may set the version manually using a 3-tuple of integers specifying query may set the version manually using a 3-tuple of integers specifying
the major, minor, and subminor version numbers for PostGIS. For example, the major, minor, and micro version numbers for PostGIS. For example,
to configure for PostGIS 1.5.2 you would use:: to configure for PostGIS X.Y.Z you would use::
POSTGIS_VERSION = (1, 5, 2) POSTGIS_VERSION = (X, Y, Z)
Obtaining sufficient privileges Obtaining sufficient privileges
------------------------------- -------------------------------