diff options
| -rw-r--r-- | src/projections/lcc.cpp | 9 | ||||
| -rw-r--r-- | test/gie/builtins.gie | 15 |
2 files changed, 23 insertions, 1 deletions
diff --git a/src/projections/lcc.cpp b/src/projections/lcc.cpp index 5eee0d14..55d28b80 100644 --- a/src/projections/lcc.cpp +++ b/src/projections/lcc.cpp @@ -105,6 +105,9 @@ PJ *PROJECTION(lcc) { m1 = pj_msfn(sinphi, cosphi, P->es); ml1 = pj_tsfn(Q->phi1, sinphi, P->e); + if( ml1 == 0 ) { + return pj_default_destructor(P, PJD_ERR_LAT_1_OR_2_ZERO_OR_90); + } if (secant) { /* secant cone */ sinphi = sin(Q->phi2); Q->n = log(m1 / pj_msfn(sinphi, cos(Q->phi2), P->es)); @@ -112,7 +115,11 @@ PJ *PROJECTION(lcc) { // Not quite, but es is very close to 1... return pj_default_destructor(P, PJD_ERR_ECCENTRICITY_IS_ONE_OR_GREATER); } - Q->n /= log(ml1 / pj_tsfn(Q->phi2, sinphi, P->e)); + const double ml2 = pj_tsfn(Q->phi2, sinphi, P->e); + if( ml2 == 0 ) { + return pj_default_destructor(P, PJD_ERR_LAT_1_OR_2_ZERO_OR_90); + } + Q->n /= log(ml1 / ml2); } Q->c = (Q->rho0 = m1 * pow(ml1, -Q->n) / Q->n); Q->rho0 *= (fabs(fabs(P->phi0) - M_HALFPI) < EPS10) ? 0. : diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index 97009cff..a28ff45c 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -2687,6 +2687,21 @@ operation +proj=lcc +a=9999999 +b=.9 +lat_2=1 ------------------------------------------------------------------------- expect failure errno eccentricity_is_one +------------------------------------------------------------------------------- +operation +proj=lcc +ellps=GRS80 +lat_1=0 +lat_2=90 +------------------------------------------------------------------------------- +expect failure errno lat_1_or_2_zero_or_90 + +------------------------------------------------------------------------------- +operation +proj=lcc +ellps=GRS80 +lat_1=90 +lat_2=0 +------------------------------------------------------------------------------- +expect failure errno lat_1_or_2_zero_or_90 + +------------------------------------------------------------------------------- +operation +proj=lcc +ellps=GRS80 +lat_1=90 +lat_2=90 +------------------------------------------------------------------------------- +expect failure errno lat_1_or_2_zero_or_90 + =============================================================================== Lambert Conformal Conic Alternative Conic, Sph&Ell |