diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2020-02-07 11:53:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-07 11:53:37 +0100 |
| commit | ab68913e5b407861ae7d5aaeb876a64711805cb2 (patch) | |
| tree | b5faf4c6cc02578a00cb640c8a57612a20b58610 | |
| parent | bd6148db5f5b9a0a13f3dc2d2c35a066c15a57ed (diff) | |
| parent | 55112033a4131cc9e5a0f6b2a40cec555d87955a (diff) | |
| download | PROJ-ab68913e5b407861ae7d5aaeb876a64711805cb2.tar.gz PROJ-ab68913e5b407861ae7d5aaeb876a64711805cb2.zip | |
Merge pull request #1912 from kbevers/fix-1906
cart: Avoid discontinuity at poles in the inverse case (partial fix to #1906)
| -rw-r--r-- | src/conversions/cart.cpp | 5 | ||||
| -rw-r--r-- | test/gie/more_builtins.gie | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/conversions/cart.cpp b/src/conversions/cart.cpp index a7817443..537fc29f 100644 --- a/src/conversions/cart.cpp +++ b/src/conversions/cart.cpp @@ -165,8 +165,9 @@ static PJ_LPZ geodetic (PJ_XYZ cart, PJ *P) { if( fabs(lpz.phi) > M_HALFPI ) { // this happen on non-sphere ellipsoid when x,y,z is very close to 0 // there is no single solution to the cart->geodetic conversion in - // that case, so arbitrarily pickup phi = 0. - lpz.phi = 0; + // that case, clamp to -90/90 deg and avoid a discontinuous boundary + // near the poles + lpz.phi = copysign(M_HALFPI, lpz.phi); } lpz.lam = atan2 (cart.y, cart.x); N = normal_radius_of_curvature (P->a, P->es, lpz.phi); diff --git a/test/gie/more_builtins.gie b/test/gie/more_builtins.gie index 10d3ea47..424f941d 100644 --- a/test/gie/more_builtins.gie +++ b/test/gie/more_builtins.gie @@ -851,7 +851,7 @@ expect 180 0 0 # Center of Earth ! accept 0 0 0 -expect 0 0 -6378137 +expect 0 90 -6356752.314140356 </gie> |