diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-07-24 15:22:53 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-07-24 15:22:53 +0200 |
| commit | 886499e3a2d49827a796e5ce4909cf9c7c55a34a (patch) | |
| tree | 8521e285d691f7e72fe243ae2432a2295e9213d5 | |
| parent | 062c7f160f4b1d41f82730fa6eb6653e78ade74a (diff) | |
| download | PROJ-886499e3a2d49827a796e5ce4909cf9c7c55a34a.tar.gz PROJ-886499e3a2d49827a796e5ce4909cf9c7c55a34a.zip | |
Helmert 2D: do not require a useless convention= parameter
| -rw-r--r-- | src/transformations/helmert.cpp | 2 | ||||
| -rw-r--r-- | test/gie/more_builtins.gie | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/transformations/helmert.cpp b/src/transformations/helmert.cpp index 33a703bb..9fb568a8 100644 --- a/src/transformations/helmert.cpp +++ b/src/transformations/helmert.cpp @@ -654,7 +654,7 @@ PJ *TRANSFORMATION(helmert, 0) { Q->scale = Q->scale_0; Q->theta = Q->theta_0; - if ((Q->opk.o==0) && (Q->opk.p==0) && (Q->opk.k==0) && (Q->scale==0) && + if ((Q->opk.o==0) && (Q->opk.p==0) && (Q->opk.k==0) && (Q->dopk.o==0) && (Q->dopk.p==0) && (Q->dopk.k==0)) { Q->no_rotation = 1; } diff --git a/test/gie/more_builtins.gie b/test/gie/more_builtins.gie index 610c6c3f..b9a92e58 100644 --- a/test/gie/more_builtins.gie +++ b/test/gie/more_builtins.gie @@ -386,7 +386,7 @@ expect 3370658.18890 711877.42370 5349787.12430 2017.0 # ITRF93@2017.0 # from NAD27 (ft) -> NAD83 (m). The paper reports a difference of 0.0014 m from # measured to computed coordinates, hence the test tolerance is set accordingly. ------------------------------------------------------------------------------- -operation proj=helmert convention=coordinate_frame \ +operation proj=helmert \ x=-9597.3572 y=.6112 \ s=0.304794780637 theta=-1.244048 ------------------------------------------------------------------------------- |