Merge pull request #2851 from rouault/epsg_10_035

Database: update to EPSG v10.035

4 files changed, 14 insertions, 16 deletions

diff --git a/test/cli/testprojinfo b/test/cli/testprojinfo
index 3081966b..2f8c1de5 100755
--- a/test/cli/testprojinfo
+++ b/test/cli/testprojinfo
@@ -372,8 +372,8 @@ $EXE --list-crs projected --bbox -100,40,-90,41 --spatial-test intersects | grep
 echo "" >>${OUT}
 
 # Test case where --area has several matches
-echo 'Testing --list-crs projected --area France | grep "RGF93 / Lambert-93\|UTM zone 11N" | sort' >> ${OUT}
-$EXE --list-crs projected --area France | grep "RGF93 / Lambert-93\|UTM zone 11N" | sort >> ${OUT}
+echo 'Testing --list-crs projected --area France | grep "RGF93 v1 / Lambert-93\|UTM zone 11N" | sort' >> ${OUT}
+$EXE --list-crs projected --area France | grep "RGF93 v1 / Lambert-93\|UTM zone 11N" | sort >> ${OUT}
 echo "" >>${OUT}
 
 # do 'diff' with distribution results
diff --git a/test/cli/testprojinfo_out.dist b/test/cli/testprojinfo_out.dist
index 2405462d..2cb30c63 100644
--- a/test/cli/testprojinfo_out.dist
+++ b/test/cli/testprojinfo_out.dist
@@ -1155,7 +1155,7 @@ Candidate operations found: 2
 -------------------------------------
 Operation No. 1:
 
-INVERSE(DERIVED_FROM(EPSG)):8885, Inverse of RGF93 to NGF-IGN69 height (3), 0.01 m, France - mainland onshore.
+INVERSE(DERIVED_FROM(EPSG)):10000, Inverse of RGF93 v1 to NGF-IGN69 height (1), 0.5 m, France - mainland onshore.
 
 PROJ string:
 +proj=pipeline
@@ -1168,7 +1168,7 @@ PROJ string:
 -------------------------------------
 Operation No. 2:
 
-unknown id, Transformation from NGF-IGN69 height to RGF93 (ballpark vertical transformation, without ellipsoid height to vertical height correction), unknown accuracy, World, has ballpark transformation
+unknown id, Transformation from NGF-IGN69 height to RGF93 v1 (ballpark vertical transformation, without ellipsoid height to vertical height correction), unknown accuracy, World, has ballpark transformation
 
 PROJ string:
 +proj=noop
@@ -1662,6 +1662,6 @@ ESRI:104010 "GCS_IGS08" [deprecated]
 Testing --list-crs projected --bbox -100,40,-90,41 --spatial-test intersects | grep "(2011).*Missouri East\|York" | sort
 EPSG:6512 "NAD83(2011) / Missouri East"
 
-Testing --list-crs projected --area France | grep "RGF93 / Lambert-93\|UTM zone 11N" | sort
-EPSG:2154 "RGF93 / Lambert-93"
+Testing --list-crs projected --area France | grep "RGF93 v1 / Lambert-93\|UTM zone 11N" | sort
+EPSG:2154 "RGF93 v1 / Lambert-93"
 
diff --git a/test/cli/testvarious b/test/cli/testvarious
index 80340369..cbfb2d55 100755
--- a/test/cli/testvarious
+++ b/test/cli/testvarious
@@ -1011,14 +1011,13 @@ EOF
 
 echo  "##############################################################" >> ${OUT}
 echo  "Test effect of --authority (https://github.com/OSGeo/PROJ/issues/2442)" >> ${OUT}
-echo  "This test might be a bit fragile if proj.db content changes" >> ${OUT}
-echo  "The first result should use the 'WGS_1984_(ITRF08)_To_NAD_1983_2011' (ESRI:108363) operation" >> ${OUT}
+echo  "The first result should use the EPSG:8076 operation" >> ${OUT}
 echo  "and the second one a no-op" >> ${OUT}
-$EXE -E +proj=latlong +datum=WGS84 +no_defs +to +init=epsg:6342 >> ${OUT} <<EOF
--105 40
+$EXE -E ITRF96 ITRF2014 >> ${OUT} <<EOF
+49 2
 EOF
-$EXE --authority EPSG -E +proj=latlong +datum=WGS84 +no_defs +to +init=epsg:6342 >> ${OUT} <<EOF
--105 40
+$EXE --authority PROJ -E ITRF96 ITRF2014 >> ${OUT} <<EOF
+49 2
 EOF
 
 echo  "##############################################################" >> ${OUT}
diff --git a/test/cli/tv_out.dist b/test/cli/tv_out.dist
index 06aa1a2d..a0009dab 100644
--- a/test/cli/tv_out.dist
+++ b/test/cli/tv_out.dist
@@ -487,11 +487,10 @@ Test Colombia Urban
 4.8 -74.25	122543.174	80859.033 0.000
 ##############################################################
 Test effect of --authority (https://github.com/OSGeo/PROJ/issues/2442)
-This test might be a bit fragile if proj.db content changes
-The first result should use the 'WGS_1984_(ITRF08)_To_NAD_1983_2011' (ESRI:108363) operation
+The first result should use the EPSG:8076 operation
 and the second one a no-op
--105 40	500000.86	4427756.50 0.00
--105 40	500000.00	4427757.22 0.00
+49 2	49d0'0.002"N	2dE 0.018
+49 2	49dN	2dE 0.000
 ##############################################################
 Test effect of --accuracy
 ##############################################################