From 2c3a7c8bcc711cf34b79885edbf1e5dccacc5757 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 10 Dec 2019 14:36:07 +0100 Subject: ob_tran: restore traditional handling of +to_meter with pj_transform() and proj utility (fixes #1782) Fixes side-effect of https://github.com/OSGeo/PROJ/issues/1525 that went in 6.1.1 The correction is horribly hacky. Sorry... --- test/cli/CMakeLists.txt | 1 + test/cli/Makefile.am | 7 +++++- test/cli/testproj | 55 ++++++++++++++++++++++++++++++++++++++++++++++ test/cli/testproj_out.dist | 1 + 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100755 test/cli/testproj create mode 100644 test/cli/testproj_out.dist (limited to 'test/cli') diff --git a/test/cli/CMakeLists.txt b/test/cli/CMakeLists.txt index 4e1ab75a..feef5bf0 100644 --- a/test/cli/CMakeLists.txt +++ b/test/cli/CMakeLists.txt @@ -7,6 +7,7 @@ set(PROJINFO_BIN "projinfo") set(CCT_BIN "cct") 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") diff --git a/test/cli/Makefile.am b/test/cli/Makefile.am index 758352c6..fb7169e4 100644 --- a/test/cli/Makefile.am +++ b/test/cli/Makefile.am @@ -10,6 +10,7 @@ CCTEXE = $(EXEPATH)/cct # PROJ.4 test scripts TEST27 = $(THIS_DIR)/test27 TEST83 = $(THIS_DIR)/test83 +TESTPROJ = $(THIS_DIR)/testproj TESTNTV2 = $(THIS_DIR)/testntv2 TESTVARIOUS = $(THIS_DIR)/testvarious TESTFLAKY = $(THIS_DIR)/testflaky @@ -24,6 +25,7 @@ EXTRA_DIST = pj_out27.dist pj_out83.dist td_out.dist \ testIGNF proj_outIGNF.dist \ testprojinfo testprojinfo_out.dist \ testcct testcct_out.dist \ + testproj testproj_out.dist \ CMakeLists.txt testprojinfo-check: @@ -35,6 +37,9 @@ test27-check: test83-check: $(TEST83) $(PROJEXE) +testproj-check: + $(TESTPROJ) $(PROJEXE) + testvarious-check: PROJ_LIB=$(PROJ_LIB) $(TESTVARIOUS) $(CS2CSEXE) @@ -56,4 +61,4 @@ testntv2-check: testcct-check: PROJ_LIB=$(PROJ_LIB) $(TESTCCT) $(CCTEXE) -check-local: testprojinfo-check test27-check test83-check testvarious-check testdatumfile-check testign-check testntv2-check testcct-check +check-local: testprojinfo-check test27-check test83-check testproj-check testvarious-check testdatumfile-check testign-check testntv2-check testcct-check diff --git a/test/cli/testproj b/test/cli/testproj new file mode 100755 index 00000000..8686224e --- /dev/null +++ b/test/cli/testproj @@ -0,0 +1,55 @@ +: +# Script to test proj exe +# +TEST_CLI_DIR=`dirname $0` +EXE=$1 + +usage() +{ + echo "Usage: ${0} " + echo + exit 1 +} + +if test -z "${EXE}"; then + EXE=../../src/cs2cs +fi + +if test ! -x ${EXE}; then + echo "*** ERROR: Can not find '${EXE}' program!" + exit 1 +fi + +if test -z "${PROJ_LIB}"; then + export PROJ_LIB="`dirname $0`/../../data" +fi + +echo "============================================" +echo "Running ${0} using ${EXE}:" +echo "============================================" + +OUT=testproj_out +# +echo "doing tests into file ${OUT}, please wait" +# +$EXE +ellps=WGS84 +proj=ob_tran +o_proj=latlon +o_lon_p=0.0 +o_lat_p=90.0 +lon_0=360.0 +to_meter=0.0174532925199433 +no_defs -E -f '%.3f' >${OUT} < Date: Sat, 14 Dec 2019 15:40:17 +0100 Subject: Horizontal grid shift: fix issue on iterative inverse computation when switching between (sub)grids (fixes #1663) Given in.txt with 53.999759140 5.144478208 252.6995 Before the fix, cct -t 0 -d 4 +proj=pipeline +step +proj=axisswap +order=2,1,3,4 +step +proj=hgridshift +inv +grids=rdtrans2018.gsb +step +proj=vgridshift +grids=naptrans2018.gtx +step +proj=sterea +lat_0=52.156160556 +lon_0=5.387638889 +k=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel in.txt returned: 139079.8814 668306.0302 212.1724 0.0000 It now returns: 139079.8850 668306.0458 212.1724 0.0000 which meets with the 1mm accuracy the expected result of test point ``` 30010049 53.999759140 5.144478208 252.6995 139079.8850 668306.0460 212.1723 ``` --- test/cli/ntv2_out.dist | 3 +++ test/cli/testntv2 | 8 ++++++++ 2 files changed, 11 insertions(+) (limited to 'test/cli') diff --git a/test/cli/ntv2_out.dist b/test/cli/ntv2_out.dist index 9a97f9cf..650a69d8 100644 --- a/test/cli/ntv2_out.dist +++ b/test/cli/ntv2_out.dist @@ -9,3 +9,6 @@ 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 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 +############################################################## +Switching between NTv2 subgrids +-112.5839956 49.4914451 0 -112.58307487 49.49145197 0.00000000 diff --git a/test/cli/testntv2 b/test/cli/testntv2 index 73371dbe..2a31304e 100755 --- a/test/cli/testntv2 +++ b/test/cli/testntv2 @@ -52,6 +52,14 @@ $EXE +proj=latlong +ellps=clrk66 +nadgrids=ntv2_0.gsb,ntv1_can.dat,conus \ 111d00'00.000"W 46d00'00.000"N 0.0 111d00'00.000"W 47d30'00.000"N 0.0 EOF + +echo "##############################################################" >> ${OUT} +echo Switching between NTv2 subgrids >> ${OUT} +# Initial guess is in ALraymnd, going to parent CAwest afterwards +$EXE +proj=latlong +datum=NAD83 +to +proj=latlong +ellps=clrk66 +nadgrids=ntv2_0.gsb -E -d 8 >>${OUT} < Date: Fri, 20 Dec 2019 15:14:20 +0100 Subject: Database: add name mappings for na27na83.gsb and cq77na83.gsb; also fix the mapping between CGQ77-98.gsb and CQ77SCRS.GSB --- test/cli/testprojinfo_out.dist | 44 ++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'test/cli') diff --git a/test/cli/testprojinfo_out.dist b/test/cli/testprojinfo_out.dist index 25b29a79..2123febc 100644 --- a/test/cli/testprojinfo_out.dist +++ b/test/cli/testprojinfo_out.dist @@ -272,8 +272,8 @@ DERIVED_FROM(EPSG):1312, NAD27 to NAD83 (3), 1.0 m, Canada DERIVED_FROM(EPSG):1313, NAD27 to NAD83 (4), 1.5 m, Canada - NAD27 DERIVED_FROM(EPSG):1241, NAD27 to NAD83 (1), 0.15 m, USA - CONUS including EEZ DERIVED_FROM(EPSG):1243, NAD27 to NAD83 (2), 0.5 m, USA - Alaska including EEZ +DERIVED_FROM(EPSG):1573, NAD27 to NAD83 (6), 1.5 m, Canada - Quebec EPSG:1462, NAD27 to NAD83 (5), 1.0 m, Canada - Quebec -EPSG:1573, NAD27 to NAD83 (6), 1.5 m, Canada - Quebec EPSG:9111, NAD27 to NAD83 (9), 1.5 m, Canada - Saskatchewan unknown id, Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, World, has ballpark transformation EPSG:8555, NAD27 to NAD83 (7), 0.15 m, USA - CONUS and GoM @@ -482,14 +482,13 @@ COORDINATEOPERATION["NAD27 to NAD83 (2)", ------------------------------------- Operation n°5: -EPSG:1462, NAD27 to NAD83 (5), 1.0 m, Canada - Quebec +DERIVED_FROM(EPSG):1573, NAD27 to NAD83 (6), 1.5 m, Canada - Quebec PROJ string: -+proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=GS2783v1.QUE +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 ++proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=na27na83.gsb +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 WKT2:2019 string: -COORDINATEOPERATION["NAD27 to NAD83 (5)", - VERSION["SGQ-Can QC NT1"], +COORDINATEOPERATION["NAD27 to NAD83 (6)", SOURCECRS[ GEOGCRS["NAD27", DATUM["North American Datum 1927", @@ -520,28 +519,27 @@ COORDINATEOPERATION["NAD27 to NAD83 (5)", ORDER[2], ANGLEUNIT["degree",0.0174532925199433]], ID["EPSG",4269]]], - METHOD["NTv1", - ID["EPSG",9614]], - PARAMETERFILE["Latitude and longitude difference file","GS2783v1.QUE"], - OPERATIONACCURACY[1.0], + METHOD["NTv2", + ID["EPSG",9615]], + PARAMETERFILE["Latitude and longitude difference file","na27na83.gsb"], + OPERATIONACCURACY[1.5], USAGE[ - SCOPE["Historic record only - now superseded - see remarks."], + SCOPE["Accuracy 1-2 metres."], AREA["Canada - Quebec"], BBOX[44.99,-79.85,62.62,-57.1]], - ID["EPSG",1462], - REMARK["Densification for Quebec of code 1312. Replaced by NAD27 to NAD83 (6) (code 1573). Uses NT method which expects longitudes positive west; EPSG GeogCRSs NAD27 (code 4267) and NAD83 (code 4269) have longitudes positive east."]] + ID["DERIVED_FROM(EPSG)",1573]] ------------------------------------- Operation n°6: -EPSG:1573, NAD27 to NAD83 (6), 1.5 m, Canada - Quebec +EPSG:1462, NAD27 to NAD83 (5), 1.0 m, Canada - Quebec PROJ string: -+proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=NA27NA83.GSB +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 ++proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=GS2783v1.QUE +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 WKT2:2019 string: -COORDINATEOPERATION["NAD27 to NAD83 (6)", - VERSION["SGQ-Can QC NT2"], +COORDINATEOPERATION["NAD27 to NAD83 (5)", + VERSION["SGQ-Can QC NT1"], SOURCECRS[ GEOGCRS["NAD27", DATUM["North American Datum 1927", @@ -572,16 +570,16 @@ COORDINATEOPERATION["NAD27 to NAD83 (6)", ORDER[2], ANGLEUNIT["degree",0.0174532925199433]], ID["EPSG",4269]]], - METHOD["NTv2", - ID["EPSG",9615]], - PARAMETERFILE["Latitude and longitude difference file","NA27NA83.GSB"], - OPERATIONACCURACY[1.5], + METHOD["NTv1", + ID["EPSG",9614]], + PARAMETERFILE["Latitude and longitude difference file","GS2783v1.QUE"], + OPERATIONACCURACY[1.0], USAGE[ - SCOPE["Accuracy 1-2 metres."], + SCOPE["Historic record only - now superseded - see remarks."], AREA["Canada - Quebec"], BBOX[44.99,-79.85,62.62,-57.1]], - ID["EPSG",1573], - REMARK["Also distributed with file name QUE27-83.gsb. Replaces NAD27 to NAD83 (5) (code 1462). Uses NT method which expects longitudes positive west; EPSG GeogCRSs NAD27 (code 4267) and NAD83 (code 4269) have longitudes positive east."]] + ID["EPSG",1462], + REMARK["Densification for Quebec of code 1312. Replaced by NAD27 to NAD83 (6) (code 1573). Uses NT method which expects longitudes positive west; EPSG GeogCRSs NAD27 (code 4267) and NAD83 (code 4269) have longitudes positive east."]] ------------------------------------- Operation n°7: -- cgit v1.2.3 From 73a65df7421d5287db2a9f7a3854a68e9310c77a Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 24 Dec 2019 12:52:13 +0100 Subject: proj_trans: add retry logic to select other transformation if the best one fails. Relates to https://github.com/OSGeo/PROJ/issues/1808 --- test/cli/ntv2_out.dist | 3 +++ test/cli/testntv2 | 6 ++++++ 2 files changed, 9 insertions(+) (limited to 'test/cli') diff --git a/test/cli/ntv2_out.dist b/test/cli/ntv2_out.dist index 650a69d8..940997fb 100644 --- a/test/cli/ntv2_out.dist +++ b/test/cli/ntv2_out.dist @@ -12,3 +12,6 @@ Try with NTv2 and NTv1 together ... falls back to NTv1 ############################################################## Switching between NTv2 subgrids -112.5839956 49.4914451 0 -112.58307487 49.49145197 0.00000000 +############################################################## +Attempt first with ntv2_0.gsb and then conus +-111.5 45.26 -111.50079772 45.25992835 0.00000000 diff --git a/test/cli/testntv2 b/test/cli/testntv2 index 2a31304e..ab72d199 100755 --- a/test/cli/testntv2 +++ b/test/cli/testntv2 @@ -60,6 +60,12 @@ $EXE +proj=latlong +datum=NAD83 +to +proj=latlong +ellps=clrk66 +nadgrids=ntv2_0 -112.5839956 49.4914451 0 EOF +echo "##############################################################" >> ${OUT} +echo Attempt first with ntv2_0.gsb and then conus >> ${OUT} +$EXE +proj=longlat +datum=NAD27 +to +proj=longlat +datum=WGS84 -E -d 8 >>${OUT} < Date: Wed, 25 Dec 2019 16:23:31 +0100 Subject: Database: tune accuracy of Canadian NTv1 file w.r.t NTv2 As on import of EPSG, we remove the supersession of Canadian NTv1 file w.r.t NTv2 (because the default behaviour of PROJ is to ignore superseded operations). However the NTv1 operation is advertized with an accuracy of 1m, whereas NTv2 is advertized with 1.5m. Consequently on areas where both files are valid, and if both files are available, NTv1 would be selected. So as a workaround, worsen the NTv1 accuracy to 2m so that NTv2 is used in priority. --- test/cli/ntv2_out.dist | 4 ++++ test/cli/td_out.dist | 6 +++--- test/cli/testdatumfile | 4 ++-- test/cli/testntv2 | 8 ++++++++ test/cli/testprojinfo_out.dist | 12 ++++++------ 5 files changed, 23 insertions(+), 11 deletions(-) (limited to 'test/cli') diff --git a/test/cli/ntv2_out.dist b/test/cli/ntv2_out.dist index 940997fb..531db7be 100644 --- a/test/cli/ntv2_out.dist +++ b/test/cli/ntv2_out.dist @@ -15,3 +15,7 @@ Switching between NTv2 subgrids ############################################################## 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 +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 82b64321..478a0d84 100644 --- a/test/cli/td_out.dist +++ b/test/cli/td_out.dist @@ -24,9 +24,9 @@ edge or even a wee bit outside (#141). -5.4999 51.9999 -5.498793541695 52.000009529743 0.000000000000 -5.5001 52.0 -5.500100000000 52.000000000000 0.000000000000 ############################################################## -NAD27 -> NAD83: 1st through ntv1, 2nd through conus -55d00'00.000"N 111d00'00.000"W 0.0 55d0'0.339"N 111d0'3.245"W 0.000 -39d00'00.000"N 111d00'00.000"W 0.0 38d59'59.912"N 111d0'2.604"W 0.000 +NAD27 -> NAD83: 1st through ntv1 or ntv2, 2nd through conus +55d00'00.000"N 111d00'00.000"W 0.0 55.0001 -111.0009 0.0000 +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 diff --git a/test/cli/testdatumfile b/test/cli/testdatumfile index 29a40876..e4b9ea2d 100755 --- a/test/cli/testdatumfile +++ b/test/cli/testdatumfile @@ -98,9 +98,9 @@ $EXE +proj=latlong +datum=WGS84 \ EOF # echo "##############################################################" >> ${OUT} -echo "NAD27 -> NAD83: 1st through ntv1, 2nd through conus" >> ${OUT} +echo "NAD27 -> NAD83: 1st through ntv1 or ntv2, 2nd through conus" >> ${OUT} # -$EXE NAD27 NAD83 -E >>${OUT} <>${OUT} <> ${OUT} $EXE +proj=longlat +datum=NAD27 +to +proj=longlat +datum=WGS84 -E -d 8 >>${OUT} <> ${OUT} +echo "NAD27 -> NAD83: 1st through ntv2, 2nd through conus" >> ${OUT} +# +$EXE NAD27 NAD83 -E >>${OUT} < Date: Sun, 5 Jan 2020 22:55:01 +0100 Subject: Make sure tests pass if extra grids are present Should fix the issue reported in https://lists.osgeo.org/pipermail/proj/2020-January/009188.html Some extra north-american grids present in data/ can affect the results of some tests, so create a data/for_tests/ subdirectory in which we copy only select grids. --- test/cli/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/cli') diff --git a/test/cli/Makefile.am b/test/cli/Makefile.am index fb7169e4..33878743 100644 --- a/test/cli/Makefile.am +++ b/test/cli/Makefile.am @@ -1,5 +1,5 @@ # Executables paths passed to test scripts -PROJ_LIB ?= ../../data +PROJ_LIB = ../../data/for_tests THIS_DIR = $(top_srcdir)/test/cli EXEPATH = ../../src PROJEXE = $(EXEPATH)/proj -- cgit v1.2.3 From 6426bcbd3605bf8cd6ae5c7869931fa89a26d641 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 7 Jan 2020 15:32:47 +0100 Subject: projinfo: support -k datum --- test/cli/testprojinfo | 20 ++++++++++++++++++++ test/cli/testprojinfo_out.dist | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) (limited to 'test/cli') diff --git a/test/cli/testprojinfo b/test/cli/testprojinfo index 4ce5e90c..b9c452fb 100755 --- a/test/cli/testprojinfo +++ b/test/cli/testprojinfo @@ -155,6 +155,26 @@ echo 'Testing -s "GDA2020" -t "AHD height" --grid-check none -o PROJ --spatial-t $EXE -s "GDA2020" -t "AHD height" --grid-check none -o PROJ --spatial-test intersects >>${OUT} 2>&1 echo "" >>${OUT} +echo 'Testing -k ellipsoid WGS84' >> ${OUT} +$EXE -k ellipsoid WGS84 >>${OUT} 2>&1 +echo "" >>${OUT} + +echo 'Testing -k ellipsoid EPSG:7030' >> ${OUT} +$EXE -k ellipsoid EPSG:7030 >>${OUT} 2>&1 +echo "" >>${OUT} + +echo 'Testing -k datum WGS84' >> ${OUT} +$EXE -k datum WGS84 >>${OUT} 2>&1 +echo "" >>${OUT} + +echo 'Testing -k datum EPSG:6326' >> ${OUT} +$EXE -k datum EPSG:6326 >>${OUT} 2>&1 +echo "" >>${OUT} + +echo 'Testing -k operation EPSG:8457 -o PROJ -q' >> ${OUT} +$EXE -k operation EPSG:8457 -o PROJ -q >>${OUT} 2>&1 +echo "" >>${OUT} + # do 'diff' with distribution results echo "diff ${OUT} with testprojinfo_out.dist" diff -u ${OUT} ${TEST_CLI_DIR}/testprojinfo_out.dist diff --git a/test/cli/testprojinfo_out.dist b/test/cli/testprojinfo_out.dist index afadbd27..36f23dd9 100644 --- a/test/cli/testprojinfo_out.dist +++ b/test/cli/testprojinfo_out.dist @@ -1096,3 +1096,38 @@ DERIVED_FROM(EPSG):8451, GDA2020 to AHD height (1), 0.03 m, Australia Christmas PROJ string: +proj=pipeline +step +inv +proj=vgridshift +grids=AUSGeoid2020_20180201.gtx +multiplier=1 +Testing -k ellipsoid WGS84 +PROJ string: ++ellps=WGS84 + +WKT2:2019 string: +ELLIPSOID["WGS 84",6378137,298.257223563, + LENGTHUNIT["metre",1], + ID["EPSG",7030]] + +Testing -k ellipsoid EPSG:7030 +PROJ string: ++ellps=WGS84 + +WKT2:2019 string: +ELLIPSOID["WGS 84",6378137,298.257223563, + LENGTHUNIT["metre",1], + ID["EPSG",7030]] + +Testing -k datum WGS84 +WKT2:2019 string: +DATUM["World Geodetic System 1984", + ELLIPSOID["WGS 84",6378137,298.257223563, + LENGTHUNIT["metre",1]], + ID["EPSG",6326]] + +Testing -k datum EPSG:6326 +WKT2:2019 string: +DATUM["World Geodetic System 1984", + ELLIPSOID["WGS 84",6378137,298.257223563, + LENGTHUNIT["metre",1]], + ID["EPSG",6326]] + +Testing -k operation EPSG:8457 -o PROJ -q ++proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=push +v_3 +step +proj=cart +ellps=bessel +step +proj=helmert +x=674.374 +y=15.056 +z=405.346 +step +inv +proj=cart +ellps=WGS84 +step +proj=pop +v_3 +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 + -- cgit v1.2.3 From 18ba7b3dfcf1142227eacd8e76d4086a3d8292f4 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 7 Jan 2020 21:38:05 +0100 Subject: projinfo: use No. abbreviation instead of UTF-8 character (fixes #1828) --- test/cli/testprojinfo_out.dist | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'test/cli') diff --git a/test/cli/testprojinfo_out.dist b/test/cli/testprojinfo_out.dist index afadbd27..794f313b 100644 --- a/test/cli/testprojinfo_out.dist +++ b/test/cli/testprojinfo_out.dist @@ -182,7 +182,7 @@ PROJJSON: Testing projinfo -s EPSG:4326 -t EPSG:32631 Candidate operations found: 1 ------------------------------------- -Operation n°1: +Operation No. 1: EPSG:16031, UTM zone 31N, 0 m, World - N hemisphere - 0°E to 6°E @@ -214,7 +214,7 @@ Testing projinfo -s NAD27 -t NAD83 Candidate operations found: 1 Note: using '--spatial-test intersects' would bring more results (10) ------------------------------------- -Operation n°1: +Operation No. 1: unknown id, Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, World, has ballpark transformation @@ -282,7 +282,7 @@ EPSG:8549, NAD27 to NAD83 (8), 0.5 m, USA - Alaska Testing projinfo -s NAD27 -t NAD83 --grid-check none --spatial-test intersects Candidate operations found: 10 ------------------------------------- -Operation n°1: +Operation No. 1: DERIVED_FROM(EPSG):1312, NAD27 to NAD83 (3), 2.0 m, Canada @@ -332,7 +332,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (3)", ID["DERIVED_FROM(EPSG)",1312]] ------------------------------------- -Operation n°2: +Operation No. 2: DERIVED_FROM(EPSG):1313, NAD27 to NAD83 (4), 1.5 m, Canada - NAD27 @@ -382,7 +382,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (4)", ID["DERIVED_FROM(EPSG)",1313]] ------------------------------------- -Operation n°3: +Operation No. 3: DERIVED_FROM(EPSG):1241, NAD27 to NAD83 (1), 0.15 m, USA - CONUS including EEZ @@ -431,7 +431,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (1)", ID["DERIVED_FROM(EPSG)",1241]] ------------------------------------- -Operation n°4: +Operation No. 4: DERIVED_FROM(EPSG):1243, NAD27 to NAD83 (2), 0.5 m, USA - Alaska including EEZ @@ -480,7 +480,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (2)", ID["DERIVED_FROM(EPSG)",1243]] ------------------------------------- -Operation n°5: +Operation No. 5: DERIVED_FROM(EPSG):1573, NAD27 to NAD83 (6), 1.5 m, Canada - Quebec @@ -530,7 +530,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (6)", ID["DERIVED_FROM(EPSG)",1573]] ------------------------------------- -Operation n°6: +Operation No. 6: EPSG:1462, NAD27 to NAD83 (5), 2.0 m, Canada - Quebec @@ -582,7 +582,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (5)", REMARK["Densification for Quebec of code 1312. Replaced by NAD27 to NAD83 (6) (code 1573). Uses NT method which expects longitudes positive west; EPSG GeogCRSs NAD27 (code 4267) and NAD83 (code 4269) have longitudes positive east."]] ------------------------------------- -Operation n°7: +Operation No. 7: EPSG:9111, NAD27 to NAD83 (9), 1.5 m, Canada - Saskatchewan @@ -633,7 +633,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (9)", ID["EPSG",9111]] ------------------------------------- -Operation n°8: +Operation No. 8: unknown id, Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, World, has ballpark transformation @@ -686,7 +686,7 @@ COORDINATEOPERATION["Ballpark geographic offset from NAD27 to NAD83", BBOX[-90,-180,90,180]]] ------------------------------------- -Operation n°9: +Operation No. 9: EPSG:8555, NAD27 to NAD83 (7), 0.15 m, USA - CONUS and GoM @@ -738,7 +738,7 @@ COORDINATEOPERATION["NAD27 to NAD83 (7)", REMARK["Uses NADCON5 method which expects longitudes positive east in range 0-360°; source and target CRSs have longitudes positive east in range -180° to +180°. Accuracy at 67% confidence level is 0.15m onshore, 1m nearshore and undetermined farther offshore."]] ------------------------------------- -Operation n°10: +Operation No. 10: EPSG:8549, NAD27 to NAD83 (8), 0.5 m, USA - Alaska @@ -901,7 +901,7 @@ PROJ.4 string: Testing RH2000 height to SWEREF99: projinfo -s EPSG:5613 -t EPSG:4977 Candidate operations found: 1 ------------------------------------- -Operation n°1: +Operation No. 1: PROJ:EPSG_5613_TO_EPSG_4977, RH2000 height to SWEREF99, unknown accuracy, Sweden - onshore @@ -947,7 +947,7 @@ COORDINATEOPERATION["RH2000 height to SWEREF99", Testing NAD83(2011) + NAVD88 height -> NAD83(2011) : projinfo -s EPSG:6349 -t EPSG:6319 --spatial-test intersects -o PROJ Candidate operations found: 2 ------------------------------------- -Operation n°1: +Operation No. 1: unknown id, Inverse of NAD83(2011) to NAVD88 height (3), 0.015 m, USA - CONUS - onshore @@ -955,7 +955,7 @@ PROJ string: +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=vgridshift +grids=g2018u0.gtx +multiplier=1 +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1 ------------------------------------- -Operation n°2: +Operation No. 2: unknown id, Inverse of NAD83(2011) to NAVD88 height (2), 0.02 m, USA - Alaska @@ -965,7 +965,7 @@ PROJ string: Testing NGF IGN69 height to RGF93: projinfo -s EPSG:5720 -t EPSG:4965 -o PROJ Candidate operations found: 2 ------------------------------------- -Operation n°1: +Operation No. 1: INVERSE(DERIVED_FROM(EPSG)):8885, Inverse of RGF93 to NGF IGN69 height (3), 0.01 m, France - mainland onshore @@ -973,7 +973,7 @@ PROJ string: +proj=vgridshift +grids=RAF18.gtx +multiplier=1 ------------------------------------- -Operation n°2: +Operation No. 2: INVERSE(EPSG):10000, Inverse of RGF93 to NGF IGN69 height (1), 0.5 m, France - mainland onshore @@ -1079,7 +1079,7 @@ unknown id, Inverse of 3-degree Gauss-Kruger zone 3 + DHDN to ETRS89 (2), 3 m, G Testing -s "GDA94" -t "AHD height" --grid-check none -o PROJ --spatial-test intersects Candidate operations found: 1 ------------------------------------- -Operation n°1: +Operation No. 1: DERIVED_FROM(EPSG):5656, GDA94 to AHD height (49), 0.03 m, Australia - mainland @@ -1089,7 +1089,7 @@ PROJ string: Testing -s "GDA2020" -t "AHD height" --grid-check none -o PROJ --spatial-test intersects Candidate operations found: 1 ------------------------------------- -Operation n°1: +Operation No. 1: DERIVED_FROM(EPSG):8451, GDA2020 to AHD height (1), 0.03 m, Australia Christmas and Cocos - onshore -- cgit v1.2.3