Merge f4d094d into 1f48f4c

appveyor.yml

@@ -63,6 +63,7 @@ test_script:
   - gie.exe ..\test\gie\deformation.gie
   - gie.exe ..\test\gie\axisswap.gie
   - gie.exe ..\test\gie\ellipsoid.gie
+  - gie.exe ..\test\gie\GDA.gie
 
 deploy: off
 

src/PJ_helmert.c

@@ -572,7 +572,8 @@ PJ *TRANSFORMATION(helmert, 0) {
         proj_log_debug(P, "ds=% 3.5f  epoch=% 5.5f  tobs=% 5.5f", Q->dscale, Q->epoch, Q->t_obs);
     }
 
-    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->scale==0) &&
+        (Q->dopk.o==0) && (Q->dopk.p==0) && (Q->dopk.k==0)) {
         Q->no_rotation = 1;
         return P;
     }

test/gie/GDA.gie

@@ -0,0 +1,69 @@
+-----------------------------------------------------------------------------------
+Australian datum transformations
+-----------------------------------------------------------------------------------
+Based on material from:
+
+Intergovernmental Committee on Surveying and Mapping (ICSM)
+Permanent Committee on Geodesy (PCG):
+
+Geocentric Datum of Australia 2020 Technical Manual
+Version 1.0, 25 July 2017
+
+Which is distributed under Creative Commons CC-BY 4.0
+
+These tests will probably be useful as a template for an AU setup file, defining
+transformations for Australian systems, but I'm reluctant to provide such a file
+directly - I believe it should come from official AU sources.
+
+Thomas Knudsen, thokn@sdfe.dk, 2017-11-27
+-----------------------------------------------------------------------------------
+
+BEGIN
+-----------------------------------------------------------------------------------
+GDA94 to GDA2020
+-----------------------------------------------------------------------------------
+Just the Helmert transformation, to verify that we are within 100 um
+-----------------------------------------------------------------------------------
+operation proj=helmert x=0.06155     y=-0.01087    z=-0.04019  s=-0.009994 \
+                      rx=-0.0394924 ry=-0.0327221 rz=-0.0328979
+-----------------------------------------------------------------------------------
+tolerance  75 um
+accept    -4052051.7643 4212836.2017 -2545106.0245
+expect    -4052052.7379 4212835.9897 -2545104.5898
+
+
+-----------------------------------------------------------------------------------
+GDA94 to GDA2020
+-----------------------------------------------------------------------------------
+All the way from geographic-to-geographic
+-----------------------------------------------------------------------------------
+operation proj=pipeline   ellps=GRS80                                            \
+          step proj=cart                                                         \
+          step proj=helmert  x=0.06155     y=-0.01087    z=-0.04019  s=-0.009994 \
+                            rx=-0.0394924 ry=-0.0327221 rz=-0.0328979            \
+          step proj=cart inv
+-----------------------------------------------------------------------------------
+accept    133.88551329 -23.67012389  603.3466  0   # Alice Springs GDA94
+expect    133.8855216  -23.67011014  603.2489  0   # Alice Springs GDA2020
+
+
+-----------------------------------------------------------------------------------
+ITRF2014@2018 to GDA2020
+-----------------------------------------------------------------------------------
+Just the Helmert transformation, to verify that we are within 100 um
+-----------------------------------------------------------------------------------
+operation proj=helmert   x=0  y=0  z=0  s=0 rx=0 ry=0  rz=0           \
+                        dx=0 dy=0 dz=0                                \
+                       drx=0.00150379  dry=0.00118346 drz=0.00120716  \
+                       ds=0                                           \
+                       epoch=2020.0
+-----------------------------------------------------------------------------------
+tolerance  50 um
+
+ # Alice Springs ITRF2014@2018.0
+accept     -4052052.6588 4212835.9938 -2545104.6946 2018.0
+
+ # Alice Springs GDA2020
+expect     -4052052.7373 4212835.9835 -2545104.5867
+
+END

travis/install.sh

@@ -85,6 +85,7 @@ PROJ_LIB=$GRIDDIR ./src/gie ./test/gie/more_builtins.gie
 PROJ_LIB=$GRIDDIR ./src/gie ./test/gie/deformation.gie
 PROJ_LIB=$GRIDDIR ./src/gie ./test/gie/axisswap.gie
 PROJ_LIB=$GRIDDIR ./src/gie ./test/gie/ellipsoid.gie
+PROJ_LIB=$GRIDDIR ./src/gie ./test/gie/GDA.gie
 
 # install & run the working GIGS test
   # create locations that pyproj understands