aboutsummaryrefslogtreecommitdiff
path: root/src/apply_gridshift.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-08-26 21:44:21 +0200
committerEven Rouault <even.rouault@spatialys.com>2019-08-26 21:44:21 +0200
commit10a30bb539be1afb25952b19af8bbe72e1b13b56 (patch)
tree88caf55ae18c5fc3e73cfcddf5679d5af78e3f0e /src/apply_gridshift.cpp
parentae70b26b9cbae85a38d5b26533ba06da0ea13940 (diff)
downloadPROJ-10a30bb539be1afb25952b19af8bbe72e1b13b56.tar.gz
PROJ-10a30bb539be1afb25952b19af8bbe72e1b13b56.zip
Fix 6.0 regression regarding +init=epsg:4326 +over +to +init=epsg:3857 +over with longitudes outside of [-180,180]
Diffstat (limited to 'src/apply_gridshift.cpp')
-rw-r--r--src/apply_gridshift.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/apply_gridshift.cpp b/src/apply_gridshift.cpp
index fcd9fa01..e6c7b2b1 100644
--- a/src/apply_gridshift.cpp
+++ b/src/apply_gridshift.cpp
@@ -344,7 +344,14 @@ PJ_LP proj_hgrid_apply(PJ *P, PJ_LP lp, PJ_DIRECTION direction) {
ct = find_ctable(P->ctx, lp, P->gridlist_count, P->gridlist);
if (ct == nullptr || ct->cvs == nullptr) {
- pj_ctx_set_errno( P->ctx, PJD_ERR_FAILED_TO_LOAD_GRID );
+ if( P->gridlist_count == 1 &&
+ strcmp(P->gridlist[0]->gridname, "null") == 0) {
+ // TODO: remove this particular case that is put there just to be
+ // able to handle longitudes outside of -180,180
+ out = lp;
+ } else {
+ pj_ctx_set_errno( P->ctx, PJD_ERR_FAILED_TO_LOAD_GRID );
+ }
return out;
}