diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-09-15 11:20:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 11:20:28 +0200 |
| commit | e6e4d5aa20cfc64b1b41eb6dd6d4516e0ea4807e (patch) | |
| tree | 70ee380c12a202a82b4883783cb40f120ebb533a | |
| parent | 47fb85bdf0e45bf5660e0b1dbde7b76f8824a87a (diff) | |
| parent | d209e4ab62e9ab6f1c3825acd518bec421aebf12 (diff) | |
| download | PROJ-e6e4d5aa20cfc64b1b41eb6dd6d4516e0ea4807e.tar.gz PROJ-e6e4d5aa20cfc64b1b41eb6dd6d4516e0ea4807e.zip | |
Merge pull request #2853 from rouault/fix_inverse_ortho_e
Fix error in implementation of Inverse ellipsoidal orthographic projection that cause convergence to sometimes fail (fixes #2844)
| -rw-r--r-- | src/projections/ortho.cpp | 14 | ||||
| -rw-r--r-- | test/gie/builtins.gie | 72 |
2 files changed, 83 insertions, 3 deletions
diff --git a/src/projections/ortho.cpp b/src/projections/ortho.cpp index 908f283d..c334f398 100644 --- a/src/projections/ortho.cpp +++ b/src/projections/ortho.cpp @@ -254,15 +254,23 @@ static PJ_LP ortho_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inver const double J11 = -rho * sinphi * sinlam; const double J12 = nu * cosphi * coslam; const double J21 = rho * (cosphi * Q->cosph0 + sinphi * Q->sinph0 * coslam); - const double J22 = nu * Q->sinph0 * Q->cosph0 * sinlam; + const double J22 = nu * Q->sinph0 * cosphi * sinlam; const double D = J11 * J22 - J12 * J21; const double dx = xy.x - xy_new.x; const double dy = xy.y - xy_new.y; const double dphi = (J22 * dx - J12 * dy) / D; const double dlam = (-J21 * dx + J11 * dy) / D; lp.phi += dphi; - if( lp.phi > M_PI_2) lp.phi = M_PI_2; - else if( lp.phi < -M_PI_2) lp.phi = -M_PI_2; + if( lp.phi > M_PI_2) + { + lp.phi = M_PI_2 - (M_PI_2 - lp.phi); + lp.lam = adjlon(lp.lam + 180); + } + else if( lp.phi < -M_PI_2) + { + lp.phi = -M_PI_2 + (-M_PI_2 - lp.phi); + lp.lam = adjlon(lp.lam + 180); + } lp.lam += dlam; if( fabs(dphi) < 1e-12 && fabs(dlam) < 1e-12 ) { diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index 9e1d3339..569ca812 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -4531,6 +4531,78 @@ tolerance 0.1 mm accept 0 -6343600 expect 0 -59.966377950099655436 +# At pole or very close to it +direction forward +tolerance 0.1 mm +accept 0 90 +expect 0 5523613.1150 + +direction inverse +tolerance 0.1 mm +accept 0 5523613.1150 +expect 0 90 + +direction forward +tolerance 0.1 mm +accept 0 89.99999999 +expect 0 5523613.1145 +roundtrip 1 + +direction forward +tolerance 0.1 mm +accept 180 89.99999999 +expect 0 5523613.1156 +roundtrip 1 + +direction forward +tolerance 0.1 mm +accept 90 89.99999999 +expect 0.0011 5523613.1150 +# Roundrip doesn't work on 32bit builds +#roundtrip 1 + +direction forward +tolerance 0.1 mm +accept -90 89.99999999 +expect -0.0011 5523613.1150 +roundtrip 1 + +# Southern hemisphere +operation +proj=ortho +ellps=WGS84 +lat_0=-30 + +# At pole or very close to it +direction forward +tolerance 0.1 mm +accept 0 -90 +expect 0 -5523613.1150 + +direction inverse +tolerance 0.1 mm +accept 0 -5523613.1150 +expect 0 -90 + +direction forward +tolerance 0.1 mm +accept 0 -89.99999999 +expect 0 -5523613.1145 +roundtrip 1 + +direction forward +tolerance 0.1 mm +accept 180 -89.99999999 +expect 0 -5523613.1156 +roundtrip 1 + +------------------------------------------------------------------------------- +# Oblique +# Test case from https://github.com/OSGeo/PROJ/issues/2844 +------------------------------------------------------------------------------- +operation +proj=ortho +ellps=WGS84 +lon_0=23.0 +lat_0=37.0 +tolerance 0.1 mm +accept 120.0 84.0 +expect 663929.0678 5118338.2423 +roundtrip 1 + ------------------------------------------------------------------------------- # Equatorial |