Merge 73dc34b into c097291

OSGeo · Mar 30, 2018 · 3fe22da · 3fe22da
2 parents c097291 + 73dc34b
commit 3fe22da
Show file tree

Hide file tree

Showing 2 changed files with 170 additions and 36 deletions.
diff --git a/src/PJ_ortho.c b/src/PJ_ortho.c
@@ -1,6 +1,7 @@
 #define PJ_LIB__
 #include <errno.h>
 #include "proj.h"
+#include "proj_internal.h"
 #include "projects.h"
 
 PROJ_HEAD(ortho, "Orthographic") "\n\tAzi, Sph.";
@@ -20,37 +21,39 @@ struct pj_opaque {
 
 #define EPS10 1.e-10
 
+static XY forward_error(PJ *P, LP lp, XY xy) {
+    proj_errno_set(P, PJD_ERR_TOLERANCE_CONDITION);
+    proj_log_trace(P, "Coordinate (%.3f, %.3f) is on the unprojected hemisphere",
+                   proj_todeg(lp.lam), proj_todeg(lp.phi));
+    return xy;
+}
 
 static XY s_forward (LP lp, PJ *P) {           /* Spheroidal, forward */
-    XY xy = {0.0,0.0};
+    XY xy;
     struct pj_opaque *Q = P->opaque;
     double  coslam, cosphi, sinphi;
 
+    xy.x = HUGE_VAL; xy.y = HUGE_VAL;
+
     cosphi = cos(lp.phi);
     coslam = cos(lp.lam);
     switch (Q->mode) {
     case EQUIT:
-        if (cosphi * coslam < - EPS10) {
-            proj_errno_set(P, PJD_ERR_TOLERANCE_CONDITION);
-            return xy;
-        }
+        if (cosphi * coslam < - EPS10)
+            return forward_error(P, lp, xy);
         xy.y = sin(lp.phi);
         break;
     case OBLIQ:
-        if (Q->sinph0 * (sinphi = sin(lp.phi)) + Q->cosph0 * cosphi * coslam < - EPS10) {
-            proj_errno_set(P, PJD_ERR_TOLERANCE_CONDITION);
-            return xy;
-        }
+        if (Q->sinph0 * (sinphi = sin(lp.phi)) + Q->cosph0 * cosphi * coslam < - EPS10)
+            return forward_error(P, lp, xy);
         xy.y = Q->cosph0 * sinphi - Q->sinph0 * cosphi * coslam;
         break;
     case N_POLE:
         coslam = - coslam;
                 /*-fallthrough*/
     case S_POLE:
-        if (fabs(lp.phi - P->phi0) - EPS10 > M_HALFPI) {
-            proj_errno_set(P, PJD_ERR_TOLERANCE_CONDITION);
-            return xy;
-        }
+        if (fabs(lp.phi - P->phi0) - EPS10 > M_HALFPI)
+            return forward_error(P, lp, xy);
         xy.y = cosphi * coslam;
         break;
     }
@@ -60,13 +63,16 @@ static XY s_forward (LP lp, PJ *P) {           /* Spheroidal, forward */
 
 
 static LP s_inverse (XY xy, PJ *P) {           /* Spheroidal, inverse */
-    LP lp = {0.0,0.0};
+    LP lp;
     struct pj_opaque *Q = P->opaque;
     double  rh, cosc, sinc;
 
+    lp.lam = HUGE_VAL; lp.phi = HUGE_VAL;
+
     if ((sinc = (rh = hypot(xy.x, xy.y))) > 1.) {
         if ((sinc - 1.) > EPS10) {
             proj_errno_set(P, PJD_ERR_TOLERANCE_CONDITION);
+            proj_log_trace(P, "Point (%.3f, %.3f) is outside the projection boundary");
             return lp;
         }
         sinc = 1.;

diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie
@@ -3078,28 +3078,156 @@ Orthographic
 ===============================================================================
 
 -------------------------------------------------------------------------------
-operation +proj=ortho   +a=6400000    +lat_1=0.5 +lat_2=2
--------------------------------------------------------------------------------
-tolerance 0.1 mm
-accept  2 1
-expect  223322.760576727 111695.401198614
-accept  2 -1
-expect  223322.760576727 -111695.401198614
-accept  -2 1
-expect  -223322.760576727 111695.401198614
-accept  -2 -1
-expect  -223322.760576727 -111695.401198614
-
-direction inverse
-accept  200 100
-expect  0.001790493 0.000895247
-accept  200 -100
-expect  0.001790493 -0.000895247
-accept  -200 100
-expect  -0.001790493 0.000895247
-accept  -200 -100
-expect  -0.001790493 -0.000895247
-
+Test the equatorial aspect of the Orthopgraphic projection.
+
+Test data from Snyder (1987), table 22, p. 151.
+-------------------------------------------------------------------------------
+operation   +proj=ortho +R=1 +lat_0=0 +lon_0=0
+-------------------------------------------------------------------------------
+tolerance   0.1 mm
+accept      0       0
+expect      0       0
+roundtrip   100
+accept      0       90
+expect      0       1
+roundtrip   100
+accept      0       30
+expect      0       0.5000
+roundtrip   100
+accept      10      50
+expect      0.1116  0.7660
+roundtrip   100
+accept      20      40
+expect      0.2620  0.6428
+roundtrip   100
+accept      30      80
+expect      0.0868  0.9848
+roundtrip   100
+accept      40      70
+expect      0.2198  0.9397
+roundtrip   100
+accept      50      60
+expext      0.3830  0.8660
+roundtrip   100
+accept      60      50
+expect      0.5567  0.7660
+roundtrip   100
+accept      70      20
+expect      0.8830  0.3420
+roundtrip   100
+accept      80      10
+expect      0.9698  0.1736
+roundtrip   100
+accept      90      90
+expect      0       1
+roundtrip   100
+accept      120     0
+expect      failure errno tolerance_condition
+
+direction   inverse
+accept      2   2
+expect      failure errno tolerance_condition
+
+
+-------------------------------------------------------------------------------
+Test the oblique aspect of the Orthopgraphic projection.
+
+Test data from Snyder (1987), table 23, pp. 152-153.
+-------------------------------------------------------------------------------
+operation   +proj=ortho +R=1 +lat_0=40 +lon_0=0
+-------------------------------------------------------------------------------
+tolerance   0.1 mm
+accept      0.0     90
+expect      0.0     0.7660
+roundtrip   100
+accept      20      60
+expect      0.1710  0.3614
+roundtrip   100
+accept      40     -30
+expect      0.5567  -0.8095
+roundtrip   100
+accept      100     70
+expect      0.3368  0.7580
+roundtrip   100
+accept      130     40
+expect      0.5868  0.8089
+roundtrip   100
+accept      170     60
+expect      0.0868  0.9799
+roundtrip   100
+accept      140     20
+expect      failure errno tolerance_condition
+
+direction   inverse
+accept      2   2
+expect      failure errno tolerance_condition
+
+
+-------------------------------------------------------------------------------
+Test the north polar aspect of the Orthopgraphic projection.
+-------------------------------------------------------------------------------
+operation   +proj=ortho +R=1 +lat_0=90 +lon_0=0
+-------------------------------------------------------------------------------
+tolerance 0.1 mm
+accept      0   0
+expect      0   -1
+roundtrip   100
+accept      180 0
+expect      0   1
+roundtrip   100
+accept      90  90
+expect      0   0
+roundtrip   100
+accept      0   90
+expect      0   0
+roundtrip   100
+accept      90  0
+expect      1   0
+roundtrip   100
+accept      180 -90
+expect      failure errno tolerance_condition
+accept      0   -45
+expect      failure errno tolerance_condition
+
+direction   inverse
+accept      2   2
+expect      failure errno tolerance_condition
+
+-------------------------------------------------------------------------------
+Test the south polar aspect of the Orthopgraphic projection.
+-------------------------------------------------------------------------------
+operation   +proj=ortho +R=1 +lat_0=-90 +lon_0=0
+-------------------------------------------------------------------------------
+tolerance 0.1 mm
+accept      0   0
+expect      0   1
+roundtrip   100
+accept      180 0
+expect      0   -1
+roundtrip   100
+accept      90  -90
+expect      0   0
+roundtrip   100
+accept      0   -90
+expect      0   0
+roundtrip   100
+accept      90  0
+expect      1   0
+roundtrip   100
+accept      180 90
+expect      failure errno tolerance_condition
+accept      0   45
+expect      failure errno tolerance_condition
+
+direction   inverse
+accept      2   2
+expect      failure errno tolerance_condition
+
+# Put a point a tiny tiny bit outside the radius of the sphere.
+# Since we are right at the numerical limit of floating point representation
+# it should still results in a correct coordinate.
+accept      0.70710678118 0.7071067812
+expect      45  0
 
 ===============================================================================
 Perspective Conic