From d6aaddc5e0cb2bd9080a8fc4b77de947172c81d8 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Mon, 4 Feb 2019 14:48:52 +0100 Subject: Remove all traces of nad2bin and nad2nad The source material for the default grids used by PROJ has been moved to the proj-datumgrid repository. For that reason it is no longer necessary to include the nad2bin program in the PROJ repository and source distribution. From now on the nad2bin application will be kept in the proj-datumgrid repo. Previously the null grid was generated by running nad2bin on the null.lla file. Since nad2bin is no longer available null.lla has been replaced by its binary counterpart null. This file will be distributed and installed alongside PROJ. Build scripts and documenation has been adjusted so that nad2bin is not mentioned anywhere. Additionally all references to nad2nad has been removed as well. nad2nad has not been part of the PROJ distribution for quite some time so this has been long overdue. --- docs/source/usage/transformation.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docs/source') diff --git a/docs/source/usage/transformation.rst b/docs/source/usage/transformation.rst index bc5c3b1b..da856a01 100644 --- a/docs/source/usage/transformation.rst +++ b/docs/source/usage/transformation.rst @@ -210,8 +210,7 @@ at each grid location. Actually grid shifts are normally computed based on an interpolation between the containing four grid points. PROJ supports use of grid files for shifting between various reference frames. -The grid shift table formats are ctable (the binary format produced by the PROJ -``nad2bin`` program), NTv1 (the old Canadian format), and NTv2 (``.gsb`` - the new +The grid shift table formats are ctable, NTv1 (the old Canadian format), and NTv2 (``.gsb`` - the new Canadian and Australian format). The text in this section is based on the *cs2cs* framework. Gridshifting is off -- cgit v1.2.3 From 5141b3908e59a26c9fe66de94bb7388bff741b58 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Mon, 11 Feb 2019 23:58:16 +0100 Subject: Make tmerc an alias for etmerc. (#1234) * Make tmerc an alias for etmerc This switches the algorithm used in tmerc to the Poder/Engsager tmerc algorithm. The original tmerc algorithm of Evenden/Snyder origin can still be accessed by adding the +approx flag when initializing a tmerc projection. The +approx flag can also be used when initializing UTM projections, in which case the Evenden/Snyder algorithm is used as well. If a tmerc projection is instantiated on a spherical earth the Evenden/Snyder algorithm is used as well since the Poder/Engsager algorithm is only defined on the ellipsoid. +proj=etmerc can still be instantiated for backwards compatibility reasons. Co-authored-by: Kristian Evers Co-authored-by: Even Rouault --- docs/source/operations/projections/etmerc.rst | 32 --------------------- .../operations/projections/images/etmerc.png | Bin 222004 -> 0 bytes docs/source/operations/projections/index.rst | 1 - docs/source/operations/projections/tmerc.rst | 8 +++++- docs/source/operations/projections/utm.rst | 6 ++++ 5 files changed, 13 insertions(+), 34 deletions(-) delete mode 100644 docs/source/operations/projections/etmerc.rst delete mode 100644 docs/source/operations/projections/images/etmerc.png (limited to 'docs/source') diff --git a/docs/source/operations/projections/etmerc.rst b/docs/source/operations/projections/etmerc.rst deleted file mode 100644 index 2a007130..00000000 --- a/docs/source/operations/projections/etmerc.rst +++ /dev/null @@ -1,32 +0,0 @@ -.. _etmerc: - -******************************************************************************** -Extended Transverse Mercator -******************************************************************************** - -.. figure:: ./images/etmerc.png - :width: 500 px - :align: center - :alt: Extended Transverse Mercator - - proj-string: ``+proj=etmerc +lon_0=-40`` - -Parameters -################################################################################ - -.. note:: All parameters for the projection are optional. - -.. include:: ../options/lon_0.rst - -.. include:: ../options/lat_0.rst - -.. include:: ../options/ellps.rst - -.. include:: ../options/R.rst - -.. include:: ../options/k_0.rst - -.. include:: ../options/x_0.rst - -.. include:: ../options/y_0.rst - diff --git a/docs/source/operations/projections/images/etmerc.png b/docs/source/operations/projections/images/etmerc.png deleted file mode 100644 index 35bce083..00000000 Binary files a/docs/source/operations/projections/images/etmerc.png and /dev/null differ diff --git a/docs/source/operations/projections/index.rst b/docs/source/operations/projections/index.rst index 572deb1a..e6ec9076 100644 --- a/docs/source/operations/projections/index.rst +++ b/docs/source/operations/projections/index.rst @@ -43,7 +43,6 @@ Projections map the spherical 3D space to a flat 2D space. eqdc eqearth euler - etmerc fahey fouc fouc_s diff --git a/docs/source/operations/projections/tmerc.rst b/docs/source/operations/projections/tmerc.rst index 6d1c145d..fd600001 100644 --- a/docs/source/operations/projections/tmerc.rst +++ b/docs/source/operations/projections/tmerc.rst @@ -68,13 +68,19 @@ Example using Gauss-Kruger on Germany area (aka EPSG:31467) :: Example using Gauss Boaga on Italy area (EPSG:3004) :: $ echo 15 42 | proj +proj=tmerc +lat_0=0 +lon_0=15 +k_0=0.9996 +x_0=2520000 +y_0=0 +ellps=intl +units=m +no_defs - 2520000.00 4649858.60 + 2520000.00 4649858.60 Parameters ################################################################################ .. note:: All parameters for the projection are optional. +.. option:: +approx + + .. versionadded:: 6.0.0 + + Use faster, less accurate algorithm for the Transverse Mercator. + .. include:: ../options/lon_0.rst .. include:: ../options/lat_0.rst diff --git a/docs/source/operations/projections/utm.rst b/docs/source/operations/projections/utm.rst index ac65aa1a..8759f4eb 100644 --- a/docs/source/operations/projections/utm.rst +++ b/docs/source/operations/projections/utm.rst @@ -66,6 +66,12 @@ Required Add this flag when using the UTM on the southern hemisphere. +.. option:: +approx + + .. versionadded:: 6.0.0 + + Use faster, less accurate algorithm for the Transverse Mercator. + Optional ------------------------------------------------------------------------------- -- cgit v1.2.3