From 2d4ff76329ce598e9d11688fa47cc5bd0a9f37af Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Sat, 23 Feb 2019 12:02:16 +0100 Subject: Fix spelling errors. * specfied -> specified --- docs/source/apps/projinfo.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/source/apps') diff --git a/docs/source/apps/projinfo.rst b/docs/source/apps/projinfo.rst index af9ed171..fb17e480 100644 --- a/docs/source/apps/projinfo.rst +++ b/docs/source/apps/projinfo.rst @@ -103,7 +103,7 @@ The following control parameters can appear in any order: .. option:: --spatial-test contains|intersects Specify how the area of use of coordinate operations found in the database - are compared to the area of use specfied explicitly with :option:`--area` or :option:`--bbox`, + are compared to the area of use specified explicitly with :option:`--area` or :option:`--bbox`, or derivedi implictly from the area of use of the source and target CRS. By default, projinfo will only keep coordinate operations whose are of use is strictly within the area of interest (``contains`` strategy). -- cgit v1.2.3 From 2b880212e9b2ff6faeafb1f98c8fa76469c5907a Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Thu, 28 Feb 2019 22:49:31 +1300 Subject: Miscellaneous documentation fixes - Corrections to BibTeX references, normalise format with JabRef - Typos in projinfo - Simplify update CITATION step --- 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 fb17e480..151b3079 100644 --- a/docs/source/apps/projinfo.rst +++ b/docs/source/apps/projinfo.rst @@ -67,7 +67,7 @@ The following control parameters can appear in any order: .. option:: --summary When listing coordinate operations available between 2 CRS, return the - result in a summary format, mentionning only the name of the coordinate + result in a summary format, mentioning only the name of the coordinate operation, its accuracy and its area of use. .. note:: only used for coordinate operation computation @@ -104,7 +104,7 @@ The following control parameters can appear in any order: Specify how the area of use of coordinate operations found in the database are compared to the area of use specified explicitly with :option:`--area` or :option:`--bbox`, - or derivedi implictly from the area of use of the source and target CRS. + or derived implicitly from the area of use of the source and target CRS. By default, projinfo will only keep coordinate operations whose are of use is strictly within the area of interest (``contains`` strategy). If using the ``intersects`` strategy, the spatial test is relaxed, and any -- cgit v1.2.3 From 76033f2d8b91518301a8421feb0be74fe374b53d Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Mon, 4 Mar 2019 22:40:44 +0100 Subject: Improve formatting of program references on apps index --- docs/source/apps/index.rst | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'docs/source/apps') diff --git a/docs/source/apps/index.rst b/docs/source/apps/index.rst index 8c2c8222..381b8933 100644 --- a/docs/source/apps/index.rst +++ b/docs/source/apps/index.rst @@ -4,15 +4,16 @@ Applications ================================================================================ -Bundled with PROJ comes a set of small command line utilities. The ``proj`` +Bundled with PROJ comes a set of small command line utilities. The :program:`proj` program is limited to converting between geographic and projection coordinates -within one datum. The ``cs2cs`` program operates similarly, but allows +within one datum. The :program:`cs2cs` program operates similarly, but allows translation between any pair of definable coordinate systems, including support -for datum transformation. The ``geod`` program provides the ability to do -geodesic (great circle) computations. ``gie`` is the program used for -regression tests in PROJ. ``cct`` a 4D equivalent to the ``proj`` program, -performs transformation coordinate systems on a set of input points. -``projinfo`` performs queries for geodetic objects and coordinate operations. +for datum transformation. The :program:`geod` program provides the ability to do +geodesic (great circle) computations. :program:`gie` is the program used for +regression tests in PROJ. :program:`cct`, a 4D equivalent to the :program:`proj` +program, performs transformation coordinate systems on a set of input points. +:program:`projinfo` performs queries for geodetic objects and coordinate +operations. .. toctree:: :maxdepth: 1 -- cgit v1.2.3 From a30685b6e76092c89c6a9ec03c0d29e3dcad2850 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Wed, 6 Mar 2019 15:02:10 +0100 Subject: Make proper reference to 'gie --list' --- docs/source/apps/gie.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/source/apps') diff --git a/docs/source/apps/gie.rst b/docs/source/apps/gie.rst index 8cbd2336..bab0ec69 100644 --- a/docs/source/apps/gie.rst +++ b/docs/source/apps/gie.rst @@ -172,7 +172,7 @@ gie command language proj=urm5 n=0.5 inv expect failure pjd_err_malformed_pipeline - See ``gie -l`` for a list of error codes that can be expected. + See :option:`gie --list<--list>` for a list of error codes that can be expected. .. option:: tolerance @@ -273,7 +273,7 @@ gie command language expect 173 -45 - See ``gie -l`` for a list of error codes that can be ignored. + See :option:`gie --list<--list>` for a list of error codes that can be ignored. .. option:: require_grid -- cgit v1.2.3 From c5cc0f74fd912cef2872da227fa2bb2b47f116c6 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 19 Mar 2019 11:11:42 +0100 Subject: Doc: impove doc about OGC URN --- docs/source/apps/projinfo.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'docs/source/apps') diff --git a/docs/source/apps/projinfo.rst b/docs/source/apps/projinfo.rst index 151b3079..d4c0a6ba 100644 --- a/docs/source/apps/projinfo.rst +++ b/docs/source/apps/projinfo.rst @@ -30,9 +30,11 @@ Synopsis | where {object_definition} or {object_definition} is a PROJ string, a - WKT string, an object name or a AUTHORITY:CODE + WKT string, an object name, AUTHORITY:CODE (where AUTHORITY is the name of a CRS authority and CODE the code of a CRS - found in the proj.db database). + found in the proj.db database) or a OGC URN (such as "urn:ogc:def:crs:EPSG::4326", + "urn:ogc:def:coordinateOperation:EPSG::1671", "urn:ogc:def:ellipsoid:EPSG::7001" + or "urn:ogc:def:datum:EPSG::6326") Description *********** -- cgit v1.2.3 From 5d74522573291a8af698acf3102a662eb3a675eb Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Thu, 21 Mar 2019 17:30:06 +1000 Subject: Add -k ellipsoid option to projinfo (#1338) Allows querying of ellipsoid definitions by auth:code lookup --- docs/source/apps/projinfo.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/source/apps') diff --git a/docs/source/apps/projinfo.rst b/docs/source/apps/projinfo.rst index d4c0a6ba..7e84823b 100644 --- a/docs/source/apps/projinfo.rst +++ b/docs/source/apps/projinfo.rst @@ -16,7 +16,7 @@ Synopsis ******** | **projinfo** - | [-o formats] [-k crs|operation] [--summary] [-q] + | [-o formats] [-k crs|operation|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] @@ -60,10 +60,10 @@ The following control parameters can appear in any order: Except ``all`` and ``default``, other formats can be preceded by ``-`` to disable them. -.. option:: -k crs|operation +.. option:: -k crs|operation|ellipsoid When used to query a single object with a AUTHORITY:CODE, determines the (k)ind of the object - in case there are CRS or coordinate operations with the same CODE. + in case there are CRS, coordinate operations or ellipsoids with the same CODE. The default is crs. .. option:: --summary -- cgit v1.2.3 From 1eadd02ac0b28486e98aed9407f27c4956619bae Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Sun, 24 Mar 2019 11:56:35 +0000 Subject: Doc: consistently use +opt and brackets +opt represents one parameter. An ellipsis indicates additional instances of the previous parameter may be given. Spaces are used between parameters and before an ellipsis, not purely to format brackets. See man(1) SYNOPSIS conventions. --- docs/source/apps/cct.rst | 4 ++-- docs/source/apps/cs2cs.rst | 10 +++++----- docs/source/apps/geod.rst | 6 +++--- docs/source/apps/proj.rst | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'docs/source/apps') diff --git a/docs/source/apps/cct.rst b/docs/source/apps/cct.rst index 249d523a..629e181c 100644 --- a/docs/source/apps/cct.rst +++ b/docs/source/apps/cct.rst @@ -13,7 +13,7 @@ cct Synopsis ******** - **cct** [ **-cIostvz** [ args ] ] *+opts[=arg]* file[s] + **cct** [**-cIostvz** [args]] *+opt[=arg]* ... file ... Description *********** @@ -70,7 +70,7 @@ The following control parameters can appear in any order: Print version number. -The *+args* arguments are associated with coordinate operation parameters. +The *+opt* arguments are associated with coordinate operation parameters. Usage varies with operation. .. only:: html diff --git a/docs/source/apps/cs2cs.rst b/docs/source/apps/cs2cs.rst index 579dc65e..afe5a610 100644 --- a/docs/source/apps/cs2cs.rst +++ b/docs/source/apps/cs2cs.rst @@ -11,11 +11,11 @@ cs2cs Synopsis ******** - **cs2cs** [ **-eEfIlrstvwW** [ args ] ] [ *+opts[=arg]* ] [ +to [*+opts[=arg]*] ] file[s] + **cs2cs** [**-eEfIlrstvwW** [args]] [*+opt[=arg]* ...] [+to *+opt[=arg]* ...] file ... or - **cs2cs** [ **-eEfIlrstvwW** [ args ] ] {source_crs} +to {target_crs} file[s] + **cs2cs** [**-eEfIlrstvwW** [args]] {source_crs} +to {target_crs} file ... where {source_crs} or {target_crs} is a PROJ string, a WKT string or a AUTHORITY:CODE (where AUTHORITY is the name of a CRS authority and CODE the code of a CRS @@ -25,7 +25,7 @@ or or - **cs2cs** [ **-eEfIlrstvwW** [ args ] ] {source_crs} {target_crs} + **cs2cs** [**-eEfIlrstvwW** [args]] {source_crs} {target_crs} .. versionadded:: 6.0.0 @@ -132,12 +132,12 @@ The following control parameters can appear in any order: .. only:: man - The *+args* run-line arguments are associated with cartographic + The *+opt* run-line arguments are associated with cartographic parameters. .. only:: html - The *+args* run-line arguments are associated with cartographic + The *+opt* run-line arguments are associated with cartographic parameters. Usage varies with projection and for a complete description consult the :ref:`projection pages `. diff --git a/docs/source/apps/geod.rst b/docs/source/apps/geod.rst index e890aede..2897445d 100644 --- a/docs/source/apps/geod.rst +++ b/docs/source/apps/geod.rst @@ -7,9 +7,9 @@ geod Synopsis ******** - **geod** *+ellps=* [ **-afFIlptwW** [ args ] ] [ *+args* ] file[s] + **geod** *+ellps=* [**-afFIlptwW** [args]] [*+opt[=arg]* ...] file ... - **invgeod** *+ellps=* [ **-afFIlptwW** [ args ] ] [ *+args* ] file[s] + **invgeod** *+ellps=* [**-afFIlptwW** [args]] [*+opt[=arg]* ...] file ... Description *********** @@ -85,7 +85,7 @@ The following command-line options can appear in any order: This option causes the azimuthal values to be output as unsigned DMS numbers between 0 and 360 degrees. Also note :option:`-f`. -The *+args* command-line options are associated with geodetic +The *+opt* command-line options are associated with geodetic parameters for specifying the ellipsoidal or sphere to use. controls. The options are processed in left to right order from the command line. Reentry of an option is ignored with diff --git a/docs/source/apps/proj.rst b/docs/source/apps/proj.rst index 7585411f..2dbd104a 100644 --- a/docs/source/apps/proj.rst +++ b/docs/source/apps/proj.rst @@ -12,9 +12,9 @@ proj Synopsis ******** - **proj** [ **-beEfiIlmorsStTvVwW** ] [ args ] ] [ *+args* ] file[s] + **proj** [**-beEfiIlmorsStTvVwW**] [args]] [*+opt[=arg]* ...] file ... - **invproj** [ **-beEfiIlmorsStTvVwW** ] [ args ] ] [ *+args* ] file[s] + **invproj** [**-beEfiIlmorsStTvVwW**] [args]] [*+opt[=arg]* ...] file ... Description @@ -156,7 +156,7 @@ The following control parameters can appear in any order the projected point. :option:`-v` is implied with this option. -The *+args* run-line arguments are associated with cartographic parameters. +The *+opt* run-line arguments are associated with cartographic parameters. Additional projection control parameters may be contained in two auxiliary control files: the first is optionally referenced with the *+init=file:id* and the second is always processed after the name of the @@ -167,7 +167,7 @@ also used for supporting files like datum shift files. .. only:: html - Usage of *+args* varies with projection and for a complete description + Usage of *+opt* varies with projection and for a complete description consult the :ref:`projection pages `. -- cgit v1.2.3 From 999439858dd9cc98d0deb47169318f0124164bbb Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 28 Mar 2019 13:45:17 +0100 Subject: Doc: document --identify switch of projinfo (fixes #1332) --- 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 7e84823b..c8219838 100644 --- a/docs/source/apps/projinfo.rst +++ b/docs/source/apps/projinfo.rst @@ -193,6 +193,16 @@ The following control parameters can appear in any order: and their entries can refer to entries of the main database. The option may be repeated to specify several auxiliary databases. +.. option:: --identify + + When used with an object definition, this queries the PROJ database to find + known objects, typically CRS, that are close or identical to the object. + Each candidate object is associated with an approximate likelihood percentage. + This is useful when used with a WKT string that lacks a EPSG identifier, + such as ESRI WKT1. This might also be used with PROJ strings. + For example, `+proj=utm +zone=31 +datum=WGS84 +type=crs` will be identified + with a likelihood of 70% to EPSG:32631 + .. option:: --c-ify For developers only. Modify the string output of the utility so that it -- cgit v1.2.3 From 292807eee9e1194175b64cb5c0a9f0b432352abc Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 22 Apr 2019 20:05:36 +0200 Subject: proj_create(): add support for compoundCRS and concatenatedOperation named from their components Support following syntaxes: - OGC URN combining references for compoundCRS: e.g. "urn:ogc:def:crs,crs:EPSG::2393,crs:EPSG::5717" - its GDAL shortcut: e.g. "EPSG:2393+5717" - OGC URN combining references for concatenated operations: e.g. "urn:ogc:def:coordinateOperation,coordinateOperation:EPSG::3895,coordinateOperation:EPSG::1618" --- docs/source/apps/projinfo.rst | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'docs/source/apps') diff --git a/docs/source/apps/projinfo.rst b/docs/source/apps/projinfo.rst index c8219838..955b9a18 100644 --- a/docs/source/apps/projinfo.rst +++ b/docs/source/apps/projinfo.rst @@ -29,12 +29,17 @@ Synopsis | {object_definition} | (-s {srs_def} -t {srs_def}) | - where {object_definition} or {object_definition} is a PROJ string, a - WKT string, an object name, AUTHORITY:CODE - (where AUTHORITY is the name of a CRS authority and CODE the code of a CRS - found in the proj.db database) or a OGC URN (such as "urn:ogc:def:crs:EPSG::4326", - "urn:ogc:def:coordinateOperation:EPSG::1671", "urn:ogc:def:ellipsoid:EPSG::7001" - or "urn:ogc:def:datum:EPSG::6326") + where {object_definition} or {srs_def} is + + - a proj-string, + - a WKT string, + - an object code (like "EPSG:4326", "urn:ogc:def:crs:EPSG::4326", + "urn:ogc:def:coordinateOperation:EPSG::1671"), + - a OGC URN combining references for compound coordinate reference systems + (e.g "urn:ogc:def:crs,crs:EPSG::2393,crs:EPSG::5717" or custom abbreviated + syntax "EPSG:2393+5717"), + - a OGC URN combining references for concatenated operations + (e.g. "urn:ogc:def:coordinateOperation,coordinateOperation:EPSG::3895,coordinateOperation:EPSG::1618") Description *********** -- cgit v1.2.3