mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity

[1.11.x] Updated postgis.net and gaia-gis.it links to https.

Browse Source 
Backport of 5bd7ffc313 from master
This commit is contained in:
Tim Graham
2017-03-16 14:01:45 -04:00
parent 0cc9175c76
commit 4b57fa3746
13 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/db/backends/base/features.py
View File

@@ -18,7 +18,7 @@ class BaseSpatialFeatures(object):
# Does the backend support storing 3D geometries? # Does the backend support storing 3D geometries?
supports_3d_storage = False supports_3d_storage = False
# Reference implementation of 3D functions is: # Reference implementation of 3D functions is:
# http://postgis.net/docs/PostGIS_Special_Functions_Index.html#PostGIS_3D_Functions # https://postgis.net/docs/PostGIS_Special_Functions_Index.html#PostGIS_3D_Functions
supports_3d_functions = False supports_3d_functions = False
# Does the database support SRID transform operations? # Does the database support SRID transform operations?
supports_transform = True supports_transform = True

4
django/contrib/gis/db/backends/spatialite/operations.py
View File

@@ -1,7 +1,7 @@
""" """
SQL functions reference lists: SQL functions reference lists:
https://web.archive.org/web/20130407175746/http://www.gaia-gis.it/gaia-sins/spatialite-sql-4.0.0.html https://web.archive.org/web/20130407175746/https://www.gaia-gis.it/gaia-sins/spatialite-sql-4.0.0.html
http://www.gaia-gis.it/gaia-sins/spatialite-sql-4.2.1.html https://www.gaia-gis.it/gaia-sins/spatialite-sql-4.2.1.html
""" """
import re import re
import sys import sys

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

@@ -428,9 +428,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/using_postgis_dbmanagement.html#EWKB_EWKT>`_, PostGIS documentation at Ch. 4.1.2. .. [#fnewkb] *See* `PostGIS EWKB, EWKT and Canonical Forms <https://postgis.net/docs/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 documentation <http://postgis.net/docs/ST_DistanceSphere.html>`_ on ``ST_DistanceSphere``. .. [#fndistsphere15] *See* `PostGIS documentation <https://postgis.net/docs/ST_DistanceSphere.html>`_ on ``ST_DistanceSphere``.
.. [#fnmysqlidx] *See* `Creating Spatial Indexes <https://dev.mysql.com/doc/refman/en/creating-spatial-indexes.html>`_ .. [#fnmysqlidx] *See* `Creating Spatial Indexes <https://dev.mysql.com/doc/refman/en/creating-spatial-indexes.html>`_
in the MySQL Reference Manual: in the MySQL Reference Manual:

4
docs/ref/contrib/gis/functions.txt
View File

@@ -169,7 +169,7 @@ __ http://www.w3.org/Graphics/SVG/
.. class:: BoundingCircle(expression, num_seg=48, **extra) .. class:: BoundingCircle(expression, num_seg=48, **extra)
*Availability*: `PostGIS <http://postgis.net/docs/ST_MinimumBoundingCircle.html>`__, *Availability*: `PostGIS <https://postgis.net/docs/ST_MinimumBoundingCircle.html>`__,
`Oracle (≥ 12.1.0.2) <https://docs.oracle.com/database/121/SPATL/GUID-82A61626-BB64-4793-B53D-A0DBEC91831A.htm#SPATL1554>`_ `Oracle (≥ 12.1.0.2) <https://docs.oracle.com/database/121/SPATL/GUID-82A61626-BB64-4793-B53D-A0DBEC91831A.htm#SPATL1554>`_
Accepts a single geographic field or expression and returns the smallest circle Accepts a single geographic field or expression and returns the smallest circle
@@ -269,7 +269,7 @@ representing the bounding box of the geometry.
.. class:: ForceRHR(expression, **extra) .. class:: ForceRHR(expression, **extra)
*Availability*: `PostGIS <http://postgis.net/docs/ST_ForceRHR.html>`__ *Availability*: `PostGIS <https://postgis.net/docs/ST_ForceRHR.html>`__
Accepts a single geographic field or expression and returns a modified version Accepts a single geographic field or expression and returns a modified version
of the polygon/multipolygon in which all of the vertices follow the of the polygon/multipolygon in which all of the vertices follow the

4
docs/ref/contrib/gis/geoquerysets.txt
View File

@@ -30,7 +30,7 @@ All examples in the reference below are given for geometry fields and inputs,
but the lookups can be used the same way with rasters on both sides. Whenever but the lookups can be used the same way with rasters on both sides. Whenever
a lookup doesn't support raster input, the input is automatically a lookup doesn't support raster input, the input is automatically
converted to a geometry where necessary using the `ST_Polygon converted to a geometry where necessary using the `ST_Polygon
<http://postgis.net/docs/RT_ST_Polygon.html>`_ function. See also the <https://postgis.net/docs/RT_ST_Polygon.html>`_ function. See also the
:ref:`introduction to raster lookups <spatial-lookup-raster>`. :ref:`introduction to raster lookups <spatial-lookup-raster>`.
The database operators used by the lookups can be divided into three categories: The database operators used by the lookups can be divided into three categories:
@@ -1422,4 +1422,4 @@ Example::
.. [#fnde9im] *See* `OpenGIS Simple Feature Specification For SQL <http://www.opengis.org/docs/99-049.pdf>`_, at Ch. 2.1.13.2, p. 2-13 (The Dimensionally Extended Nine-Intersection Model). .. [#fnde9im] *See* `OpenGIS Simple Feature Specification For SQL <http://www.opengis.org/docs/99-049.pdf>`_, at Ch. 2.1.13.2, p. 2-13 (The Dimensionally Extended Nine-Intersection Model).
.. [#fnsdorelate] *See* `SDO_RELATE documentation <https://docs.oracle.com/database/121/SPATL/GUID-97C17C18-F05E-49B4-BE11-E89B972E2A02.htm#SPATL1039>`_, from the Oracle Spatial and Graph Developer's Guide. .. [#fnsdorelate] *See* `SDO_RELATE documentation <https://docs.oracle.com/database/121/SPATL/GUID-97C17C18-F05E-49B4-BE11-E89B972E2A02.htm#SPATL1039>`_, from the Oracle Spatial and Graph Developer's Guide.
.. [#fncovers] For an explanation of this routine, read `Quirks of the "Contains" Spatial Predicate <http://lin-ear-th-inking.blogspot.com/2007/06/subtleties-of-ogc-covers-spatial.html>`_ by Martin Davis (a PostGIS developer). .. [#fncovers] For an explanation of this routine, read `Quirks of the "Contains" Spatial Predicate <http://lin-ear-th-inking.blogspot.com/2007/06/subtleties-of-ogc-covers-spatial.html>`_ by Martin Davis (a PostGIS developer).
.. [#fncontainsproperly] Refer to the PostGIS ``ST_ContainsProperly`` `documentation <http://postgis.net/docs/ST_ContainsProperly.html>`_ for more details. .. [#fncontainsproperly] Refer to the PostGIS ``ST_ContainsProperly`` `documentation <https://postgis.net/docs/ST_ContainsProperly.html>`_ for more details.

2
docs/ref/contrib/gis/geos.txt
View File

@@ -1141,7 +1141,7 @@ include the SRID value (in other words, EWKB).
'POINT (1.4 1.7)' 'POINT (1.4 1.7)'
.. rubric:: Footnotes .. rubric:: Footnotes
.. [#fnogc] *See* `PostGIS EWKB, EWKT and Canonical Forms <http://postgis.net/docs/using_postgis_dbmanagement.html#EWKB_EWKT>`_, PostGIS documentation at Ch. 4.1.2. .. [#fnogc] *See* `PostGIS EWKB, EWKT and Canonical Forms <https://postgis.net/docs/using_postgis_dbmanagement.html#EWKB_EWKT>`_, PostGIS documentation at Ch. 4.1.2.
.. [#fncascadedunion] For more information, read Paul Ramsey's blog post about `(Much) Faster Unions in PostGIS 1.4 <http://blog.cleverelephant.ca/2009/01/must-faster-unions-in-postgis-14.html>`_ and Martin Davis' blog post on `Fast polygon merging in JTS using Cascaded Union <http://lin-ear-th-inking.blogspot.com/2007/11/fast-polygon-merging-in-jts-using.html>`_. .. [#fncascadedunion] For more information, read Paul Ramsey's blog post about `(Much) Faster Unions in PostGIS 1.4 <http://blog.cleverelephant.ca/2009/01/must-faster-unions-in-postgis-14.html>`_ and Martin Davis' blog post on `Fast polygon merging in JTS using Cascaded Union <http://lin-ear-th-inking.blogspot.com/2007/11/fast-polygon-merging-in-jts-using.html>`_.
Settings Settings

4
docs/ref/contrib/gis/install/geolibs.txt
View File

@@ -49,8 +49,8 @@ totally fine with GeoDjango. Your mileage may vary.
required -- just import them as normal from :mod:`django.contrib.gis`. required -- just import them as normal from :mod:`django.contrib.gis`.
.. _PROJ.4: https://github.com/OSGeo/proj.4/wiki/ .. _PROJ.4: https://github.com/OSGeo/proj.4/wiki/
__ http://postgis.net/ __ https://postgis.net/
__ http://www.gaia-gis.it/gaia-sins/ __ https://www.gaia-gis.it/gaia-sins/
On Debian/Ubuntu, you are advised to install the following packages which will On Debian/Ubuntu, you are advised to install the following packages which will

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

@@ -16,10 +16,10 @@ python-psycopg2 (x.x matching the PostgreSQL version you want to install).
Alternately, you can `build from source`_. Consult the platform-specific Alternately, you can `build from source`_. Consult the platform-specific
instructions if you are on :ref:`macosx` or :ref:`windows`. instructions if you are on :ref:`macosx` or :ref:`windows`.
.. _PostGIS: http://postgis.net/ .. _PostGIS: https://postgis.net/
.. _psycopg2: http://initd.org/psycopg/ .. _psycopg2: http://initd.org/psycopg/
.. _PostGIS requirements: http://postgis.net/docs/postgis_installation.html#install_requirements .. _PostGIS requirements: https://postgis.net/docs/postgis_installation.html#install_requirements
.. _build from source: http://postgis.net/docs/postgis_installation.html#install_short_version .. _build from source: https://postgis.net/docs/postgis_installation.html#install_short_version
Post-installation Post-installation
================= =================
@@ -55,7 +55,7 @@ If you plan to use those features at some point, you can also install the
``postgis_topology`` extension by issuing ``CREATE EXTENSION ``postgis_topology`` extension by issuing ``CREATE EXTENSION
postgis_topology;``. postgis_topology;``.
__ http://postgis.net/docs/Topology.html __ https://postgis.net/docs/Topology.html
Managing the database Managing the database
--------------------- ---------------------

10
docs/ref/contrib/gis/install/spatialite.txt
View File

@@ -19,7 +19,7 @@ In any case, you should always be able to :ref:`install from source
<spatialite_source>`. <spatialite_source>`.
__ https://www.gaia-gis.it/fossil/libspatialite __ https://www.gaia-gis.it/fossil/libspatialite
__ http://www.gaia-gis.it/gaia-sins/ __ https://www.gaia-gis.it/gaia-sins/
.. _spatialite_source: .. _spatialite_source:
@@ -72,7 +72,7 @@ SpatiaLite library (``libspatialite``)
Get the latest SpatiaLite library source bundle from the Get the latest SpatiaLite library source bundle from the
`download page`__:: `download page`__::
$ wget http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-4.1.0.tar.gz $ wget https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-4.1.0.tar.gz
$ tar xaf libspatialite-4.1.0.tar.gz $ tar xaf libspatialite-4.1.0.tar.gz
$ cd libspatialite-4.1.0 $ cd libspatialite-4.1.0
$ ./configure $ ./configure
@@ -86,7 +86,7 @@ Get the latest SpatiaLite library source bundle from the
$ ./configure --target=macosx $ ./configure --target=macosx
__ http://www.gaia-gis.it/gaia-sins/libspatialite-sources/ __ https://www.gaia-gis.it/gaia-sins/libspatialite-sources/
.. _spatialite_macosx: .. _spatialite_macosx:
@@ -106,7 +106,7 @@ However, instead of attempting to compile the SpatiaLite tools from source,
download the `SpatiaLite Binaries`__ for OS X, and install ``spatialite`` in a download the `SpatiaLite Binaries`__ for OS X, and install ``spatialite`` in a
location available in your ``PATH``. For example:: location available in your ``PATH``. For example::
$ curl -O http://www.gaia-gis.it/spatialite/spatialite-tools-osx-x86-2.3.1.tar.gz $ curl -O https://www.gaia-gis.it/spatialite/spatialite-tools-osx-x86-2.3.1.tar.gz
$ tar xzf spatialite-tools-osx-x86-2.3.1.tar.gz $ tar xzf spatialite-tools-osx-x86-2.3.1.tar.gz
$ cd spatialite-tools-osx-x86-2.3.1/bin $ cd spatialite-tools-osx-x86-2.3.1/bin
$ sudo cp spatialite /Library/Frameworks/SQLite3.framework/Programs $ sudo cp spatialite /Library/Frameworks/SQLite3.framework/Programs
@@ -116,7 +116,7 @@ add the following to your ``settings.py``::
SPATIALITE_LIBRARY_PATH='/Library/Frameworks/SQLite3.framework/SQLite3' SPATIALITE_LIBRARY_PATH='/Library/Frameworks/SQLite3.framework/SQLite3'
__ http://www.gaia-gis.it/spatialite-2.3.1/binaries.html __ https://www.gaia-gis.it/spatialite-2.3.1/binaries.html
Homebrew Homebrew
-------- --------

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

@@ -242,7 +242,7 @@ geography column to a geometry type in the query::
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/using_postgis_dbmanagement.html#PostGIS_GeographyVSGeometry>`_. <https://postgis.net/docs/using_postgis_dbmanagement.html#PostGIS_GeographyVSGeometry>`_.
``GeoManager`` ``GeoManager``
============== ==============
@@ -266,4 +266,4 @@ The ``GeoManager`` is required in order to use the legacy
.. [#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.
.. [#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. .. [#fndist] This limitation does not apply to PostGIS.
.. [#fngeography] Please refer to the `PostGIS Geography Type <http://postgis.net/docs/using_postgis_dbmanagement.html#PostGIS_Geography>`_ documentation for more details. .. [#fngeography] Please refer to the `PostGIS Geography Type <https://postgis.net/docs/using_postgis_dbmanagement.html#PostGIS_Geography>`_ documentation for more details.

2
docs/ref/contrib/gis/tutorial.txt
View File

@@ -303,7 +303,7 @@ besides the tools included within GeoDjango, you may also use the following:
PostGIS. PostGIS.
.. _ogr2ogr: http://www.gdal.org/ogr2ogr.html .. _ogr2ogr: http://www.gdal.org/ogr2ogr.html
.. _shp2pgsql: http://postgis.net/docs/using_postgis_dbmanagement.html#shp2pgsql_usage .. _shp2pgsql: https://postgis.net/docs/using_postgis_dbmanagement.html#shp2pgsql_usage
.. _gdalinterface: .. _gdalinterface:

2
docs/releases/1.1.txt
View File

@@ -364,7 +364,7 @@ features:
For more details, see the GeoDjango documentation. For more details, see the GeoDjango documentation.
.. _geodjango: http://geodjango.org/ .. _geodjango: http://geodjango.org/
.. _spatialite: http://www.gaia-gis.it/gaia-sins/ .. _spatialite: https://www.gaia-gis.it/gaia-sins/
Other improvements Other improvements
------------------ ------------------

2
tests/gis_tests/geo3d/tests.py
View File

@@ -105,7 +105,7 @@ class Geo3DTest(Geo3DLoadingHelper, TestCase):
available within GeoDjango. For more information, see the PostGIS docs available within GeoDjango. For more information, see the PostGIS docs
on the routines that support 3D: on the routines that support 3D:
http://postgis.net/docs/PostGIS_Special_Functions_Index.html#PostGIS_3D_Functions https://postgis.net/docs/PostGIS_Special_Functions_Index.html#PostGIS_3D_Functions
""" """
def test_3d_hasz(self): def test_3d_hasz(self):