Skip to content

Commit c524721

Browse files
rouaultrouault
authored
Merge pull request #4383 from rouault/epsg_11_028
Database: update to EPSG v11.028
2 parents 1384b79 + 4109710 commit c524721

File tree

7 files changed

+68
-31
lines changed

7 files changed

+68
-31
lines changed

‎data/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set(ALL_SQL_IN "${CMAKE_CURRENT_BINARY_DIR}/all.sql.in")
3131
set(PROJ_DB "${CMAKE_CURRENT_BINARY_DIR}/proj.db")
3232
include(sql_filelist.cmake)
3333

34-
set(PROJ_DB_SQL_EXPECTED_MD5 "f438a7808813019f9005c7e6b1d84fac")
34+
set(PROJ_DB_SQL_EXPECTED_MD5 "3e64f09041ed7dab23d9c38e6606c917")
3535

3636
add_custom_command(
3737
OUTPUT ${PROJ_DB}

‎data/sql/geodetic_datum.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ INSERT INTO "geodetic_datum" VALUES('EPSG','1114','Israeli Geodetic Datum 2005',
106106
INSERT INTO "usage" VALUES('EPSG','13166','geodetic_datum','EPSG','1114','EPSG','1126','EPSG','1027');
107107
INSERT INTO "geodetic_datum" VALUES('EPSG','1115','Israeli Geodetic Datum 2005(2012)',NULL,'EPSG','7030','EPSG','8901','2012-01-01',NULL,NULL,NULL,NULL,0);
108108
INSERT INTO "usage" VALUES('EPSG','13167','geodetic_datum','EPSG','1115','EPSG','1126','EPSG','1027');
109-
INSERT INTO "geodetic_datum" VALUES('EPSG','1116','NAD83 (National Spatial Reference System 2011)',NULL,'EPSG','7019','EPSG','8901','2012-06-12',NULL,NULL,NULL,NULL,0);
109+
INSERT INTO "geodetic_datum" VALUES('EPSG','1116','NAD83 (National Spatial Reference System 2011)',NULL,'EPSG','7019','EPSG','8901','2012-06-12',NULL,NULL,NULL,2010.0,0);
110110
INSERT INTO "usage" VALUES('EPSG','13168','geodetic_datum','EPSG','1116','EPSG','1511','EPSG','1027');
111111
INSERT INTO "geodetic_datum" VALUES('EPSG','1117','NAD83 (National Spatial Reference System PA11)',NULL,'EPSG','7019','EPSG','8901','2012-06-12',NULL,NULL,NULL,NULL,0);
112112
INSERT INTO "usage" VALUES('EPSG','13169','geodetic_datum','EPSG','1117','EPSG','4162','EPSG','1027');

‎data/sql/grid_transformation.sql‎

Lines changed: 42 additions & 18 deletions
Large diffs are not rendered by default.

‎data/sql/helmert_transformation.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ INSERT INTO "helmert_transformation" VALUES('EPSG','1610','BD72 to WGS 84 (2)','
741741
INSERT INTO "usage" VALUES('EPSG','8531','helmert_transformation','EPSG','1610','EPSG','1347','EPSG','1045');
742742
INSERT INTO "helmert_transformation" VALUES('EPSG','1611','IRENET95 to ETRS89 (1)','IRENET95 is a regional realization of ETRS89. May be taken as approximate transformation IRENET95 to WGS 84 - see code 1678.','EPSG','9603','Geocentric translations (geog2D domain)','EPSG','4173','EPSG','4258',0.0,0.0,0.0,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,'OSI-Ire',0);
743743
INSERT INTO "usage" VALUES('EPSG','8532','helmert_transformation','EPSG','1611','EPSG','1305','EPSG','1161');
744-
INSERT INTO "helmert_transformation" VALUES('EPSG','1612','ED50 to WGS 84 (23)','Parameter values are taken from ED50 to ETRS89 (1), code 1588. Adopted for ED50 to WGS84 transformations offshore Norway north of 62N from April 2001 when it replaced code 1590. Included in Statens Kartverk programme wsktrans from v4.0.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4230','EPSG','4326',1.0,-116.641,-56.931,-110.559,'EPSG','9001',0.893,0.921,-0.917,'EPSG','9104',-3.52,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EPSG-Nor N62 2001',0);
744+
INSERT INTO "helmert_transformation" VALUES('EPSG','1612','ED50 to WGS 84 (23)','Parameter values are taken from ED50 to ETRS89 (1), code 1588, (rotations converted from μrad). Adopted for ED50 to WGS 84 CTs offshore Norway north of 62°N from April 2001, replacing code 1590. Included in Statens Kartverk programme wsktrans from v4.0.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4230','EPSG','4326',1.0,-116.641,-56.931,-110.559,'EPSG','9001',0.893,0.921,-0.917,'EPSG','9104',-3.52,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EPSG-Nor N62 2001',0);
745745
INSERT INTO "usage" VALUES('EPSG','8533','helmert_transformation','EPSG','1612','EPSG','2601','EPSG','1252');
746746
INSERT INTO "helmert_transformation" VALUES('EPSG','1613','ED50 to WGS 84 (24)','Approximation to 1 metre of concatenated transformation ED50 to WGS 84 (14), code 8653. 8653 remains the transformation promulgated by Statens Kartverk but 1613 recommended by EPSG for practical oil industry usage.','EPSG','9606','Position Vector transformation (geog2D domain)','EPSG','4230','EPSG','4326',1.0,-90.365,-101.13,-123.384,'EPSG','9001',0.333,0.077,0.894,'EPSG','9104',1.994,'EPSG','9202',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EPSG-Nor S62 2001',0);
747747
INSERT INTO "usage" VALUES('EPSG','8534','helmert_transformation','EPSG','1613','EPSG','2334','EPSG','1253');

‎data/sql/metadata.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
INSERT INTO "metadata" VALUES('DATABASE.LAYOUT.VERSION.MAJOR', 1);
1010
INSERT INTO "metadata" VALUES('DATABASE.LAYOUT.VERSION.MINOR', 5);
1111

12-
INSERT INTO "metadata" VALUES('EPSG.VERSION', 'v11.027');
13-
INSERT INTO "metadata" VALUES('EPSG.DATE', '2025-01-07');
12+
INSERT INTO "metadata" VALUES('EPSG.VERSION', 'v11.028');
13+
INSERT INTO "metadata" VALUES('EPSG.DATE', '2025-01-16');
1414

1515
-- The value of ${PROJ_VERSION} is substituted at build time by the actual
1616
-- value.

‎data/sql/supersession.sql‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,20 +305,14 @@ INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10130','grid_tra
305305
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10133','grid_transformation','EPSG','10505','EPSG',1);
306306
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10504','grid_transformation','EPSG','10509','EPSG',1);
307307
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10505','grid_transformation','EPSG','10510','EPSG',1);
308-
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','8676','grid_transformation','EPSG','9483','EPSG',0);
309308
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','9925','grid_transformation','EPSG','10294','EPSG',0);
310309
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','9926','grid_transformation','EPSG','10295','EPSG',0);
311310
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10558','grid_transformation','EPSG','10562','EPSG',0);
312311
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10559','grid_transformation','EPSG','10563','EPSG',0);
313312
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10557','grid_transformation','EPSG','10561','EPSG',0);
314313
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10560','grid_transformation','EPSG','10564','EPSG',0);
315-
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10523','grid_transformation','EPSG','10524','EPSG',1);
316-
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10527','grid_transformation','EPSG','10528','EPSG',1);
317-
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10529','grid_transformation','EPSG','10530','EPSG',1);
318314
INSERT INTO "supersession" VALUES('helmert_transformation','EPSG','1622','helmert_transformation','EPSG','5226','EPSG',0);
319315
INSERT INTO "supersession" VALUES('helmert_transformation','EPSG','1838','helmert_transformation','EPSG','10589','EPSG',0);
320-
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10521','grid_transformation','EPSG','10522','EPSG',1);
321-
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10536','grid_transformation','EPSG','10537','EPSG',1);
322316
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','7000','grid_transformation','EPSG','9282','EPSG',1);
323317
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10557','grid_transformation','EPSG','10561','EPSG',0);
324318
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10559','grid_transformation','EPSG','10563','EPSG',0);
@@ -329,4 +323,22 @@ INSERT INTO "supersession" VALUES('helmert_transformation','EPSG','6865','helmer
329323
INSERT INTO "supersession" VALUES('helmert_transformation','EPSG','6864','helmert_transformation','EPSG','6865','EPSG',0);
330324
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10695','grid_transformation','EPSG','10697','EPSG',1);
331325
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10696','grid_transformation','EPSG','10698','EPSG',1);
326+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10521','grid_transformation','EPSG','10522','EPSG',1);
327+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10523','grid_transformation','EPSG','10524','EPSG',1);
328+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10527','grid_transformation','EPSG','10528','EPSG',1);
329+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10529','grid_transformation','EPSG','10530','EPSG',1);
330+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10522','grid_transformation','EPSG','10708','EPSG',1);
331+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10525','grid_transformation','EPSG','10710','EPSG',1);
332+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10526','grid_transformation','EPSG','10711','EPSG',1);
333+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10535','grid_transformation','EPSG','10715','EPSG',1);
334+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10538','grid_transformation','EPSG','10717','EPSG',1);
335+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10539','grid_transformation','EPSG','10718','EPSG',1);
336+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10536','grid_transformation','EPSG','10537','EPSG',1);
337+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10524','grid_transformation','EPSG','10709','EPSG',1);
338+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10528','grid_transformation','EPSG','10712','EPSG',1);
339+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10534','grid_transformation','EPSG','10714','EPSG',1);
332340
INSERT INTO "supersession" VALUES('helmert_transformation','EPSG','1638','helmert_transformation','EPSG','10098','EPSG',0);
341+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10530','grid_transformation','EPSG','10713','EPSG',1);
342+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','10537','grid_transformation','EPSG','10716','EPSG',1);
343+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','9483','grid_transformation','EPSG','10707','EPSG',0);
344+
INSERT INTO "supersession" VALUES('grid_transformation','EPSG','8676','grid_transformation','EPSG','9483','EPSG',0);

‎test/unit/test_factory.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,8 +1444,9 @@ TEST(factory,
14441444
" BBOX[41.67,-141.01,83.17,-52.54]],\n"
14451445
" ID[\"EPSG\",9483],\n"
14461446
" REMARK[\"File initially published with name cvg70.cvb, later "
1447-
"renamed to NAD83v70VG.gvb with no change of content. Replaces v6 "
1448-
"velocity grid.\"]]";
1447+
"renamed to NAD83v70VG.gvb with no change of content. Replaces Canada "
1448+
"velocity grid v6 (code 8676). Replaced by Canada velocity grid v8 "
1449+
"(code 10707).\"]]";
14491450

14501451
EXPECT_EQ(
14511452
pmo->exportToWKT(

0 commit comments

Comments
 (0)