diff options
Diffstat (limited to 'src/projections/putp2.cpp')
| -rw-r--r-- | src/projections/putp2.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/projections/putp2.cpp b/src/projections/putp2.cpp index a11e479e..5ff44000 100644 --- a/src/projections/putp2.cpp +++ b/src/projections/putp2.cpp @@ -17,39 +17,39 @@ PROJ_HEAD(putp2, "Putnins P2") "\n\tPCyl, Sph"; static PJ_XY putp2_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */ PJ_XY xy = {0.0,0.0}; - double p, c, s, V; - int i; - (void) P; - - p = C_p * sin(lp.phi); - s = lp.phi * lp.phi; - lp.phi *= 0.615709 + s * ( 0.00909953 + s * 0.0046292 ); - for (i = NITER; i ; --i) { - c = cos(lp.phi); - s = sin(lp.phi); - lp.phi -= V = (lp.phi + s * (c - 1.) - p) / - (1. + c * (c - 1.) - s * s); - if (fabs(V) < EPS) - break; - } - if (!i) - lp.phi = lp.phi < 0 ? - PI_DIV_3 : PI_DIV_3; - xy.x = C_x * lp.lam * (cos(lp.phi) - 0.5); - xy.y = C_y * sin(lp.phi); - - return xy; + int i; + (void) P; + + const double p = C_p * sin(lp.phi); + const double phi_pow_2 = lp.phi * lp.phi; + lp.phi *= 0.615709 + phi_pow_2 * ( 0.00909953 + phi_pow_2 * 0.0046292 ); + for (i = NITER; i ; --i) { + const double c = cos(lp.phi); + const double s = sin(lp.phi); + const double V = (lp.phi + s * (c - 1.) - p) / + (1. + c * (c - 1.) - s * s); + lp.phi -= V; + if (fabs(V) < EPS) + break; + } + if (!i) + lp.phi = lp.phi < 0 ? - PI_DIV_3 : PI_DIV_3; + xy.x = C_x * lp.lam * (cos(lp.phi) - 0.5); + xy.y = C_y * sin(lp.phi); + + return xy; } static PJ_LP putp2_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */ PJ_LP lp = {0.0,0.0}; - double c; - lp.phi = aasin(P->ctx,xy.y / C_y); - lp.lam = xy.x / (C_x * ((c = cos(lp.phi)) - 0.5)); - lp.phi = aasin(P->ctx,(lp.phi + sin(lp.phi) * (c - 1.)) / C_p); + lp.phi = aasin(P->ctx,xy.y / C_y); + const double c = cos(lp.phi); + lp.lam = xy.x / (C_x * (c - 0.5)); + lp.phi = aasin(P->ctx,(lp.phi + sin(lp.phi) * (c - 1.)) / C_p); - return lp; + return lp; } |
