From dc55b17d0c7ae180bb73add3581fac7e8f959c11 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 30 Nov 2019 19:41:50 +0100 Subject: Database: register the BWTA2017.gsb grid (DHDN->ETRS89 for Baden-Wurtemberg) Relates to https://github.com/OSGeo/proj-datumgrid/pull/65 , https://github.com/OSGeo/proj-datumgrid/issues/22 As EPSG has no entry for it, we create a grid_transformation, as well as a dedicated area of use based on the extent of the grid, under the PROJ authority. With the hope to be able to remove it once EPSG has an entry... --- test/cli/testprojinfo | 4 ++++ test/cli/testprojinfo_out.dist | 7 +++++++ 2 files changed, 11 insertions(+) (limited to 'test/cli') diff --git a/test/cli/testprojinfo b/test/cli/testprojinfo index 4ac21118..9d0ce52d 100755 --- a/test/cli/testprojinfo +++ b/test/cli/testprojinfo @@ -143,6 +143,10 @@ echo 'Testing -s "AGD66" -t "WGS 84 (G1762)" --spatial-test intersects --summary $EXE -s "AGD66" -t "WGS 84 (G1762)" --spatial-test intersects --summary >>${OUT} 2>&1 echo "" >>${OUT} +echo 'Testing -s EPSG:31467 -t ETRS89 --spatial-test intersects --grid-check none --bbox 8,48,9,49 --summary. Should include both DHDN to ETRS89 (8) and DHDN to ETRS89 (BWTA2017)' >> ${OUT} +$EXE -s EPSG:31467 -t ETRS89 --spatial-test intersects --grid-check none --bbox 8,48,9,49 --summary >>${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 0e11ea3f..8b17c0e7 100644 --- a/test/cli/testprojinfo_out.dist +++ b/test/cli/testprojinfo_out.dist @@ -1071,3 +1071,10 @@ unknown id, AGD66 to GDA2020 (1) + Conversion from GDA2020 (geog2D) to GDA2020 ( unknown id, AGD66 to WGS 84 (17) + WGS 84 to WGS 84 (G1762), 3 m, Australia - onshore unknown id, Ballpark geographic offset from AGD66 to WGS 84 (G1762), unknown accuracy, World, has ballpark transformation +Testing -s EPSG:31467 -t ETRS89 --spatial-test intersects --grid-check none --bbox 8,48,9,49 --summary. Should include both DHDN to ETRS89 (8) and DHDN to ETRS89 (BWTA2017) +Candidate operations found: 4 +unknown id, Inverse of 3-degree Gauss-Kruger zone 3 + DHDN to ETRS89 (BWTA2017), 0.89 m, Germany - Baden-Wurtemberg +unknown id, Inverse of 3-degree Gauss-Kruger zone 3 + DHDN to ETRS89 (8), 0.9 m, Germany - onshore +unknown id, Inverse of 3-degree Gauss-Kruger zone 3 + DHDN to ETRS89 (3), 1 m, Germany - West Germany S +unknown id, Inverse of 3-degree Gauss-Kruger zone 3 + DHDN to ETRS89 (2), 3 m, Germany - West Germany all states + -- cgit v1.2.3 From 5a7ff4380e9526aca0287e45b27a8b37664e9708 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sun, 1 Dec 2019 00:16:15 +0100 Subject: Database: register AUSGeoid09 and AUSGeoid2020 Related to https://github.com/OSGeo/proj-datumgrid/pull/66 Tune operation search so that it can work with Geog2D <--> VertCS for commandline niceness --- test/cli/testprojinfo | 8 ++++++++ test/cli/testprojinfo_out.dist | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) (limited to 'test/cli') diff --git a/test/cli/testprojinfo b/test/cli/testprojinfo index 9d0ce52d..4ce5e90c 100755 --- a/test/cli/testprojinfo +++ b/test/cli/testprojinfo @@ -147,6 +147,14 @@ echo 'Testing -s EPSG:31467 -t ETRS89 --spatial-test intersects --grid-check non $EXE -s EPSG:31467 -t ETRS89 --spatial-test intersects --grid-check none --bbox 8,48,9,49 --summary >>${OUT} 2>&1 echo "" >>${OUT} +echo 'Testing -s "GDA94" -t "AHD height" --grid-check none -o PROJ --spatial-test intersects' >> ${OUT} +$EXE -s "GDA94" -t "AHD height" --grid-check none -o PROJ --spatial-test intersects >>${OUT} 2>&1 +echo "" >>${OUT} + +echo 'Testing -s "GDA2020" -t "AHD height" --grid-check none -o PROJ --spatial-test intersects' >> ${OUT} +$EXE -s "GDA2020" -t "AHD height" --grid-check none -o PROJ --spatial-test intersects >>${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 8b17c0e7..25b29a79 100644 --- a/test/cli/testprojinfo_out.dist +++ b/test/cli/testprojinfo_out.dist @@ -1078,3 +1078,23 @@ unknown id, Inverse of 3-degree Gauss-Kruger zone 3 + DHDN to ETRS89 (8), 0.9 m, unknown id, Inverse of 3-degree Gauss-Kruger zone 3 + DHDN to ETRS89 (3), 1 m, Germany - West Germany S unknown id, Inverse of 3-degree Gauss-Kruger zone 3 + DHDN to ETRS89 (2), 3 m, Germany - West Germany all states +Testing -s "GDA94" -t "AHD height" --grid-check none -o PROJ --spatial-test intersects +Candidate operations found: 1 +------------------------------------- +Operation n°1: + +DERIVED_FROM(EPSG):5656, GDA94 to AHD height (49), 0.03 m, Australia - mainland + +PROJ string: ++proj=pipeline +step +inv +proj=vgridshift +grids=AUSGeoid09_V1.01.gtx +multiplier=1 + +Testing -s "GDA2020" -t "AHD height" --grid-check none -o PROJ --spatial-test intersects +Candidate operations found: 1 +------------------------------------- +Operation n°1: + +DERIVED_FROM(EPSG):8451, GDA2020 to AHD height (1), 0.03 m, Australia Christmas and Cocos - onshore + +PROJ string: ++proj=pipeline +step +inv +proj=vgridshift +grids=AUSGeoid2020_20180201.gtx +multiplier=1 + -- cgit v1.2.3 From 443ce39d0906a57c80086041c0f013fef21fa11a Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 5 Dec 2019 21:25:53 +0100 Subject: Update ntv2_out.dist and conditions to run it --- test/cli/Makefile.am | 2 +- test/cli/ntv2_out.dist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'test/cli') diff --git a/test/cli/Makefile.am b/test/cli/Makefile.am index db47370c..758352c6 100644 --- a/test/cli/Makefile.am +++ b/test/cli/Makefile.am @@ -49,7 +49,7 @@ testign-check: fi testntv2-check: - @if [ -f $(PROJ_LIB)/ntv2_0.gsb ] ; then \ + @if [ -f $(PROJ_LIB)/ntv2_0.gsb -a -f $(PROJ_LIB)/conus -a -f $(PROJ_LIB)/ntv1_can.dat ] ; then \ PROJ_LIB=$(PROJ_LIB) $(TESTNTV2) $(CS2CSEXE) ; \ fi diff --git a/test/cli/ntv2_out.dist b/test/cli/ntv2_out.dist index 5ce26e6e..9a97f9cf 100644 --- a/test/cli/ntv2_out.dist +++ b/test/cli/ntv2_out.dist @@ -7,5 +7,5 @@ Point in the ONwinsor subgrid. ############################################################## 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.1549"W 45d59'59.7528"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 -- cgit v1.2.3