diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2013-10-21 20:56:49 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2013-10-21 20:56:49 +0000 |
| commit | dea2d656c4ca658239cb3d4d300c47b2477eb2ba (patch) | |
| tree | 8c3be0cbdb745047a904fef798558820587b9294 /src | |
| parent | ba401f0f66990d9ac69764b156646df907283933 (diff) | |
| download | PROJ-dea2d656c4ca658239cb3d4d300c47b2477eb2ba.tar.gz PROJ-dea2d656c4ca658239cb3d4d300c47b2477eb2ba.zip | |
Change handling of values nearly 90degrees away from the origin (#114)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2400 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src')
| -rw-r--r-- | src/PJ_omerc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/PJ_omerc.c b/src/PJ_omerc.c index c8888a83..3529b73c 100644 --- a/src/PJ_omerc.c +++ b/src/PJ_omerc.c @@ -48,8 +48,11 @@ FORWARD(e_forward); /* ellipsoid */ F_ERROR; v = 0.5 * P->ArB * log((1. - U)/(1. + U)); temp = cos(P->B * lp.lam); - u = (fabs(temp) < TOL) ? P->AB * lp.lam : - P->ArB * atan2((S * P->cosgam + V * P->singam) , temp); + if(fabs(temp) < TOL) { + u = P->A * lp.lam; + } else { + u = P->ArB * atan2((S * P->cosgam + V * P->singam), temp); + } } else { v = lp.phi > 0 ? P->v_pole_n : P->v_pole_s; u = P->ArB * lp.phi; |