Merge remote-tracking branch 'osgeo/master' into docs-release-4.10.0

1 files changed, 14 insertions, 91 deletions

diff --git a/src/PJ_hgridshift.c b/src/PJ_hgridshift.c
index 0adc9e00..92275e51 100644
--- a/src/PJ_hgridshift.c
+++ b/src/PJ_hgridshift.c
@@ -4,7 +4,6 @@
 
 PROJ_HEAD(hgridshift, "Horizontal grid shift");
 
-
 static XYZ forward_3d(LPZ lpz, PJ *P) {
     PJ_TRIPLET point;
     point.lpz = lpz;
@@ -12,9 +11,7 @@ static XYZ forward_3d(LPZ lpz, PJ *P) {
     if (P->gridlist != NULL) {
         /* Only try the gridshift if at least one grid is loaded,
          * otherwise just pass the coordinate through unchanged. */
-        pj_apply_gridshift_3( P->ctx, P->gridlist,
-                              P->gridlist_count, 1, 1, 0,
-                              &point.xyz.x, &point.xyz.y, &point.xyz.z );
+        point.lp = proj_hgrid_apply(P, point.lp, PJ_FWD);
     }
 
     return point.xyz;
@@ -28,55 +25,30 @@ static LPZ reverse_3d(XYZ xyz, PJ *P) {
     if (P->gridlist != NULL) {
         /* Only try the gridshift if at least one grid is loaded,
          * otherwise just pass the coordinate through unchanged. */
-        pj_apply_gridshift_3( P->ctx, P->gridlist,
-                              P->gridlist_count, 0, 1, 0,
-                              &point.xyz.x, &point.xyz.y, &point.xyz.z );
+        point.lp = proj_hgrid_apply(P, point.lp, PJ_INV);
     }
 
     return point.lpz;
 }
 
 
-static PJ_OBS forward_obs(PJ_OBS obs, PJ *P) {
-    PJ_OBS point;
-    point.coo.xyz = forward_3d (obs.coo.lpz, P);
-    return point;
+static PJ_COORD forward_4d (PJ_COORD obs, PJ *P) {
+    obs.xyz = forward_3d (obs.lpz, P);
+    return obs;
 }
 
 
-static PJ_OBS reverse_obs(PJ_OBS obs, PJ *P) {
-    PJ_OBS point;
-    point.coo.lpz = reverse_3d (obs.coo.xyz, P);
-    return point;
+static PJ_COORD reverse_4d (PJ_COORD obs, PJ *P) {
+    obs.lpz = reverse_3d (obs.xyz, P);
+    return obs;
 }
 
 
 
-#if 0
-static XY forward_xy(LP lp, PJ *P) {
-    PJ_TRIPLET point;
-    point.lp = lp;
-    point.lpz.z = 0;
-    point.xyz = forward_3d (point.lpz, P);
-    return point.xy;
-}
-
-
-static LP reverse_lp(XY xy, PJ *P) {
-    PJ_TRIPLET point;
-    point.xy = xy;
-    point.xyz.z = 0;
-    point.lpz = reverse_3d (point.xyz, P);
-    return point.lp;
-}
-#endif
+PJ *TRANSFORMATION(hgridshift,0) {
 
-
-
-PJ *PROJECTION(hgridshift) {
-    
-    P->fwdobs = forward_obs;
-    P->invobs = reverse_obs;
+    P->fwd4d  = forward_4d;
+    P->inv4d  = reverse_4d;
     P->fwd3d  = forward_3d;
     P->inv3d  = reverse_3d;
     P->fwd    = 0;
@@ -90,63 +62,14 @@ PJ *PROJECTION(hgridshift) {
         return pj_default_destructor (P, PJD_ERR_NO_ARGS);
     }
 
-    /* Build gridlist. P->gridlist can be empty if +grids only ask for optional grids. */
-    P->gridlist = pj_gridlist_from_nadgrids( P->ctx, pj_param(P->ctx, P->params, "sgrids").s,
-                                             &(P->gridlist_count) );
 
+    proj_hgrid_init(P, "grids");
     /* Was gridlist compiled properly? */
-    if ( pj_ctx_get_errno(pj_get_ctx(P)) ) {
+    if ( proj_errno(P) ) {
         proj_log_error(P, "hgridshift: could not find required grid(s).");
-        return pj_default_destructor (P, PJD_ERR_FAILED_TO_LOAD_GRID);
+        return pj_default_destructor(P, PJD_ERR_FAILED_TO_LOAD_GRID);
     }
 
     return P;
 }
 
-
-#ifndef PJ_SELFTEST
-/* selftest stub */
-int pj_hgridshift_selftest (void) {return 0;}
-#else
-int pj_hgridshift_selftest (void) {
-    PJ *P;
-    PJ_OBS expect, a, b;
-    double dist;
-
-    /* fail on purpose: +grids parameter is mandatory*/
-    P = proj_create(PJ_DEFAULT_CTX, "+proj=hgridshift");
-    if (0!=P) {
-        proj_destroy (P);
-        return 99;
-    }
-    
-    /* fail on purpose: open non-existing grid */
-    P = proj_create(PJ_DEFAULT_CTX, "+proj=hgridshift +grids=@nonexistinggrid.gsb,anothernonexistinggrid.gsb");
-    if (0!=P) {
-        proj_destroy (P);
-        return 999;
-    }
-        
-    /* Failure most likely means the grid is missing */
-    P = proj_create(PJ_DEFAULT_CTX, "+proj=hgridshift +grids=nzgd2kgrid0005.gsb +ellps=GRS80");
-    if (0==P)
-        return 10;
-        
-    a = proj_obs_null;
-    a.coo.lpz.lam = PJ_TORAD(173);
-    a.coo.lpz.phi = PJ_TORAD(-45);
-    
-    dist = proj_roundtrip (P, PJ_FWD, 1, a.coo);
-    if (dist > 0.00000001)
-        return 1;
-
-    expect.coo.lpz.lam = PJ_TORAD(172.999892181021551);
-    expect.coo.lpz.phi = PJ_TORAD(-45.001620431954613);
-    b = proj_trans_obs(P, PJ_FWD, a);
-    if (proj_xy_dist(expect.coo.xy, b.coo.xy) > 1e-4)
-        return 2;
-
-    proj_destroy(P);
-    return 0;
-}
-#endif