From 62b81642ae5226d8aefcc1da7e30cc2d2e65e697 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Fri, 24 Aug 2018 17:00:32 +0200 Subject: Improve numerical precision of inverse spherical mercator Complements f2b3604 --- src/PJ_merc.c | 2 +- test/gie/builtins.gie | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/PJ_merc.c b/src/PJ_merc.c index 46cd4b3d..1998234e 100644 --- a/src/PJ_merc.c +++ b/src/PJ_merc.c @@ -57,7 +57,7 @@ static LP e_inverse (XY xy, PJ *P) { /* Ellipsoidal, inverse */ static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */ LP lp = {0.0,0.0}; - lp.phi = M_HALFPI - 2. * atan(exp(-xy.y / P->k0)); + lp.phi = atan(sinh(xy.y / P->k0)); lp.lam = xy.x / P->k0; return lp; } diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index 3e2059c1..b5dc3ab1 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -2928,6 +2928,16 @@ accept -200 -100 expect -0.001790493 -0.000895247 +------------------------------------------------------------------------------- +operation +proj=merc +R=1 +------------------------------------------------------------------------------- +Test the numerical stability of the inverse spherical Mercator +------------------------------------------------------------------------------- +tolerance 1e-15 m +accept 0 1e-15 +expect 0 1e-15 + + =============================================================================== Miller Oblated Stereographic Azi(mod) -- cgit v1.2.3