From 1e5acb00a0c0fc2533b9bce2e5803da10ed1d8d6 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 8 Oct 2020 20:59:19 +0200 Subject: projinfo / createObjectsFromName(): support returning a datum ensemble --- docs/source/apps/projinfo.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/source/apps') diff --git a/docs/source/apps/projinfo.rst b/docs/source/apps/projinfo.rst index 05184ef9..a07cf709 100644 --- a/docs/source/apps/projinfo.rst +++ b/docs/source/apps/projinfo.rst @@ -16,7 +16,7 @@ Synopsis ******** | **projinfo** - | [-o formats] [-k crs|operation|datum|ellipsoid] [--summary] [-q] + | [-o formats] [-k crs|operation|datum|ensemble|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] @@ -86,7 +86,7 @@ The following control parameters can appear in any order: .. 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 +.. option:: -k crs|operation|datum|ensemble|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. -- cgit v1.2.3 From af342bf74cd154b653a0f9d931d4ca17001650b9 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Tue, 10 Nov 2020 14:08:30 +0100 Subject: Allow cct to instantiate operations via object codes or names (#2419) Running cct like cct EPSG:8366 or cct "ITRF2014 to ETRF2014 (1)" is now possible. --- docs/source/apps/cct.rst | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'docs/source/apps') diff --git a/docs/source/apps/cct.rst b/docs/source/apps/cct.rst index 1d2aef20..df81c571 100644 --- a/docs/source/apps/cct.rst +++ b/docs/source/apps/cct.rst @@ -15,6 +15,33 @@ Synopsis **cct** [**-cIostvz** [args]] *+opt[=arg]* ... file ... +or + + **cct** [**-cIostvz** [args]] {operation_reference} file ... + +Where {operation_reference} is one of the possibilities accepted +by :c:func:`proj_create`, provided it expresses a coordinate operation + +- a proj-string, + - a WKT string, + - an object code (like "EPSG:1671" "urn:ogc:def:coordinateOperation:EPSG::1671"), + - an object name. e.g "ITRF2014 to ETRF2014 (1)". In that case as + uniqueness is not guaranteed, heuristics are applied to determine the appropriate best match. + - a OGC URN combining references for concatenated operations + (e.g. "urn:ogc:def:coordinateOperation,coordinateOperation:EPSG::3895,coordinateOperation:EPSG::1618") + - a PROJJSON string. The jsonschema is at https://proj.org/schemas/v0.2/projjson.schema.json + + .. versionadded:: 8.0.0 + + .. note:: + + Before version 8.0.0 only proj-strings could be used to instantiate + operations in :program:`cct`. + + + + + Description *********** -- cgit v1.2.3 From a8be7bc87c37f802ddd480b55ba0c19613397892 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 10 Nov 2020 14:23:09 +0100 Subject: cct.rst: fix indentation --- docs/source/apps/cct.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/source/apps') diff --git a/docs/source/apps/cct.rst b/docs/source/apps/cct.rst index df81c571..8f138d92 100644 --- a/docs/source/apps/cct.rst +++ b/docs/source/apps/cct.rst @@ -22,7 +22,7 @@ or Where {operation_reference} is one of the possibilities accepted by :c:func:`proj_create`, provided it expresses a coordinate operation -- a proj-string, + - a proj-string, - a WKT string, - an object code (like "EPSG:1671" "urn:ogc:def:coordinateOperation:EPSG::1671"), - an object name. e.g "ITRF2014 to ETRF2014 (1)". In that case as -- cgit v1.2.3 From 6be4e25c66e805218c851d67157e4d1ddc0a761e Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 10 Nov 2020 14:40:17 +0100 Subject: cct: allow @filename syntax Similarly as for projinfo, allow "cct @filename" to mean read filename and use its content as if it was provided inline. Useful for WKT or PROJJSON And a tiny improvements, when the object definition contains ':', only try proj_create_from_database() if the left part (authority name) matches a known authority, to avoid a warning. --- docs/source/apps/cct.rst | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'docs/source/apps') diff --git a/docs/source/apps/cct.rst b/docs/source/apps/cct.rst index 8f138d92..b8504b8d 100644 --- a/docs/source/apps/cct.rst +++ b/docs/source/apps/cct.rst @@ -17,9 +17,9 @@ Synopsis or - **cct** [**-cIostvz** [args]] {operation_reference} file ... + **cct** [**-cIostvz** [args]] {object_definition} file ... -Where {operation_reference} is one of the possibilities accepted +Where {object_definition} is one of the possibilities accepted by :c:func:`proj_create`, provided it expresses a coordinate operation - a proj-string, @@ -39,6 +39,15 @@ by :c:func:`proj_create`, provided it expresses a coordinate operation operations in :program:`cct`. +or + + **cct** [**-cIostvz** [args]] {object_reference} file ... + +where {object_reference} is a filename preceded by the '@' character. The +file referenced by the {object_reference} must contain a valid +{object_definition}. + + .. versionadded:: 8.0.0 @@ -185,6 +194,20 @@ Should give results comparable to the classic :program:`proj` command $ echo 12 56 100 2018.0 auxiliary data | cct +proj=merc 1335833.8895 7522963.2411 100.0000 2018.0000 auxiliary data +7. Coordinate operation referenced through its code + +.. code-block:: console + + $ echo 3541657.3778 948984.2343 5201383.5231 2020.5 | cct EPSG:8366 + 3541657.9112 948983.7503 5201383.2482 2020.5000 + +8. Coordinate operation referenced through its name + +.. code-block:: console + + $ echo 3541657.3778 948984.2343 5201383.5231 2020.5 | cct "ITRF2014 to ETRF2014 (1)" + 3541657.9112 948983.7503 5201383.2482 2020.5000 + Background ********** -- cgit v1.2.3 From 4caf32aedd4da6b1fd1b1ce0e04a1a08dc1e3f33 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 24 Nov 2020 19:16:12 +0100 Subject: Add option to allow export of Geographic/Projected 3D CRS in WKT1_GDAL as CompoundCRS with a VerticalCRS being an ellipsoidal height, which is not conformant. But needed for LAS 1.4 that only supports WKT1 --- docs/source/apps/projinfo.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'docs/source/apps') diff --git a/docs/source/apps/projinfo.rst b/docs/source/apps/projinfo.rst index a07cf709..803c0a65 100644 --- a/docs/source/apps/projinfo.rst +++ b/docs/source/apps/projinfo.rst @@ -23,6 +23,7 @@ Synopsis | [--grid-check none|discard_missing|sort|known_available] | [--pivot-crs always|if_no_direct_transformation|never|{auth:code[,auth:code]*}] | [--show-superseded] [--hide-ballpark] + | [--allow-ellipsoidal-height-as-vertical-crs] | [--boundcrs-to-wgs84] | [--main-db-path path] [--aux-db-path path]* | [--identify] [--3d] @@ -212,6 +213,15 @@ The following control parameters can appear in any order: .. note:: only used for coordinate operation computation +.. option:: --allow-ellipsoidal-height-as-vertical-crs + + .. versionadded:: 8.0 + + Allow to export a geographic or projected 3D CRS as a compound CRS whose + vertical CRS represents the ellipsoidal height. + + .. note:: only used for CRS, and with WKT1:GDAL output format + .. option:: --boundcrs-to-wgs84 When specified, this option researches a coordinate operation from the -- cgit v1.2.3 From 0b4c8b0a76c65d8b1146224bf314cad53e9f6607 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 28 Nov 2020 15:51:27 +0100 Subject: cs2cs: add --area and --bbox options to restrict candidate coordinate operations (fixes #2423) --- docs/source/apps/cs2cs.rst | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'docs/source/apps') diff --git a/docs/source/apps/cs2cs.rst b/docs/source/apps/cs2cs.rst index e214a5c0..7fe570d9 100644 --- a/docs/source/apps/cs2cs.rst +++ b/docs/source/apps/cs2cs.rst @@ -11,11 +11,15 @@ cs2cs Synopsis ******** - **cs2cs** [**-eEfIlrstvwW** [args]] [*+opt[=arg]* ...] [+to *+opt[=arg]* ...] file ... + **cs2cs** [**-eEfIlrstvwW** [args]] + [[--area name_or_code] | [--bbox west_long,south_lat,east_long,north_lat]] + [*+opt[=arg]* ...] [+to *+opt[=arg]* ...] file ... or - **cs2cs** [**-eEfIlrstvwW** [args]] {source_crs} {target_crs} file ... + **cs2cs** [**-eEfIlrstvwW** [args]] [--area name_or_code] + [[--area name_or_code] | [--bbox west_long,south_lat,east_long,north_lat]] + {source_crs} {target_crs} file ... where {source_crs} or {target_crs} is one of the possibilities accepted by :c:func:`proj_create`, provided it expresses a CRS @@ -144,6 +148,27 @@ The following control parameters can appear in any order: Causes a listing of cartographic control parameters tested for and used by the program to be printed prior to input data. +.. option:: --area name_or_code + + .. versionadded:: 8.0.0 + + Specify an area of interest to restrict the results when researching + coordinate operations between 2 CRS. The area of interest can be specified either + as a name (e.g "Denmark - onshore") or a AUTHORITY:CODE (EPSG:3237) + + This option is mutually exclusive with :option:`--bbox`. + +.. option:: --bbox west_long,south_lat,east_long,north_lat + + .. versionadded:: 8.0.0 + + Specify an area of interest to restrict the results when researching + coordinate operations between 2 CRS. The area of interest is specified as a + bounding box with geographic coordinates, expressed in degrees in a + unspecified geographic CRS. + `west_long` and `east_long` should be in the [-180,180] range, and + `south_lat` and `north_lat` in the [-90,90]. `west_long` is generally lower than + `east_long`, except in the case where the area of interest crosses the antimeridian. .. only:: man -- cgit v1.2.3 From 18ab7ef2e357e0c01464848a6911e754ebca471f Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 2 Dec 2020 17:12:54 +0100 Subject: cs2cs / proj_create_crs_to_crs_from_pj(): add a --authority switch to control where coordinate operations are looked for (fixes #2442) --- docs/source/apps/cs2cs.rst | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'docs/source/apps') diff --git a/docs/source/apps/cs2cs.rst b/docs/source/apps/cs2cs.rst index 7fe570d9..7df8890f 100644 --- a/docs/source/apps/cs2cs.rst +++ b/docs/source/apps/cs2cs.rst @@ -11,15 +11,11 @@ cs2cs Synopsis ******** - **cs2cs** [**-eEfIlrstvwW** [args]] - [[--area name_or_code] | [--bbox west_long,south_lat,east_long,north_lat]] - [*+opt[=arg]* ...] [+to *+opt[=arg]* ...] file ... - -or - - **cs2cs** [**-eEfIlrstvwW** [args]] [--area name_or_code] - [[--area name_or_code] | [--bbox west_long,south_lat,east_long,north_lat]] - {source_crs} {target_crs} file ... + | **cs2cs** [**-eEfIlrstvwW** [args]] + | [[--area ] | [--bbox ]] + | [--authority ] + | ([*+opt[=arg]* ...] [+to *+opt[=arg]* ...] | {source_crs} {target_crs}) + | file ... where {source_crs} or {target_crs} is one of the possibilities accepted by :c:func:`proj_create`, provided it expresses a CRS @@ -148,7 +144,7 @@ The following control parameters can appear in any order: Causes a listing of cartographic control parameters tested for and used by the program to be printed prior to input data. -.. option:: --area name_or_code +.. option:: --area .. versionadded:: 8.0.0 @@ -158,7 +154,7 @@ The following control parameters can appear in any order: This option is mutually exclusive with :option:`--bbox`. -.. option:: --bbox west_long,south_lat,east_long,north_lat +.. option:: --bbox .. versionadded:: 8.0.0 @@ -170,6 +166,21 @@ The following control parameters can appear in any order: `south_lat` and `north_lat` in the [-90,90]. `west_long` is generally lower than `east_long`, except in the case where the area of interest crosses the antimeridian. +.. option:: --authority + + .. versionadded:: 8.0.0 + + This option can be used to restrict the authority of coordinate operations + looked up in the database. When not specified, coordinate + operations from any authority will be searched, with the restrictions set + in the ``authority_to_authority_preference`` database table related to the authority + of the source/target CRS themselves. + If authority is set to ``any``, then coordinate operations from any authority will be searched + If authority is a non-empty string different of ``any``, then coordinate operations + will be searched only in that authority namespace (e.g ``EPSG``). + + This option is mutually exclusive with :option:`--bbox`. + .. only:: man The *+opt* run-line arguments are associated with cartographic -- cgit v1.2.3