Merge pull request #4278 from OSGeo/backport-4275-to-9.5

[Backport 9.5] Database: update to EPSG v11.019

data/sql/alias_name.sql

@@ -747,8 +747,10 @@ INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','1386','WC05-IRF','EPSG'
 INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','1385','ECML14-IRF','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_datum','EPSG','1388','GLLAT(2023)','EPSG');
 INSERT INTO "alias_name" VALUES('vertical_datum','EPSG','1387','GLMSL(2023)','EPSG');
+INSERT INTO "alias_name" VALUES('vertical_datum','EPSG','1384','CGVD28(HTv2.0)','EPSG');
 INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','1081','DB_REF2003','EPSG');
 INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','1081','DB_REF2016','EPSG');
+INSERT INTO "alias_name" VALUES('vertical_datum','EPSG','1390','BSCD2000','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','21100','Genuk / NEIEZ','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2140','NAD83(CSRS98) / SCoPQ zone 3','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2141','NAD83(CSRS98) / SCoPQ zone 4','EPSG');
@@ -7990,6 +7992,7 @@ INSERT INTO "alias_name" VALUES('compound_crs','EPSG','10659','ETRS89 + EOMA 198
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','10665','Porto Alegre Cartographic Reference System (SCR-POA)','EPSG');
 INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','4801','Bern 1898 (Bern)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','21780','Bern 1898 (Bern) / LV03C','EPSG');
+INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','10588','CGVD28(HT2)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5682','DB_REF2016 / 3GK zone 2 E-N','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5682','DB_REF2003 / 3-degree Gauss-Kruger zone 2 (E-N)','EPSG');
 INSERT INTO "alias_name" VALUES('projected_crs','EPSG','5683','DB_REF2016 / 3GK zone 3 E-N','EPSG');

data/sql/compound_crs.sql

@@ -882,6 +882,8 @@ INSERT INTO "compound_crs" VALUES('EPSG','10659','ETRF2000 + EOMA 1980 height',N
 INSERT INTO "usage" VALUES('EPSG','21613','compound_crs','EPSG','10659','EPSG','1119','EPSG','1181');
 INSERT INTO "compound_crs" VALUES('EPSG','10660','HD72 / EOV + EOMA 1980 height',NULL,'EPSG','23700','EPSG','5787',0);
 INSERT INTO "usage" VALUES('EPSG','21616','compound_crs','EPSG','10660','EPSG','1119','EPSG','1056');
+INSERT INTO "compound_crs" VALUES('EPSG','10679','ETRS89 + BSCD2000 depth',NULL,'EPSG','4258','EPSG','10678',0);
+INSERT INTO "usage" VALUES('EPSG','21815','compound_crs','EPSG','10679','EPSG','4779','EPSG','1291');
 INSERT INTO "compound_crs" VALUES('EPSG','20001','ETRS89 + SVD2006 height',NULL,'EPSG','4258','EPSG','20000',0);
 INSERT INTO "usage" VALUES('EPSG','17956','compound_crs','EPSG','20001','EPSG','4058','EPSG','1026');
 INSERT INTO "compound_crs" VALUES('EPSG','20003','MWC18 Grid + ODN height',NULL,'EPSG','20002','EPSG','5701',0);

data/sql/extent.sql

@@ -3753,3 +3753,5 @@ INSERT INTO "extent" VALUES('EPSG','4774','UK - London to Edinburgh','United Kin
 INSERT INTO "extent" VALUES('EPSG','4775','UK - London to Glasgow','United Kingdom (UK) - on or related to the west coast mainline rail route from London (Euston) via Carlisle to Glasgow.',51.4,55.92,-4.33,-0.04,0);
 INSERT INTO "extent" VALUES('EPSG','4776','Greenland - offshore','Greenland - offshore.',56.38,87.03,-75.0,7.99,0);
 INSERT INTO "extent" VALUES('EPSG','4777','Brazil - Porto Alegre municipality','Brazil - Porto Alegre municipality.',-30.27,-29.93,-51.3,-51.01,0);
+INSERT INTO "extent" VALUES('EPSG','4778','Canada - CGVD28(HTv2.0)','Canada - onshore and offshore between 41°N and 84°N and west of 48°W - Alberta; British Columbia; Manitoba; New Brunswick; Newfoundland and Labrador; Northwest Territories; Nova Scotia; Nunavut; Ontario; Prince Edward Island; Quebec; Saskatchewan; Yukon.',41.0,84.0,-141.01,-48.0,0);
+INSERT INTO "extent" VALUES('EPSG','4779','Europe - Baltic Sea','Denmark, Estonia,  Finland, Latvia, Lithuania, Norway, Poland, Russia and Sweden - offshore Baltic Sea including Skagerrak east of 8°30''E, Kattegat, Gulf of Bothnia, and Gulf of Finland.',53.88,65.92,8.5,30.23,0);

data/sql/helmert_transformation.sql

@@ -2688,7 +2688,7 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','10589','ITRF2014 to Segara (
 INSERT INTO "usage" VALUES('EPSG','21255','helmert_transformation','EPSG','10589','EPSG','1328','EPSG','1136');
 INSERT INTO "helmert_transformation" VALUES('EPSG','10607','WGS 84 (G2139) to WGS 84 (G2296) (1)','Scale difference in ppb where 1/billion = 1E-9 or nm/m. Calculated by extrapolating the position and velocity of the seventeen WGS 84 GPS monitoring sites to the epoch 2024.00.','EPSG','1032','Coordinate Frame rotation (geocentric domain)','EPSG','9753','EPSG','10604',0.01,2.6,5.4,-0.9,'EPSG','1025',-0.01,-0.07,0.0,'EPSG','1031',0.06,'EPSG','1028',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'NGA-Wld 2024.0',0);
 INSERT INTO "usage" VALUES('EPSG','21197','helmert_transformation','EPSG','10607','EPSG','1262','EPSG','1027');
-INSERT INTO "helmert_transformation" VALUES('EPSG','10608','WGS 84 (G2296) to ITRF2020 (1)','Scale difference in ppb where 1/billion = 1E-9 or nm/m.','EPSG','1032','Coordinate Frame rotation (geocentric domain)','EPSG','10604','EPSG','9988',0.01,0.0,0.0,0.0,'EPSG','1025',0.0,0.0,0.0,'EPSG','1031',0.0,'EPSG','1028',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'NGA-Wld 2024.0',0);
+INSERT INTO "helmert_transformation" VALUES('EPSG','10608','WGS 84 (G2296) to ITRF2020 (1)','Scale difference in ppb where 1/billion = 1E-9 or nm/m. Accuracy of 1cm applies at epoch 2024.0. Due to subsequent drift between the reference frames it may reach 2cm at other epochs.','EPSG','1032','Coordinate Frame rotation (geocentric domain)','EPSG','10604','EPSG','9988',0.01,0.0,0.0,0.0,'EPSG','1025',0.0,0.0,0.0,'EPSG','1031',0.0,'EPSG','1028',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'NGA-Wld 2024.0',0);
 INSERT INTO "usage" VALUES('EPSG','21198','helmert_transformation','EPSG','10608','EPSG','1262','EPSG','1026');
 INSERT INTO "helmert_transformation" VALUES('EPSG','15483','Tokyo to JGD2000 (1)','Derived at Tokyo datum origin. Accuracy on main islands 9m. Also used on remote islands with significantly less accuracy: Io-To 793m, Kitadaito and Minamidaito Jima 642m, Tarama and Minna Shima 560m, Ishigaki and Taketomi Jima 251m, Yonaguni Jima 248m.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4301','EPSG','4612',9.0,-146.414,507.337,680.507,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'GSI-Jpn',0);
 INSERT INTO "usage" VALUES('EPSG','11494','helmert_transformation','EPSG','15483','EPSG','3957','EPSG','1142');

data/sql/metadata.sql

@@ -9,8 +9,8 @@
 INSERT INTO "metadata" VALUES('DATABASE.LAYOUT.VERSION.MAJOR', 1);
 INSERT INTO "metadata" VALUES('DATABASE.LAYOUT.VERSION.MINOR', 4);
 
-INSERT INTO "metadata" VALUES('EPSG.VERSION', 'v11.017');
-INSERT INTO "metadata" VALUES('EPSG.DATE', '2024-09-17');
+INSERT INTO "metadata" VALUES('EPSG.VERSION', 'v11.019');
+INSERT INTO "metadata" VALUES('EPSG.DATE', '2024-10-10');
 
 -- The value of ${PROJ_VERSION} is substituted at build time by the actual
 -- value.

data/sql/other_transformation.sql

@@ -838,6 +838,8 @@ INSERT INTO "other_transformation" VALUES('EPSG','10391','Cais da Vila do Porto
 INSERT INTO "usage" VALUES('EPSG','20101','other_transformation','EPSG','10391','EPSG','4737','EPSG','1060');
 INSERT INTO "other_transformation" VALUES('EPSG','10517','NAD83(2011) / Adjusted Jackson (ftUS) to NAD83(HARN) / WISCRS Jackson (ftUS) (1)','','EPSG','9656','Cartesian Grid Offsets','EPSG','10516','EPSG','8162',0.1,'EPSG','8728','Easting offset',0.0,'EPSG','9003','EPSG','8729','Northing offset',0.0,'EPSG','9003',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'1',0);
 INSERT INTO "usage" VALUES('EPSG','20745','other_transformation','EPSG','10517','EPSG','4343','EPSG','1026');
+INSERT INTO "other_transformation" VALUES('EPSG','10620','CGVD28 height to CGVD28(HTv2.0) height (1)','Null transformation. CGVD28 is defined by the levelling network. CGVD28(HTv2.0) is defined by the Height Transformation (HT) v2.0 hybrid geoid model at epoch 1997.0 (transformation from NAD83(CSRS)v3 to CGVD28, CT code 9983).','EPSG','9616','Vertical Offset','EPSG','5713','EPSG','10588',0.05,'EPSG','8603','Vertical Offset',0.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'NR-Can HT2 1997',0);
+INSERT INTO "usage" VALUES('EPSG','21592','other_transformation','EPSG','10620','EPSG','1289','EPSG','1059');
 INSERT INTO "other_transformation" VALUES('EPSG','15487','TWD67 / TM2 zone 121 to TWD97 / TM2 zone 121 (1)','Derived at Hu Tzu Shan (23°59''N, 120°58''E). Residuals increase to maximum of 6.4m as distance increases from this point.','EPSG','9656','Cartesian Grid Offsets','EPSG','3828','EPSG','3826',7.0,'EPSG','8728','Easting offset',828.589,'EPSG','9001','EPSG','8729','Northing offset',-206.915,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'asafi-Twn',0);
 INSERT INTO "usage" VALUES('EPSG','11498','other_transformation','EPSG','15487','EPSG','3982','EPSG','1045');
 INSERT INTO "other_transformation" VALUES('EPSG','15596','Tokyo + JSLD height to WGS 84 (7)','','EPSG','9618','Geographic2D with Height Offsets','EPSG','7414','EPSG','4979',1.0,'EPSG','8601','Latitude offset',7.94,'EPSG','9104','EPSG','8602','Longitude offset',-13.97,'EPSG','9104','EPSG','8604','Geoid undulation',26.9,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'GSI-Jpn 452142',0);

data/sql/scope.sql

@@ -267,3 +267,4 @@ INSERT INTO "scope" VALUES('EPSG','1287','Continental mapping of raster data.',0
 INSERT INTO "scope" VALUES('EPSG','1288','Change of coordinate epoch in 2-dimensions (φλ horizontal only).',0);
 INSERT INTO "scope" VALUES('EPSG','1289','Geodesy. Defines ETRF2020.',0);
 INSERT INTO "scope" VALUES('EPSG','1290','Pan-European conformal mapping at scales larger than 1:500,000, engineering survey and topographic mapping at all scales.',0);
+INSERT INTO "scope" VALUES('EPSG','1291','Reference surface for depths in BSHC offshore products for the Baltic Sea (including nautical maps, bathymetry data, water level corrections etc).',0);

data/sql/vertical_crs.sql

@@ -502,10 +502,14 @@ INSERT INTO "vertical_crs" VALUES('EPSG','10552','DKLAT depth',NULL,'EPSG','6498
 INSERT INTO "usage" VALUES('EPSG','21269','vertical_crs','EPSG','10552','EPSG','4756','EPSG','1198');
 INSERT INTO "vertical_crs" VALUES('EPSG','10565','GLLMSL(2022) height',NULL,'EPSG','6499','EPSG','1378',0);
 INSERT INTO "usage" VALUES('EPSG','21000','vertical_crs','EPSG','10565','EPSG','3119','EPSG','1142');
+INSERT INTO "vertical_crs" VALUES('EPSG','10588','CGVD28(HTv2.0) height',NULL,'EPSG','6499','EPSG','1384',0);
+INSERT INTO "usage" VALUES('EPSG','21633','vertical_crs','EPSG','10588','EPSG','4778','EPSG','1132');
 INSERT INTO "vertical_crs" VALUES('EPSG','10649','GLMSL(2023) depth',NULL,'EPSG','6498','EPSG','1387',0);
 INSERT INTO "usage" VALUES('EPSG','21472','vertical_crs','EPSG','10649','EPSG','4776','EPSG','1198');
 INSERT INTO "vertical_crs" VALUES('EPSG','10650','GLLAT(2023) depth',NULL,'EPSG','6498','EPSG','1388',0);
 INSERT INTO "usage" VALUES('EPSG','21473','vertical_crs','EPSG','10650','EPSG','4776','EPSG','1198');
+INSERT INTO "vertical_crs" VALUES('EPSG','10678','BSCD2000 depth',NULL,'EPSG','6498','EPSG','1390',0);
+INSERT INTO "usage" VALUES('EPSG','21810','vertical_crs','EPSG','10678','EPSG','4779','EPSG','1291');
 INSERT INTO "vertical_crs" VALUES('EPSG','20000','SVD2006 height',NULL,'EPSG','6499','EPSG','1323',0);
 INSERT INTO "usage" VALUES('EPSG','17962','vertical_crs','EPSG','20000','EPSG','4058','EPSG','1180');
 INSERT INTO "vertical_crs" VALUES('EPSG','20034','CGVD2013a(2002) height',NULL,'EPSG','6499','EPSG','1325',0);

data/sql/vertical_datum.sql

@@ -270,10 +270,14 @@ INSERT INTO "vertical_datum" VALUES('EPSG','1375','Denmark Lowest Astronomic Tid
 INSERT INTO "usage" VALUES('EPSG','21041','vertical_datum','EPSG','1375','EPSG','4756','EPSG','1198');
 INSERT INTO "vertical_datum" VALUES('EPSG','1378','Greenland Local Mean Sea Level (2022)',NULL,'2022-01-01',NULL,NULL,NULL,NULL,0);
 INSERT INTO "usage" VALUES('EPSG','20999','vertical_datum','EPSG','1378','EPSG','3119','EPSG','1142');
+INSERT INTO "vertical_datum" VALUES('EPSG','1384','Canadian Geodetic Vertical Datum of 1928 (Height Transformation version 2.0)',NULL,'2001-08-15',NULL,NULL,NULL,1997.0,0);
+INSERT INTO "usage" VALUES('EPSG','21632','vertical_datum','EPSG','1384','EPSG','4778','EPSG','1132');
 INSERT INTO "vertical_datum" VALUES('EPSG','1387','Greenland Mean Sea Level (2023)',NULL,'2024-06-18',NULL,NULL,NULL,NULL,0);
 INSERT INTO "usage" VALUES('EPSG','21471','vertical_datum','EPSG','1387','EPSG','4776','EPSG','1198');
 INSERT INTO "vertical_datum" VALUES('EPSG','1388','Greenland Lowest Astronomic Tide (2023)',NULL,'2024-06-04',NULL,NULL,NULL,NULL,0);
 INSERT INTO "usage" VALUES('EPSG','21470','vertical_datum','EPSG','1388','EPSG','4776','EPSG','1198');
+INSERT INTO "vertical_datum" VALUES('EPSG','1390','Baltic Sea Chart Datum 2000',NULL,'2023-11-01',NULL,NULL,NULL,NULL,0);
+INSERT INTO "usage" VALUES('EPSG','21819','vertical_datum','EPSG','1390','EPSG','4779','EPSG','1291');
 INSERT INTO "vertical_datum" VALUES('EPSG','5100','Mean Sea Level',NULL,NULL,NULL,NULL,NULL,NULL,0);
 INSERT INTO "usage" VALUES('EPSG','13307','vertical_datum','EPSG','5100','EPSG','1262','EPSG','1199');
 INSERT INTO "vertical_datum" VALUES('EPSG','5101','Ordnance Datum Newlyn',NULL,'1956-01-01',NULL,NULL,NULL,NULL,0);

src/iso19111/operation/singleoperation.cpp

@@ -4009,8 +4009,10 @@ bool SingleOperation::exportToPROJStringGeneric(
         sourceCRSVert->addLinearUnitConvert(formatter);
         formatter->stopInversion();
 
-        formatter->addStep("geogoffset");
-        formatter->addParam("dh", offsetHeight);
+        if (offsetHeight != 0) {
+            formatter->addStep("geogoffset");
+            formatter->addParam("dh", offsetHeight);
+        }
 
         targetCRSVert->addLinearUnitConvert(formatter);
 

test/cli/test_projinfo.yaml

@@ -1834,3 +1834,7 @@ tests:
   out: |
     Candidate operations found: 1
     unknown id, Null geographic offset from NAD83(CSRS)v7 (geog2D) to NAD83(CSRS)v7 (geog3D) + Canada velocity grid v7 from epoch 1997 to epoch 2010 + Null geographic offset from NAD83(CSRS)v7 (geog3D) to NAD83(CSRS)v7 (geog2D), 0.01 m, Canada - onshore - Alberta; British Columbia (BC); Manitoba; New Brunswick (NB); Newfoundland and Labrador; Northwest Territories (NWT); Nova Scotia (NS); Nunavut; Ontario; Prince Edward Island (PEI); Quebec; Saskatchewan; Yukon.
+- comment: >
+    Test that "CGVD28 height" to "CGVD28(HTv2.0) height" is a no-op
+  args: -s "CGVD28 height" -t "CGVD28(HTv2.0) height" -o PROJ -q
+  out: +proj=noop

test/unit/test_operationfactory.cpp

@@ -6185,7 +6185,7 @@ TEST(
             NN_NO_CHECK(src), NN_NO_CHECK(dst), ctxt);
         ASSERT_GE(list.size(), 2U);
         EXPECT_EQ(list[0]->nameStr(),
-                  "Inverse of NAD83(CSRS)v6 to CGVD28 height (1) + "
+                  "Inverse of NAD83(CSRS)v6 to CGVD28(HTv2.0) height (1) + "
                   "NAD83(CSRS)v6 to CGVD2013(CGG2013) height (1) "
                   "using Null geographic offset "
                   "from NAD83(CSRS)v6 (geog3D) to NAD83(CSRS)v6 (geog2D) + "