diff options
| author | Thomas Knudsen <busstoptaktik@users.noreply.github.com> | 2017-10-27 22:50:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-27 22:50:40 +0200 |
| commit | 5646ff12f32adf78e2bc187e6557ce64e4e04b39 (patch) | |
| tree | 508d648e1ed084a8d3aa20de7d99ec78bd9fe363 /src/PJ_pipeline.c | |
| parent | 9649cc099728162c4c8862b7d5a69d0dfee92c1d (diff) | |
| download | PROJ-5646ff12f32adf78e2bc187e6557ce64e4e04b39.tar.gz PROJ-5646ff12f32adf78e2bc187e6557ce64e4e04b39.zip | |
Linguistics: Clarify this and that, here and there (#632)
* Linguistics: Clarify this and that, here and there
* Revert nullification of PJ_cart->fwd, inv
Diffstat (limited to 'src/PJ_pipeline.c')
| -rw-r--r-- | src/PJ_pipeline.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/PJ_pipeline.c b/src/PJ_pipeline.c index 137fdec8..ab2d3420 100644 --- a/src/PJ_pipeline.c +++ b/src/PJ_pipeline.c @@ -45,9 +45,10 @@ It is a very powerful concept, that increases the range of relevance of the proj.4 system substantially. It is, however, not a particularly intrusive - addition to the code base: The implementation is by and large completed by - adding an extra projection called "pipeline" (i.e. this file), which - handles all business. + addition to the PROJ.4 code base: The implementation is by and large completed + by adding an extra projection called "pipeline" (i.e. this file), which + handles all business, and a small amount of added functionality in the + pj_init code, implementing support for multilevel, embedded pipelines. Syntactically, the pipeline system introduces the "+step" keyword (which indicates the start of each transformation step), the "+omit_fwd" and @@ -63,10 +64,11 @@ Where <ARGS> indicate the Helmert arguments: 3 translations (+x=..., +y=..., +z=...), 3 rotations (+rx=..., +ry=..., +rz=...) and a scale factor (+s=...). - Following geodetic conventions, the rotations are given in Milliarcseconds, + Following geodetic conventions, the rotations are given in arcseconds, and the scale factor is given as parts-per-million. - [1] B. W. Kernighan & P. J. Plauger: Software tools. Addison-Wesley, 1976, 338 pp. + [1] B. W. Kernighan & P. J. Plauger: Software tools. + Reading, Massachusetts, Addison-Wesley, 1976, 338 pp. ******************************************************************************** @@ -156,10 +158,11 @@ static LP pipeline_reverse (XY xyz, PJ *P); The P->left and P->right elements indicate isomorphism. - For classic proj style projections, they both have the - value PJ_IO_UNITS_CLASSIC (default initialization), indicating - that the forward driver expects angular input coordinates, and - provides linear output coordinates. + For classic proj style projections, P->left has the value + PJ_IO_UNITS_RADIANS, while P->right has the value + PJ_IO_UNITS_CLASSIC, indicating that the forward driver expects + angular input coordinates, and provides linear output coordinates, + scaled by the P->a semimajor axis length. Newer projections may set P->left and P->right to either PJ_IO_UNITS_METERS, PJ_IO_UNITS_RADIANS or PJ_IO_UNITS_ANY, |
