diff options
| -rw-r--r-- | docs/source/operations/projections/utm.rst | 2 | ||||
| -rw-r--r-- | src/projections/stere.cpp | 5 | ||||
| -rw-r--r-- | src/projections/tmerc.cpp | 5 | ||||
| -rw-r--r-- | test/gie/builtins.gie | 14 |
4 files changed, 17 insertions, 9 deletions
diff --git a/docs/source/operations/projections/utm.rst b/docs/source/operations/projections/utm.rst index 57df860d..e0ea89e4 100644 --- a/docs/source/operations/projections/utm.rst +++ b/docs/source/operations/projections/utm.rst @@ -11,7 +11,7 @@ longigude. +---------------------+----------------------------------------------------------+ | **Classification** | Transverse cylindrical, conformal | +---------------------+----------------------------------------------------------+ -| **Available forms** | Forward and inverse, Spherical and Elliptical | +| **Available forms** | Forward and inverse, Elliptical only | +---------------------+----------------------------------------------------------+ | **Defined area** | Within the used zone, but transformations of coordinates | | | in adjacent zones can be expected to be accurate as well | diff --git a/src/projections/stere.cpp b/src/projections/stere.cpp index d95bb7fa..abc4aa13 100644 --- a/src/projections/stere.cpp +++ b/src/projections/stere.cpp @@ -5,7 +5,7 @@ #include <math.h> PROJ_HEAD(stere, "Stereographic") "\n\tAzi, Sph&Ell\n\tlat_ts="; -PROJ_HEAD(ups, "Universal Polar Stereographic") "\n\tAzi, Sph&Ell\n\tsouth"; +PROJ_HEAD(ups, "Universal Polar Stereographic") "\n\tAzi, Ell\n\tsouth"; namespace { // anonymous namespace @@ -320,8 +320,7 @@ PJ *PROJECTION(ups) { /* International Ellipsoid */ P->phi0 = pj_param(P->ctx, P->params, "bsouth").i ? - M_HALFPI: M_HALFPI; if (P->es == 0.0) { - proj_errno_set(P, PJD_ERR_ELLIPSOID_USE_REQUIRED); - return pj_default_destructor (P, ENOMEM); + return pj_default_destructor (P, PJD_ERR_ELLIPSOID_USE_REQUIRED); } P->k0 = .994; P->x0 = 2000000.; diff --git a/src/projections/tmerc.cpp b/src/projections/tmerc.cpp index 4b2a96f0..eda1f23d 100644 --- a/src/projections/tmerc.cpp +++ b/src/projections/tmerc.cpp @@ -22,7 +22,7 @@ PROJ_HEAD(tmerc, "Transverse Mercator") "\n\tCyl, Sph&Ell\n\tapprox"; PROJ_HEAD(etmerc, "Extended Transverse Mercator") "\n\tCyl, Sph"; -PROJ_HEAD(utm, "Universal Transverse Mercator (UTM)") "\n\tCyl, Sph\n\tzone= south approx"; +PROJ_HEAD(utm, "Universal Transverse Mercator (UTM)") "\n\tCyl, Ell\n\tzone= south approx"; namespace { // anonymous namespace struct pj_opaque_approx { @@ -541,8 +541,7 @@ PJ *PROJECTION(etmerc) { PJ *PROJECTION(utm) { long zone; if (P->es == 0.0) { - proj_errno_set(P, PJD_ERR_ELLIPSOID_USE_REQUIRED); - return pj_default_destructor(P, ENOMEM); + return pj_default_destructor(P, PJD_ERR_ELLIPSOID_USE_REQUIRED); } if (P->lam0 < -1000.0 || P->lam0 > 1000.0) { return pj_default_destructor(P, PJD_ERR_INVALID_UTM_ZONE); diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index 47de961e..1c5eb3be 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -5554,7 +5554,7 @@ expect -0.001790432 -0.000841228 =============================================================================== Universal Polar Stereographic - Azi, Sph&Ell + Azi, Ell south =============================================================================== @@ -5581,6 +5581,10 @@ expect -45.004297076 64.915804281 accept -200 -100 expect -45.001432287 64.914588378 +------------------------------------------------------------------------------- +operation +proj=ups +a=6400000 +------------------------------------------------------------------------------- +expect failure errno ellipsoid_use_required =============================================================================== Urmaev V @@ -5636,7 +5640,7 @@ expect -0.002040721 -0.000785474 =============================================================================== Universal Transverse Mercator (UTM) - Cyl, Sph + Cyl, Ell zone= south =============================================================================== @@ -5674,6 +5678,12 @@ tolerance 0.001 mm accept 12 56 0 2000 expect 687071.43911000 6210141.32675053 0.00000000 2000.0000 + +------------------------------------------------------------------------------- +operation +proj=utm +a=6400000 +zone=30 +------------------------------------------------------------------------------- +expect failure errno ellipsoid_use_required + =============================================================================== van der Grinten (I) Misc Sph |