diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-03-05 11:34:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 11:34:05 +0100 |
| commit | 5506990d47606c4ca0458fbd1a69cb4cbc8df618 (patch) | |
| tree | b0f5264f8168d490d662a6bbb97ea3853f402520 /src | |
| parent | 48d346adb3af11bcad7b83a2d2e824c18111e2f2 (diff) | |
| parent | f41fad3ac2bff401456f31dd3273e163ea7d09af (diff) | |
| download | PROJ-5506990d47606c4ca0458fbd1a69cb4cbc8df618.tar.gz PROJ-5506990d47606c4ca0458fbd1a69cb4cbc8df618.zip | |
Merge pull request #830 from kbevers/revert-issue-22-fix
Revert fix to #22
Diffstat (limited to 'src')
| -rw-r--r-- | src/pj_transform.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/pj_transform.c b/src/pj_transform.c index fc0a3241..c72df2e7 100644 --- a/src/pj_transform.c +++ b/src/pj_transform.c @@ -748,32 +748,17 @@ int pj_datum_transform( PJ *srcdefn, PJ *dstdefn, /* -------------------------------------------------------------------- */ if( srcdefn->datum_type == PJD_GRIDSHIFT ) { - const char* srcnadgrids = pj_param(srcdefn->ctx, srcdefn->params,"snadgrids").s; - pj_apply_gridshift_2( srcdefn, 0, point_count, point_offset, x, y, z ); CHECK_RETURN(srcdefn); - /* If the gridlist has either "@null" or "null" as its only */ - /* grid we don't change the ellipsoid parameters, since the */ - /* datum shift to WGS84 was not performed in practice. */ - if ( srcnadgrids != NULL && - strcmp("@null", srcnadgrids) && strcmp("null", srcnadgrids) ) { - src_a = SRS_WGS84_SEMIMAJOR; - src_es = SRS_WGS84_ESQUARED; - } + src_a = SRS_WGS84_SEMIMAJOR; + src_es = SRS_WGS84_ESQUARED; } if( dstdefn->datum_type == PJD_GRIDSHIFT ) { - const char* dstnadgrids = pj_param(dstdefn->ctx, dstdefn->params,"snadgrids").s; - /* If the gridlist has either "@null" or "null" as its only */ - /* grid we don't change the ellipsoid parameters, since the */ - /* datum shift to WGS84 will not be performed. */ - if ( dstnadgrids != NULL && - strcmp("@null", dstnadgrids) && strcmp("null", dstnadgrids) ) { - dst_a = SRS_WGS84_SEMIMAJOR; - dst_es = SRS_WGS84_ESQUARED; - } + dst_a = SRS_WGS84_SEMIMAJOR; + dst_es = SRS_WGS84_ESQUARED; } /* ==================================================================== */ |