diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-09-08 16:22:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-08 16:22:15 +0200 |
| commit | 051a983319fdb7a422273a786ea240ad612bb6b5 (patch) | |
| tree | fdce3020a63235f6c4a8b1799b3b695069d73b8a /docs | |
| parent | 73ccf7e1ba2ba9e927c4eaef81f5237fb4f587b2 (diff) | |
| parent | 024f63731283c0026ad5b4dea4084bc48bbcc6f7 (diff) | |
| download | PROJ-051a983319fdb7a422273a786ea240ad612bb6b5.tar.gz PROJ-051a983319fdb7a422273a786ea240ad612bb6b5.zip | |
Merge pull request #1585 from rouault/replace_2018_by_2019
Use in API and utilities WKT2_2019 instead of WKT2_2018 (fixes #1578)
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/apps/projinfo.rst | 8 | ||||
| -rw-r--r-- | docs/source/faq.rst | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/docs/source/apps/projinfo.rst b/docs/source/apps/projinfo.rst index 8018f300..6681881c 100644 --- a/docs/source/apps/projinfo.rst +++ b/docs/source/apps/projinfo.rst @@ -71,10 +71,12 @@ The following control parameters can appear in any order: .. option:: -o formats formats is a comma separated combination of: - ``all``, ``default``, ``PROJ``, ``WKT_ALL``, ``WKT2_2015``, ``WKT2_2018``, ``WKT1_GDAL``, ``WKT1_ESRI``, ``PROJJSON``. + ``all``, ``default``, ``PROJ``, ``WKT_ALL``, ``WKT2:2015``, ``WKT2:2019``, ``WKT1:GDAL``, ``WKT1:ESRI``, ``PROJJSON``. Except ``all`` and ``default``, other formats can be preceded by ``-`` to disable them. + .. note:: WKT2_2019 was previously called WKT2_2018. + .. option:: -k crs|operation|ellipsoid When used to query a single object with a AUTHORITY:CODE, determines the (k)ind of the object @@ -244,7 +246,7 @@ Output: PROJ.4 string: +proj=longlat +datum=WGS84 +no_defs +type=crs - WKT2_2018 string: + WKT2:2019 string: GEOGCRS["WGS 84", DATUM["World Geodetic System 1984", ELLIPSOID["WGS 84",6378137,298.257223563, @@ -283,7 +285,7 @@ Output: +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=conus \ +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 - WKT2_2018 string: + WKT2:2019 string: COORDINATEOPERATION["NAD27 to NAD83 (1)", SOURCECRS[ GEOGCRS["NAD27", diff --git a/docs/source/faq.rst b/docs/source/faq.rst index e7265d48..b9d4e38e 100644 --- a/docs/source/faq.rst +++ b/docs/source/faq.rst @@ -137,7 +137,7 @@ of the Well-Known Text output: PROJ.4 string: +proj=longlat +datum=WGS84 +no_defs +type=crs - WKT2_2018 string: + WKT2:2019 string: GEOGCRS["WGS 84", DATUM["World Geodetic System 1984", ELLIPSOID["WGS 84",6378137,298.257223563, |