From d4c5ef3ebbdc160ba425d5073faddd8713da4ad2 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sun, 10 May 2020 22:30:03 +0200 Subject: Renamed PROJ.4 to PROJ. --- docs/ref/contrib/gis/gdal.txt | 12 ++++++------ docs/ref/contrib/gis/geos.txt | 11 +++++------ docs/ref/contrib/gis/install/geolibs.txt | 16 ++++++++-------- docs/ref/contrib/gis/install/index.txt | 6 +++--- docs/ref/contrib/gis/install/spatialite.txt | 2 +- docs/ref/contrib/gis/layermapping.txt | 2 +- docs/ref/contrib/gis/tutorial.txt | 4 ++-- docs/releases/3.2.txt | 3 ++- 8 files changed, 28 insertions(+), 28 deletions(-) (limited to 'docs') diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt index f022c89040..857d8d02f5 100644 --- a/docs/ref/contrib/gis/gdal.txt +++ b/docs/ref/contrib/gis/gdal.txt @@ -628,7 +628,7 @@ coordinate transformation:: Transforms this geometry to a different spatial reference system. May take a :class:`CoordTransform` object, a :class:`SpatialReference` object, or any other input accepted by :class:`SpatialReference` (including spatial - reference WKT and PROJ.4 strings, or an integer SRID). + reference WKT and PROJ strings, or an integer SRID). By default nothing is returned and the geometry is transformed in-place. However, if the ``clone`` keyword is set to ``True`` then a transformed @@ -881,7 +881,7 @@ Coordinate System Objects * OGC Well Known Text (WKT) (a string) * EPSG code (integer or string) - * PROJ.4 string + * PROJ string * A shorthand string for well-known standards (``'WGS84'``, ``'WGS72'``, ``'NAD27'``, ``'NAD83'``) @@ -890,8 +890,8 @@ Coordinate System Objects >>> wgs84 = SpatialReference('WGS84') # shorthand string >>> wgs84 = SpatialReference(4326) # EPSG code >>> wgs84 = SpatialReference('EPSG:4326') # EPSG string - >>> proj4 = '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs ' - >>> wgs84 = SpatialReference(proj4) # PROJ.4 string + >>> proj = '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs ' + >>> wgs84 = SpatialReference(proj) # PROJ string >>> wgs84 = SpatialReference("""GEOGCS["WGS 84", DATUM["WGS_1984", SPHEROID["WGS 84",6378137,298.257223563, @@ -967,7 +967,7 @@ Coordinate System Objects .. method:: import_proj(proj) - Import spatial reference from PROJ.4 string. + Import spatial reference from PROJ string. .. method:: import_user_input(user_input) @@ -1050,7 +1050,7 @@ Coordinate System Objects .. attribute:: proj - Returns the PROJ.4 representation for this spatial reference. + Returns the PROJ representation for this spatial reference. .. attribute:: proj4 diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt index 74de7b255c..446fb38108 100644 --- a/docs/ref/contrib/gis/geos.txt +++ b/docs/ref/contrib/gis/geos.txt @@ -642,12 +642,11 @@ Other Properties & Methods Transforms the geometry according to the given coordinate transformation parameter (``ct``), which may be an integer SRID, spatial reference WKT - string, a PROJ.4 string, a - :class:`~django.contrib.gis.gdal.SpatialReference` object, or a - :class:`~django.contrib.gis.gdal.CoordTransform` object. By default, the - geometry is transformed in-place and nothing is returned. However if the - ``clone`` keyword is set, then the geometry is not modified and a - transformed clone of the geometry is returned instead. + string, a PROJ string, a :class:`~django.contrib.gis.gdal.SpatialReference` + object, or a :class:`~django.contrib.gis.gdal.CoordTransform` object. By + default, the geometry is transformed in-place and nothing is returned. + However if the ``clone`` keyword is set, then the geometry is not modified + and a transformed clone of the geometry is returned instead. .. note:: diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index 650577ac9d..1ba1ba0673 100644 --- a/docs/ref/contrib/gis/install/geolibs.txt +++ b/docs/ref/contrib/gis/install/geolibs.txt @@ -9,7 +9,7 @@ geospatial libraries: Program Description Required Supported Versions ======================== ==================================== ================================ =================================== :doc:`GEOS <../geos>` Geometry Engine Open Source Yes 3.8, 3.7, 3.6, 3.5 -`PROJ.4`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 6.3, 6.2, 6.1, 6.0, 5.x, 4.x +`PROJ`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 6.x, 5.x, 4.x :doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes 3.1, 3.0, 2.4, 2.3, 2.2, 2.1, 2.0 :doc:`GeoIP <../geoip2>` IP-based geolocation library No 2 `PostGIS`__ Spatial extensions for PostgreSQL Yes (PostgreSQL only) 3.0, 2.5, 2.4, 2.3, 2.2 @@ -45,7 +45,7 @@ totally fine with GeoDjango. Your mileage may vary. independently of Django. In other words, no database or settings file required -- import them as normal from :mod:`django.contrib.gis`. -.. _PROJ.4: https://github.com/OSGeo/proj.4/wiki/ +.. _PROJ: https://proj.org/ __ https://postgis.net/ __ https://www.gaia-gis.it/gaia-sins/ @@ -146,13 +146,13 @@ See also :ref:`My logs are filled with GEOS-related errors `_ requires the ``null`` grid file only included in the extra datum shifting files. It is easier to install the shifting files now, then to have debug a diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt index b6621f518c..df536f2937 100644 --- a/docs/ref/contrib/gis/install/index.txt +++ b/docs/ref/contrib/gis/install/index.txt @@ -58,10 +58,10 @@ supported versions, and any notes for each of the supported database backends: ================== ============================== ================== ========================================= Database Library Requirements Supported Versions Notes ================== ============================== ================== ========================================= -PostgreSQL GEOS, GDAL, PROJ.4, PostGIS 9.5+ Requires PostGIS. +PostgreSQL GEOS, GDAL, PROJ, PostGIS 9.5+ Requires PostGIS. MySQL GEOS, GDAL 5.6.1+ :ref:`Limited functionality `. Oracle GEOS, GDAL 12.2+ XE not supported. -SQLite GEOS, GDAL, PROJ.4, SpatiaLite 3.8.3+ Requires SpatiaLite 4.3+ +SQLite GEOS, GDAL, PROJ, SpatiaLite 3.8.3+ Requires SpatiaLite 4.3+ ================== ============================== ================== ========================================= See also `this comparison matrix`__ on the OSGeo Wiki for @@ -446,7 +446,7 @@ __ http://www.stickpeople.com/projects/python/win-psycopg/ OSGeo4W ~~~~~~~ -The `OSGeo4W installer`_ helps to install the PROJ.4, GDAL, and GEOS libraries +The `OSGeo4W installer`_ helps to install the PROJ, GDAL, and GEOS libraries required by GeoDjango. First, download the `OSGeo4W installer`_, and run it. Select :menuselection:`Express Web-GIS Install` and click next. In the 'Select Packages' list, ensure that GDAL is selected; MapServer and Apache are also diff --git a/docs/ref/contrib/gis/install/spatialite.txt b/docs/ref/contrib/gis/install/spatialite.txt index 9386168ce3..a5a489eb3d 100644 --- a/docs/ref/contrib/gis/install/spatialite.txt +++ b/docs/ref/contrib/gis/install/spatialite.txt @@ -26,7 +26,7 @@ __ https://www.gaia-gis.it/gaia-sins/ Installing from source ====================== -:doc:`GEOS and PROJ.4` should be installed +:doc:`GEOS and PROJ` should be installed prior to building SpatiaLite. SQLite diff --git a/docs/ref/contrib/gis/layermapping.txt b/docs/ref/contrib/gis/layermapping.txt index 9d9fee988f..cbce2aff59 100644 --- a/docs/ref/contrib/gis/layermapping.txt +++ b/docs/ref/contrib/gis/layermapping.txt @@ -114,7 +114,7 @@ Keyword Arguments ``source_srs`` Use this to specify the source SRS manually (for example, some shapefiles don't come with a ``'.prj'`` - file). An integer SRID, WKT or PROJ.4 strings, and + file). An integer SRID, WKT or PROJ strings, and :class:`django.contrib.gis.gdal.SpatialReference` objects are accepted. diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt index 233ac1e8e7..d69f5a7c7c 100644 --- a/docs/ref/contrib/gis/tutorial.txt +++ b/docs/ref/contrib/gis/tutorial.txt @@ -372,7 +372,7 @@ system associated with it. If it does, the ``srs`` attribute will return a SPHEROID["WGS_1984",6378137.0,298.257223563]], PRIMEM["Greenwich",0.0], UNIT["Degree",0.0174532925199433]] - >>> srs.proj4 # PROJ.4 representation + >>> srs.proj # PROJ representation '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs ' This shapefile is in the popular WGS84 spatial reference @@ -751,7 +751,7 @@ This provides more context (including street and thoroughfare details) than available with the :class:`~django.contrib.gis.admin.GeoModelAdmin` (which uses the `Vector Map Level 0`_ WMS dataset hosted at `OSGeo`_). -The PROJ.4 datum shifting files must be installed (see the :ref:`PROJ.4 +The PROJ datum shifting files must be installed (see the :ref:`PROJ installation instructions ` for more details). If you meet this requirement, then substitute the ``OSMGeoAdmin`` option class diff --git a/docs/releases/3.2.txt b/docs/releases/3.2.txt index 3950a70e72..0e0bb4b3bd 100644 --- a/docs/releases/3.2.txt +++ b/docs/releases/3.2.txt @@ -227,7 +227,8 @@ backends. Miscellaneous ------------- -* ... +* The undocumented ``SpatiaLiteOperations.proj4_version()`` method is renamed + to ``proj_version()``. .. _deprecated-features-3.2: -- cgit v1.3