diff options
Diffstat (limited to 'test/cli')
| -rw-r--r-- | test/cli/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | test/cli/Makefile.am | 12 | ||||
| -rw-r--r-- | test/cli/ntv2_out.dist | 16 | ||||
| -rw-r--r-- | test/cli/td_out.dist | 2 |
4 files changed, 15 insertions, 21 deletions
diff --git a/test/cli/CMakeLists.txt b/test/cli/CMakeLists.txt index cf4192d7..0f86ca3d 100644 --- a/test/cli/CMakeLists.txt +++ b/test/cli/CMakeLists.txt @@ -10,9 +10,9 @@ proj_add_test_script_sh("test27" PROJ_BIN) proj_add_test_script_sh("test83" PROJ_BIN) proj_add_test_script_sh("testproj" PROJ_BIN) proj_add_test_script_sh("testvarious" CS2CS_BIN) -proj_add_test_script_sh("testdatumfile" CS2CS_BIN "connu") -proj_add_test_script_sh("testIGNF" CS2CS_BIN "ntf_r93.gsb") -proj_add_test_script_sh("testntv2" CS2CS_BIN "ntv2_0.gsb") +proj_add_test_script_sh("testdatumfile" CS2CS_BIN) +proj_add_test_script_sh("testIGNF" CS2CS_BIN) +proj_add_test_script_sh("testntv2" CS2CS_BIN) proj_add_test_script_sh("testprojinfo" PROJINFO_BIN) proj_add_test_script_sh("testcct" CCT_BIN) if(BUILD_PROJSYNC_DATA) diff --git a/test/cli/Makefile.am b/test/cli/Makefile.am index 7ff42016..4d11eaf3 100644 --- a/test/cli/Makefile.am +++ b/test/cli/Makefile.am @@ -47,19 +47,13 @@ testvarious-check: PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTVARIOUS) $(CS2CSEXE) testdatumfile-check: - @if [ -f $(PROJ_LIB)/conus -a -f $(PROJ_LIB)/ntv1_can.dat -a -f $(PROJ_LIB)/MD -a -f $(PROJ_LIB)/ntf_r93.gsb -a -f $(PROJ_LIB)/egm96_15.gtx ]; then \ - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTDATUMFILE) $(CS2CSEXE) ; \ - fi + PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTDATUMFILE) $(CS2CSEXE) testign-check: - @if [ -f $(PROJ_LIB)/ntf_r93.gsb ] ; then \ - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTIGN) $(CS2CSEXE) ; \ - fi + PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTIGN) $(CS2CSEXE) testntv2-check: - @if [ -f $(PROJ_LIB)/ntv2_0.gsb -a -f $(PROJ_LIB)/conus -a -f $(PROJ_LIB)/ntv1_can.dat ] ; then \ - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTNTV2) $(CS2CSEXE) ; \ - fi + PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTNTV2) $(CS2CSEXE) testcct-check: PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTCCT) $(CCTEXE) diff --git a/test/cli/ntv2_out.dist b/test/cli/ntv2_out.dist index d90fdc37..890a649b 100644 --- a/test/cli/ntv2_out.dist +++ b/test/cli/ntv2_out.dist @@ -3,27 +3,27 @@ Point in the ONwinsor subgrid. 82d00'00.000"W 42d00'00.000"N 0.0 81d59'59.6104"W 42d0'0.1602"N 0.000 82d00'01.000"W 42d00'00.000"N 0.0 82d0'0.6104"W 42d0'0.1602"N 0.000 82d00'02.000"W 42d00'00.000"N 0.0 82d0'1.6104"W 42d0'0.1602"N 0.000 -84d00'00.000"W 42d00'00.000"N 0.0 83d59'59.8593"W 42d0'0.18"N 0.000 +84d00'00.000"W 42d00'00.000"N 0.0 83d59'59.8623"W 42d0'0.1807"N 0.000 ############################################################## Try with NTv2 and NTv1 together ... falls back to NTv1 -99d00'00.000"W 65d00'00.000"N 0.0 99d0'1.5885"W 65d0'1.3482"N 0.000 +99d00'00.000"W 65d00'00.000"N 0.0 99d0'1.5926"W 65d0'1.3478"N 0.000 111d00'00.000"W 46d00'00.000"N 0.0 111d0'3.1897"W 45d59'59.7489"N 0.000 -111d00'00.000"W 47d30'00.000"N 0.0 111d0'2.7989"W 47d29'59.9896"N 0.000 +111d00'00.000"W 47d30'00.000"N 0.0 111d0'2.8054"W 47d29'59.9899"N 0.000 ############################################################## Switching between NTv2 subgrids --112.5839956 49.4914451 0 -112.58307487 49.49145197 0.00000000 +-112.5839956 49.4914451 0 -112.58307621 49.49144267 0.00000000 ############################################################## Interpolating very close (and sometimes a bit outside) to the edges a NTv2 subgrid (#209) -115.58333333 51.25000000 0 -115.58228512 51.24997866 0.00000000 -115.58333333 51.25000010 0 -115.58228512 51.24997876 0.00000000 -115.58333334 51.25000000 0 -115.58228513 51.24997866 0.00000000 --115.49166667 51.07500000 0 -115.49062909 51.07497666 0.00000000 --115.49166668 51.07500000 0 -115.49062910 51.07497666 0.00000000 --115.49166667 51.07499990 0 -115.49062909 51.07497656 0.00000000 +-115.49166667 51.07500000 0 -115.49063575 51.07497568 0.00000000 +-115.49166668 51.07500000 0 -115.49063576 51.07497568 0.00000000 +-115.49166667 51.07499990 0 -115.49063575 51.07497558 0.00000000 ############################################################## Attempt first with ntv2_0.gsb and then conus -111.5 45.26 -111.50079772 45.25992835 0.00000000 ############################################################## NAD27 -> NAD83: 1st through ntv2, 2nd through conus -55d00'00.000"N 111d00'00.000"W 0.0 55d0'0.366"N 111d0'3.251"W 0.000 +55d00'00.000"N 111d00'00.000"W 0.0 55d0'0.367"N 111d0'3.231"W 0.000 39d00'00.000"N 111d00'00.000"W 0.0 38d59'59.912"N 111d0'2.604"W 0.000 diff --git a/test/cli/td_out.dist b/test/cli/td_out.dist index cf4b8d73..ab0c0911 100644 --- a/test/cli/td_out.dist +++ b/test/cli/td_out.dist @@ -29,4 +29,4 @@ NAD27 -> NAD83: 1st through ntv1 or ntv2, 2nd through conus 39d00'00.000"N 111d00'00.000"W 0.0 39.0000 -111.0007 0.0000 ############################################################## WGS84 -> WGS84+EGM96 -2dE 49dN 0 2.00 49.00 -44.64 +2dE 49dN 0 2.00 49.00 -45.06 |