Merge 60d93ba into 48d346a

OSGeo · Mar 2, 2018 · 8ebb62d · 8ebb62d
2 parents 48d346a + 60d93ba
commit 8ebb62d
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 3 deletions.
diff --git a/src/PJ_nsper.c b/src/PJ_nsper.c
@@ -186,8 +186,8 @@ PJ *PROJECTION(tpers) {
         return pj_default_destructor (P, ENOMEM);
     P->opaque = Q;
 
-    omega = pj_param(P->ctx, P->params, "dtilt").f * DEG_TO_RAD;
-    gamma = pj_param(P->ctx, P->params, "dazi").f * DEG_TO_RAD;
+    omega = pj_param(P->ctx, P->params, "rtilt").f;
+    gamma = pj_param(P->ctx, P->params, "razi").f;
     Q->tilt = 1;
     Q->cg = cos(gamma); Q->sg = sin(gamma);
     Q->cw = cos(omega); Q->sw = sin(omega);

diff --git a/src/PJ_omerc.c b/src/PJ_omerc.c
@@ -122,7 +122,7 @@ PJ *PROJECTION(omerc) {
         return pj_default_destructor (P, ENOMEM);
     P->opaque = Q;
 
-    Q->no_rot = pj_param(P->ctx, P->params, "tno_rot").i;
+    Q->no_rot = pj_param(P->ctx, P->params, "bno_rot").i;
         if ((alp = pj_param(P->ctx, P->params, "talpha").i) != 0)
         alpha_c = pj_param(P->ctx, P->params, "ralpha").f;
         if ((gam = pj_param(P->ctx, P->params, "tgamma").i) != 0)

diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie
@@ -3029,6 +3029,29 @@ expect  -0.001796631 0.000904369
 accept  -200 -100
 expect  -0.001796631 -0.000904369
 
+-------------------------------------------------------------------------------
+operation +proj=omerc   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +no_rot
+-------------------------------------------------------------------------------
+tolerance 0.1 mm
+accept  2 1
+expect  110642.229314984 222650.796885261
+accept  2 -1
+expect  -110642.229314984 222650.796885261
+accept  -2 1
+expect  110642.229314984 -222650.796885262
+accept  -2 -1
+expect  -110642.229314984 -222650.796885262
+
+direction inverse
+accept  200 100
+expect  0.000898315 0.001808739
+accept  200 -100
+expect  -0.000898315 0.001808739
+accept  -200 100
+expect  0.000898315 -0.001808739
+accept  -200 -100
+expect  -0.000898315 -0.001808739
+
 
 ===============================================================================
 Ortelius Oval
@@ -4163,6 +4186,29 @@ expect  -0.001376321 0.001453641
 accept  -200 -100
 expect  -0.001988706 -0.000228872
 
+-------------------------------------------------------------------------------
+operation +proj=tpers   +a=6400000  +h=1000000 +tilt=20
+-------------------------------------------------------------------------------
+tolerance 0.1 mm
+accept  2 1
+expect  213598.340357101 113687.930830744
+accept  2 -1
+expect  231609.982792523 -123274.645577324
+accept  -2 1
+expect  -213598.340357101 113687.930830744
+accept  -2 -1
+expect  -231609.982792523 -123274.645577324
+
+direction inverse
+accept  200 100
+expect  0.001790554 0.000841285
+accept  200 -100
+expect  0.001790432 -0.000841228
+accept  -200 100
+expect  -0.001790554 0.000841285
+accept  -200 -100
+expect  -0.001790432 -0.000841228
+
 
 ===============================================================================
 Universal Polar Stereographic