diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-01-22 14:09:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 14:09:35 +0100 |
| commit | a95431d8666db9953115a3a824db396f8aa82b52 (patch) | |
| tree | 21117e52f95b8f36880efef8cd71c1fcec21242c /docs/source/apps | |
| parent | c5fb54168665d41503ef3a08f0534da58949b632 (diff) | |
| parent | 4724025e6c817761052fc0dc8810fd489a9e0104 (diff) | |
| download | PROJ-a95431d8666db9953115a3a824db396f8aa82b52.tar.gz PROJ-a95431d8666db9953115a3a824db396f8aa82b52.zip | |
Merge pull request #1855 from rouault/rfc4_merge_back_master
[RFC4_dev] Merge master back to rfc4 latest branch
Diffstat (limited to 'docs/source/apps')
| -rw-r--r-- | docs/source/apps/cct.rst | 2 | ||||
| -rw-r--r-- | docs/source/apps/cs2cs.rst | 4 | ||||
| -rw-r--r-- | docs/source/apps/proj.rst | 4 | ||||
| -rw-r--r-- | docs/source/apps/projinfo.rst | 7 |
4 files changed, 6 insertions, 11 deletions
diff --git a/docs/source/apps/cct.rst b/docs/source/apps/cct.rst index c290e1b2..e06f11f8 100644 --- a/docs/source/apps/cct.rst +++ b/docs/source/apps/cct.rst @@ -18,7 +18,7 @@ Synopsis Description *********** -:program:`cct` a 4D equivalent to the :program:`proj` projection program, +:program:`cct` is a 4D equivalent to the :program:`proj` projection program, performs transformation coordinate systems on a set of input points. The coordinate system transformation can include translation between projected and geographic coordinates as well as the application of datum shifts. diff --git a/docs/source/apps/cs2cs.rst b/docs/source/apps/cs2cs.rst index a4069472..1003940d 100644 --- a/docs/source/apps/cs2cs.rst +++ b/docs/source/apps/cs2cs.rst @@ -91,10 +91,6 @@ The following control parameters can appear in any order: List of all distance units that can be selected with the *+units* parameter. -.. option:: -ld - - List of datums that can be selected with the *+datum* parameter. - .. option:: -r This options reverses the order of the expected input from diff --git a/docs/source/apps/proj.rst b/docs/source/apps/proj.rst index 534994de..21c2ea61 100644 --- a/docs/source/apps/proj.rst +++ b/docs/source/apps/proj.rst @@ -97,10 +97,6 @@ The following control parameters can appear in any order List of all distance units that can be selected with the *+units* parameter. -.. option:: -ld - - List of datums that can be selected with the *+datum* parameter. - .. option:: -r This options reverses the order of the expected input from diff --git a/docs/source/apps/projinfo.rst b/docs/source/apps/projinfo.rst index a9b6aecc..47deaaeb 100644 --- a/docs/source/apps/projinfo.rst +++ b/docs/source/apps/projinfo.rst @@ -16,7 +16,7 @@ Synopsis ******** | **projinfo** - | [-o formats] [-k crs|operation|ellipsoid] [--summary] [-q] + | [-o formats] [-k crs|operation|datum|ellipsoid] [--summary] [-q] | [[--area name_or_code] | [--bbox west_long,south_lat,east_long,north_lat]] | [--spatial-test contains|intersects] | [--crs-extent-use none|both|intersection|smallest] @@ -77,7 +77,10 @@ The following control parameters can appear in any order: .. note:: WKT2_2019 was previously called WKT2_2018. -.. option:: -k crs|operation|ellipsoid + .. note:: Before PROJ 6.3.0, WKT1:GDAL was implicitly calling --boundcrs-to-wgs84. + This is no longer the case. + +.. option:: -k crs|operation|datum|ellipsoid When used to query a single object with a AUTHORITY:CODE, determines the (k)ind of the object in case there are CRS, coordinate operations or ellipsoids with the same CODE. |