diff --git a/django/contrib/gis/db/backends/base/features.py b/django/contrib/gis/db/backends/base/features.py index 85faba2d42..4b4ffcc49f 100644 --- a/django/contrib/gis/db/backends/base/features.py +++ b/django/contrib/gis/db/backends/base/features.py @@ -17,7 +17,7 @@ class BaseSpatialFeatures: # Does the backend support storing 3D geometries? supports_3d_storage = False # 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 # Does the database support SRID transform operations? supports_transform = True diff --git a/django/contrib/gis/db/backends/spatialite/operations.py b/django/contrib/gis/db/backends/spatialite/operations.py index b859765c20..9671cf2341 100644 --- a/django/contrib/gis/db/backends/spatialite/operations.py +++ b/django/contrib/gis/db/backends/spatialite/operations.py @@ -1,7 +1,7 @@ """ SQL functions reference lists: -https://web.archive.org/web/20130407175746/http://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://web.archive.org/web/20130407175746/https://www.gaia-gis.it/gaia-sins/spatialite-sql-4.0.0.html +https://www.gaia-gis.it/gaia-sins/spatialite-sql-4.2.1.html """ import re diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt index 768c478835..09a49c8418 100644 --- a/docs/ref/contrib/gis/db-api.txt +++ b/docs/ref/contrib/gis/db-api.txt @@ -422,9 +422,9 @@ Aggregate PostGIS Oracle SpatiaLite .. rubric:: Footnotes .. [#fnwkt] *See* Open Geospatial Consortium, Inc., `OpenGIS Simple Feature Specification For SQL `_, 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 `_, PostGIS documentation at Ch. 4.1.2. +.. [#fnewkb] *See* `PostGIS EWKB, EWKT and Canonical Forms `_, PostGIS documentation at Ch. 4.1.2. .. [#fngeojson] *See* Howard Butler, Martin Daly, Allan Doyle, Tim Schaub, & Christopher Schmidt, `The GeoJSON Format Specification `_, Revision 1.0 (June 16, 2008). -.. [#fndistsphere15] *See* `PostGIS documentation `_ on ``ST_DistanceSphere``. +.. [#fndistsphere15] *See* `PostGIS documentation `_ on ``ST_DistanceSphere``. .. [#fnmysqlidx] *See* `Creating Spatial Indexes `_ in the MySQL Reference Manual: diff --git a/docs/ref/contrib/gis/functions.txt b/docs/ref/contrib/gis/functions.txt index c26e1ca9ae..9fba17b741 100644 --- a/docs/ref/contrib/gis/functions.txt +++ b/docs/ref/contrib/gis/functions.txt @@ -169,7 +169,7 @@ __ http://www.w3.org/Graphics/SVG/ .. class:: BoundingCircle(expression, num_seg=48, **extra) -*Availability*: `PostGIS `__, +*Availability*: `PostGIS `__, `Oracle `_ Accepts a single geographic field or expression and returns the smallest circle @@ -265,7 +265,7 @@ representing the bounding box of the geometry. .. class:: ForceRHR(expression, **extra) -*Availability*: `PostGIS `__ +*Availability*: `PostGIS `__ Accepts a single geographic field or expression and returns a modified version of the polygon/multipolygon in which all of the vertices follow the diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt index 63258890cb..5adc61185c 100644 --- a/docs/ref/contrib/gis/geoquerysets.txt +++ b/docs/ref/contrib/gis/geoquerysets.txt @@ -24,7 +24,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 a lookup doesn't support raster input, the input is automatically converted to a geometry where necessary using the `ST_Polygon -`_ function. See also the +`_ function. See also the :ref:`introduction to raster lookups `. The database operators used by the lookups can be divided into three categories: @@ -819,4 +819,4 @@ Example:: .. [#fnde9im] *See* `OpenGIS Simple Feature Specification For SQL `_, at Ch. 2.1.13.2, p. 2-13 (The Dimensionally Extended Nine-Intersection Model). .. [#fnsdorelate] *See* `SDO_RELATE documentation `_, from the Oracle Spatial and Graph Developer's Guide. .. [#fncovers] For an explanation of this routine, read `Quirks of the "Contains" Spatial Predicate `_ by Martin Davis (a PostGIS developer). -.. [#fncontainsproperly] Refer to the PostGIS ``ST_ContainsProperly`` `documentation `_ for more details. +.. [#fncontainsproperly] Refer to the PostGIS ``ST_ContainsProperly`` `documentation `_ for more details. diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt index 815d4268cb..68c4a2ac30 100644 --- a/docs/ref/contrib/gis/geos.txt +++ b/docs/ref/contrib/gis/geos.txt @@ -1068,7 +1068,7 @@ include the SRID value (in other words, EWKB). 'POINT (1.4 1.7)' .. rubric:: Footnotes -.. [#fnogc] *See* `PostGIS EWKB, EWKT and Canonical Forms `_, PostGIS documentation at Ch. 4.1.2. +.. [#fnogc] *See* `PostGIS EWKB, EWKT and Canonical Forms `_, PostGIS documentation at Ch. 4.1.2. Settings ======== diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index b3b5975c9a..6fae799788 100644 --- a/docs/ref/contrib/gis/install/geolibs.txt +++ b/docs/ref/contrib/gis/install/geolibs.txt @@ -49,8 +49,8 @@ totally fine with GeoDjango. Your mileage may vary. required -- just import them as normal from :mod:`django.contrib.gis`. .. _PROJ.4: https://github.com/OSGeo/proj.4/wiki/ -__ http://postgis.net/ -__ http://www.gaia-gis.it/gaia-sins/ +__ https://postgis.net/ +__ https://www.gaia-gis.it/gaia-sins/ On Debian/Ubuntu, you are advised to install the following packages which will diff --git a/docs/ref/contrib/gis/install/postgis.txt b/docs/ref/contrib/gis/install/postgis.txt index 392efbfa7d..1ae7125f04 100644 --- a/docs/ref/contrib/gis/install/postgis.txt +++ b/docs/ref/contrib/gis/install/postgis.txt @@ -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 instructions if you are on :ref:`macosx` or :ref:`windows`. -.. _PostGIS: http://postgis.net/ +.. _PostGIS: https://postgis.net/ .. _psycopg2: http://initd.org/psycopg/ -.. _PostGIS requirements: http://postgis.net/docs/postgis_installation.html#install_requirements -.. _build from source: http://postgis.net/docs/postgis_installation.html#install_short_version +.. _PostGIS requirements: https://postgis.net/docs/postgis_installation.html#install_requirements +.. _build from source: https://postgis.net/docs/postgis_installation.html#install_short_version 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;``. -__ http://postgis.net/docs/Topology.html +__ https://postgis.net/docs/Topology.html Managing the database --------------------- diff --git a/docs/ref/contrib/gis/install/spatialite.txt b/docs/ref/contrib/gis/install/spatialite.txt index dd1dc5dddb..775156c56f 100644 --- a/docs/ref/contrib/gis/install/spatialite.txt +++ b/docs/ref/contrib/gis/install/spatialite.txt @@ -19,7 +19,7 @@ In any case, you should always be able to :ref:`install from source `. __ https://www.gaia-gis.it/fossil/libspatialite -__ http://www.gaia-gis.it/gaia-sins/ +__ https://www.gaia-gis.it/gaia-sins/ .. _spatialite_source: @@ -72,7 +72,7 @@ SpatiaLite library (``libspatialite``) Get the latest SpatiaLite library source bundle from the `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 $ cd libspatialite-4.1.0 $ ./configure @@ -86,7 +86,7 @@ Get the latest SpatiaLite library source bundle from the $ ./configure --target=macosx -__ http://www.gaia-gis.it/gaia-sins/libspatialite-sources/ +__ https://www.gaia-gis.it/gaia-sins/libspatialite-sources/ .. _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 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 $ cd spatialite-tools-osx-x86-2.3.1/bin $ 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' -__ http://www.gaia-gis.it/spatialite-2.3.1/binaries.html +__ https://www.gaia-gis.it/spatialite-2.3.1/binaries.html Homebrew -------- diff --git a/docs/ref/contrib/gis/model-api.txt b/docs/ref/contrib/gis/model-api.txt index 54a6df4dc4..5b2c2e414b 100644 --- a/docs/ref/contrib/gis/model-api.txt +++ b/docs/ref/contrib/gis/model-api.txt @@ -242,7 +242,7 @@ geography column to a geometry type in the query:: For more information, the PostGIS documentation contains a helpful section on determining `when to use geography data type over geometry data type -`_. +`_. .. rubric:: Footnotes .. [#fnogc] OpenGIS Consortium, Inc., `Simple Feature Specification For SQL `_. @@ -250,4 +250,4 @@ determining `when to use geography data type over geometry data type .. [#fnsrid] Typically, SRID integer corresponds to an EPSG (`European Petroleum Survey Group `_) 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. .. [#fndist] This limitation does not apply to PostGIS. -.. [#fngeography] Please refer to the `PostGIS Geography Type `_ documentation for more details. +.. [#fngeography] Please refer to the `PostGIS Geography Type `_ documentation for more details. diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt index 22e3b075ad..eb2fcd440a 100644 --- a/docs/ref/contrib/gis/tutorial.txt +++ b/docs/ref/contrib/gis/tutorial.txt @@ -303,7 +303,7 @@ besides the tools included within GeoDjango, you may also use the following: PostGIS. .. _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: diff --git a/docs/releases/1.1.txt b/docs/releases/1.1.txt index c4c0386030..1ef5667336 100644 --- a/docs/releases/1.1.txt +++ b/docs/releases/1.1.txt @@ -364,7 +364,7 @@ features: For more details, see the GeoDjango documentation. .. _geodjango: http://geodjango.org/ -.. _spatialite: http://www.gaia-gis.it/gaia-sins/ +.. _spatialite: https://www.gaia-gis.it/gaia-sins/ Other improvements ------------------ diff --git a/tests/gis_tests/geo3d/tests.py b/tests/gis_tests/geo3d/tests.py index f05e2e35ce..aec6e1abb7 100644 --- a/tests/gis_tests/geo3d/tests.py +++ b/tests/gis_tests/geo3d/tests.py @@ -101,7 +101,7 @@ class Geo3DTest(Geo3DLoadingHelper, TestCase): available within GeoDjango. For more information, see the PostGIS docs 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):