From 570f569cb6338c3b830b76a55c9f9961da06e6e8 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 29 Sep 2018 13:32:34 +0200 Subject: Doc building: fix warning regarding Altamimi2002 citation not found There was an issue since transformation.rst which uses this citation is alphabetically after references.rst. The documented workaround in https://github.com/mcmtroffaes/sphinxcontrib-bibtex/issues/8 is to rename references.rst as zrefereces.rst, so it is alphabetically last. --- docs/source/index.rst | 2 +- docs/source/references.rst | 11 ----------- docs/source/zreferences.rst | 11 +++++++++++ 3 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 docs/source/references.rst create mode 100644 docs/source/zreferences.rst (limited to 'docs/source') diff --git a/docs/source/index.rst b/docs/source/index.rst index d09424c8..c367cafb 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -20,7 +20,7 @@ PROJ community/index faq glossary - references + zreferences .. only:: html diff --git a/docs/source/references.rst b/docs/source/references.rst deleted file mode 100644 index 384281cd..00000000 --- a/docs/source/references.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. _references: - -.. only:: not latex - - ================================================================================ - References - ================================================================================ - -.. bibliography:: references.bib - :cited: - :style: customstyle diff --git a/docs/source/zreferences.rst b/docs/source/zreferences.rst new file mode 100644 index 00000000..384281cd --- /dev/null +++ b/docs/source/zreferences.rst @@ -0,0 +1,11 @@ +.. _references: + +.. only:: not latex + + ================================================================================ + References + ================================================================================ + +.. bibliography:: references.bib + :cited: + :style: customstyle -- cgit v1.2.3 From 1583a566a208d2451fb1acc8bcf16fbd8151983e Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 29 Sep 2018 10:01:48 +0200 Subject: Add geographic offset transformation method. The Geographic offsets transformation adds an offset to the geographic longitude, latitude coordinates, and an offset to the ellipsoidal height. This method is normally only used when low accuracy is tolerated. It is documented as coordinate operation method code 9619 (for geographic 2D) and 9660 (for geographic 3D) in the EPSG dataset. It can also be used to implement the method Geographic2D with Height Offsets (code 9618) by noting that the input vertical component is a gravity-related height and the output vertical component is the ellispoid height (dh being the geoid undulation). It can also be used to implement the method Vertical offset (code 9616) It is used for example to transform: - from the old Greek geographic 2D CRS to the newer GGRS87 CRS - from Tokyo + JSLD69 height to WGS 84 - from Baltic 1977 height to Black Sea height It is also useful to document the implicit zero-offset transformation we do in pipelines such as +proj=pipeline +step +inv +proj=longlat +ellps=A +step +proj=longlat +ellps=B that can be explicited as +proj=pipeline +step +inv +proj=longlat +ellps=A +step +proj=geogoffset [+dlon=0 +dlat=0 +dh=0] +step +proj=longlat +ellps=B --- .../operations/transformations/geogoffset.rst | 68 ++++++++++++++++++++++ docs/source/operations/transformations/index.rst | 1 + docs/source/references.bib | 8 +++ 3 files changed, 77 insertions(+) create mode 100644 docs/source/operations/transformations/geogoffset.rst (limited to 'docs/source') diff --git a/docs/source/operations/transformations/geogoffset.rst b/docs/source/operations/transformations/geogoffset.rst new file mode 100644 index 00000000..91c91c83 --- /dev/null +++ b/docs/source/operations/transformations/geogoffset.rst @@ -0,0 +1,68 @@ +.. _geogoffset: + +================================================================================ +Geographic offsets +================================================================================ + +.. versionadded:: 6.0.0 + +The Geographic offsets transformation adds an offset to the geographic longitude, +latitude coordinates, and an offset to the ellipsoidal height. + ++---------------------+----------------------------------------------------------+ +| **Alias** | geogoffset | ++---------------------+----------------------------------------------------------+ +| **Domain** | 3D | ++---------------------+----------------------------------------------------------+ +| **Input type** | Geodetic coordinates (horizontal), meters (vertical) | ++---------------------+----------------------------------------------------------+ +| **output type** | Geodetic coordinates (horizontal), meters (vertical) | ++---------------------+----------------------------------------------------------+ + +This method is normally only used when low accuracy is tolerated. It is documented +as coordinate operation method code 9619 (for geographic 2D) and 9660 (for +geographic 3D) in the EPSG dataset (:cite:`EPSGGuidanceNumber7Part2`) + +It can also be used to implement the method Geographic2D with Height Offsets +(code 9618) by noting that the input vertical component is a gravity-related +height and the output vertical component is the ellispoid height (dh being +the geoid undulation). + +It can also be used to implement the method Vertical offset (code 9616) + +The reverse transformation simply consists in subtracting the offsets. + +Examples +############################################################################### + +Geographic offset from the old Greek geographic 2D CRS to the newer GGRS87 CRS:: + + proj=geogoffset dlon=0.28 dlat=-5.86 + +Conversion from Tokyo + JSLD69 height to WGS 84:: + + proj=geogoffset dlon=-13.97 dlat=7.94 dh=26.9 + +Conversion from Baltic 1977 height to Black Sea height:: + + proj=geogoffset dh=0.4 + + +Parameters +################################################################################ + +Optional +------------------------------------------------------------------------------- + +.. option:: +dlon= + + Offset in longitude, expressed in arc-second, to add. + +.. option:: +dlat= + + Offset in latitude, expressed in arc-second, to add. + +.. option:: +dh= + + Offset in height, expressed in meter, to add. + diff --git a/docs/source/operations/transformations/index.rst b/docs/source/operations/transformations/index.rst index 5112ffa2..c2fe6baa 100644 --- a/docs/source/operations/transformations/index.rst +++ b/docs/source/operations/transformations/index.rst @@ -11,6 +11,7 @@ systems are based on different datums. :maxdepth: 1 deformation + geogoffset helmert molodensky hgridshift diff --git a/docs/source/references.bib b/docs/source/references.bib index bd3089ee..0fb077ec 100644 --- a/docs/source/references.bib +++ b/docs/source/references.bib @@ -82,6 +82,14 @@ Url = {http://www.calcofi.org/publications/calcofireports/v20/Vol_20_Eber___Hewitt.pdf} } +@Manual{EPSGGuidanceNumber7Part2, + Title = {Geomatics Guidance Note 7, part 2 - Coordinate Conversions & Transformations including Formulas}, + Institution = {International Association For Oil And Gas Producers}, + Year = {2018}, + + Url = {https://www.iogp.org/bookstore/product/coordinate-conversions-and-transformation-including-formulas/} +} + @Manual{Evenden2005, Title = {libproj4: A Comprehensive Library of Cartographic Projection Functions (Preliminary Draft)}, Author = {G. I. Evenden}, -- cgit v1.2.3 From fe29f8acdce81607c11a597f4bffc7ff61fa9c19 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 1 Oct 2018 12:32:52 +0200 Subject: Add a affine transformation method, and make geogoffset as a particular case of it (fixes #535) --- docs/source/operations/transformations/affine.rst | 123 +++++++++++++++++++++ .../operations/transformations/geogoffset.rst | 2 + docs/source/operations/transformations/index.rst | 1 + 3 files changed, 126 insertions(+) create mode 100644 docs/source/operations/transformations/affine.rst (limited to 'docs/source') diff --git a/docs/source/operations/transformations/affine.rst b/docs/source/operations/transformations/affine.rst new file mode 100644 index 00000000..8b1681b3 --- /dev/null +++ b/docs/source/operations/transformations/affine.rst @@ -0,0 +1,123 @@ +.. _affine: + +================================================================================ +Affine transformation +================================================================================ + +.. versionadded:: 6.0.0 + +The affine transformation applies translation and scaling/rotation terms on the +x,y,z coordinates, and translation and scaling on the temporal cordinate. + ++---------------------+----------------------------------------------------------+ +| **Alias** | affine | ++---------------------+----------------------------------------------------------+ +| **Domain** | 4D | ++---------------------+----------------------------------------------------------+ +| **Input type** | XYZT | ++---------------------+----------------------------------------------------------+ +| **output type** | XYZT | ++---------------------+----------------------------------------------------------+ + +By default, the parameters are set for an identity transforms. The transformation +is reversible unless the determinant of the sji matrix is 0, or `tscale` is 0 + + +Parameters +################################################################################ + +Optional +------------------------------------------------------------------------------- + +.. option:: +xoff= + + Offset in X. Default value: 0 + +.. option:: +yoff= + + Offset in Y. Default value: 0 + +.. option:: +zoff= + + Offset in Z. Default value: 0 + +.. option:: +toff= + + Offset in T. Default value: 0 + +.. option:: +s11= + + Rotation/scaling term. Default value: 1 + +.. option:: +s12= + + Rotation/scaling term. Default value: 0 + +.. option:: +s13= + + Rotation/scaling term. Default value: 0 + +.. option:: +s21= + + Rotation/scaling term. Default value: 0 + +.. option:: +s22= + + Rotation/scaling term. Default value: 1 + +.. option:: +s23= + + Rotation/scaling term. Default value: 0 + +.. option:: +s31= + + Rotation/scaling term. Default value: 0 + +.. option:: +s32= + + Rotation/scaling term. Default value: 0 + +.. option:: +s33= + + Rotation/scaling term. Default value: 1 + +.. option:: +tscale= + + Time scaling term. Default value: 1 + + + +Mathematical description ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +.. math:: + :label: formula + + \begin{align} + \begin{bmatrix} + X \\ + Y \\ + Z \\ + T \\ + \end{bmatrix}^{dest} = + \begin{bmatrix} + xoff \\ + yoff \\ + zoff \\ + toff \\ + \end{bmatrix} + + \begin{bmatrix} + s11 & s12 & s13 & 0 \\ + s21 & s22 & s23 & 0 \\ + s31 & s32 & s33 & 0 \\ + 0 & 0 & 0 & tscale \\ + \end{bmatrix} + \begin{bmatrix} + X \\ + Y \\ + Z \\ + T \\ + \end{bmatrix}^{source} + \end{align} + + diff --git a/docs/source/operations/transformations/geogoffset.rst b/docs/source/operations/transformations/geogoffset.rst index 91c91c83..f643485e 100644 --- a/docs/source/operations/transformations/geogoffset.rst +++ b/docs/source/operations/transformations/geogoffset.rst @@ -32,6 +32,8 @@ It can also be used to implement the method Vertical offset (code 9616) The reverse transformation simply consists in subtracting the offsets. +This method is a conveniency wrapper for the more general :ref:`affine`. + Examples ############################################################################### diff --git a/docs/source/operations/transformations/index.rst b/docs/source/operations/transformations/index.rst index c2fe6baa..121215f7 100644 --- a/docs/source/operations/transformations/index.rst +++ b/docs/source/operations/transformations/index.rst @@ -10,6 +10,7 @@ systems are based on different datums. .. toctree:: :maxdepth: 1 + affine deformation geogoffset helmert -- cgit v1.2.3 From d4a1ea307207b0d28d4a139c881302198d296d33 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 28 Sep 2018 16:09:32 +0200 Subject: Remove nmake build system --- docs/source/faq.rst | 3 --- 1 file changed, 3 deletions(-) (limited to 'docs/source') diff --git a/docs/source/faq.rst b/docs/source/faq.rst index a03eae31..a218e1a8 100644 --- a/docs/source/faq.rst +++ b/docs/source/faq.rst @@ -49,9 +49,6 @@ After downloading and unpacking the PROJ source, also download and unpack the set of datum shift files. See :ref:`download` for instructions how to fetch and install these files -On Windows the extra nadshift target must be used. For instance -``nmake /f makefile.vc nadshift`` in the ``proj/src`` directory. - A default build and install on Unix will normally build knowledge of the directory where the grid shift files are installed into the PROJ library (usually ``/usr/local/share/proj``). On Windows the library is normally built -- cgit v1.2.3 From d6c97c29fa54d69e56475e155a5a208055eb3c13 Mon Sep 17 00:00:00 2001 From: Marco Bernasocchi Date: Mon, 8 Oct 2018 17:50:57 +0200 Subject: Update install.rst --- docs/source/install.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docs/source') diff --git a/docs/source/install.rst b/docs/source/install.rst index ea11f5ee..b8190c6b 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -26,13 +26,12 @@ from the ``conda-forge`` channel:: conda install -c conda-forge proj4 -Docker +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ A `Docker`_ image with just PROJ binaries and a full compliment of grid shift files is available on `DockerHub`_. Get the package with:: - docker pull osgeo/proj.4 + docker pull osgeo/proj .. _`Docker`: https://docker.org .. _`DockerHub`: https://hub.docker.com/r/osgeo/proj.4/ -- cgit v1.2.3 From 1f74ed59a8d7e267d86ce576f2653e04e5c2bffc Mon Sep 17 00:00:00 2001 From: Marco Bernasocchi Date: Mon, 8 Oct 2018 17:56:40 +0200 Subject: fix typo --- docs/source/install.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/source') diff --git a/docs/source/install.rst b/docs/source/install.rst index b8190c6b..240f81f9 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -26,6 +26,7 @@ from the ``conda-forge`` channel:: conda install -c conda-forge proj4 +Docker +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ A `Docker`_ image with just PROJ binaries and a full compliment of grid shift -- cgit v1.2.3 From 6c203a4395f30eae4f49230d2e2cb7652006b959 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 9 Oct 2018 21:04:47 +0200 Subject: Fix typos --- docs/source/faq.rst | 2 +- docs/source/operations/projections/lsat.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/source') diff --git a/docs/source/faq.rst b/docs/source/faq.rst index a218e1a8..f72ec132 100644 --- a/docs/source/faq.rst +++ b/docs/source/faq.rst @@ -130,7 +130,7 @@ How do I use 3 parameter and 7 parameter datum shifting Datum shifts can be approximated with 3 and 7 parameter transformations. Their use with :program:`cs2cs` is more fully described in the -:ref:`geodetic tranformation` section. +:ref:`geodetic transformation` section. More generically, the :ref:`helmert` can be used with :program:`cct`. diff --git a/docs/source/operations/projections/lsat.rst b/docs/source/operations/projections/lsat.rst index 4df944b5..c2b2d902 100644 --- a/docs/source/operations/projections/lsat.rst +++ b/docs/source/operations/projections/lsat.rst @@ -19,11 +19,11 @@ Required .. option:: +lsat= - Landsat satelite used for the projection. Value between 1 and 5. + Landsat satellite used for the projection. Value between 1 and 5. .. option:: +path= - Selected path of satelite. Value between 1 and 253 when :option:`+lsat` is + Selected path of satellite. Value between 1 and 253 when :option:`+lsat` is set to 1,2 or 3, otherwise valid input is between 1 and 233. -- cgit v1.2.3