diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-05-01 18:42:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-01 18:42:13 +0200 |
| commit | fc48053092b4b6f496bb983765ebf619a356e257 (patch) | |
| tree | 2c53161326b766dc41e4733ce6579503fc702384 /src/projections/bonne.cpp | |
| parent | e168ad31badb6702240174250894a76385da323b (diff) | |
| parent | eeda5f7e5fd94a0cdcbf90df1f0b04a090f4c037 (diff) | |
| download | PROJ-fc48053092b4b6f496bb983765ebf619a356e257.tar.gz PROJ-fc48053092b4b6f496bb983765ebf619a356e257.zip | |
Merge branch 'master' into check_exported_symbols
Diffstat (limited to 'src/projections/bonne.cpp')
| -rw-r--r-- | src/projections/bonne.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/projections/bonne.cpp b/src/projections/bonne.cpp index 289eb23d..31f90907 100644 --- a/src/projections/bonne.cpp +++ b/src/projections/bonne.cpp @@ -20,7 +20,7 @@ struct pj_opaque { } // anonymous namespace -static PJ_XY e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */ +static PJ_XY bonne_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */ PJ_XY xy = {0.0,0.0}; struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque); double rh, E, c; @@ -38,7 +38,7 @@ static PJ_XY e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */ } -static PJ_XY s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */ +static PJ_XY bonne_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */ PJ_XY xy = {0.0,0.0}; struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque); double E, rh; @@ -53,7 +53,7 @@ static PJ_XY s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */ } -static PJ_LP s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */ +static PJ_LP bonne_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */ PJ_LP lp = {0.0,0.0}; struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque); double rh; @@ -72,7 +72,7 @@ static PJ_LP s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */ } -static PJ_LP e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */ +static PJ_LP bonne_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */ PJ_LP lp = {0.0,0.0}; struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque); double s, rh; @@ -125,15 +125,15 @@ PJ *PROJECTION(bonne) { Q->m1 = pj_mlfn(Q->phi1, Q->am1 = sin(Q->phi1), c = cos(Q->phi1), Q->en); Q->am1 = c / (sqrt(1. - P->es * Q->am1 * Q->am1) * Q->am1); - P->inv = e_inverse; - P->fwd = e_forward; + P->inv = bonne_e_inverse; + P->fwd = bonne_e_forward; } else { if (fabs(Q->phi1) + EPS10 >= M_HALFPI) Q->cphi1 = 0.; else Q->cphi1 = 1. / tan(Q->phi1); - P->inv = s_inverse; - P->fwd = s_forward; + P->inv = bonne_s_inverse; + P->fwd = bonne_s_forward; } return P; } |