Skip to content

Commit 35a1d49

Browse files
rouaultrouault
authored
Merge pull request #4764 from rouault/epsg_12_055
Database: update to EPSG v12.055
2 parents f47d946 + 7f1fdb3 commit 35a1d49

24 files changed

Lines changed: 257 additions & 457 deletions

‎data/CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ 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_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
35+
"${CMAKE_CURRENT_LIST_DIR}/sql/proj.db.sql.expected.md5"
36+
)
3437
file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/sql/proj.db.sql.expected.md5" PROJ_DB_SQL_EXPECTED_MD5 LIMIT_COUNT 1)
3538

3639
add_custom_command(

‎data/generate_proj_db.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ endfunction()
2929
generate_all_sql_in("${ALL_SQL_IN}" OFF PROJ_DB_SQL_MD5)
3030

3131
file(WRITE "${DATA_BINARY_DIR}/PROJ_DB_SQL_MD5.h" "const char* PROJ_DB_SQL_MD5=\"${PROJ_DB_SQL_MD5}\";\n")
32-
3332
if (NOT "${PROJ_DB_SQL_MD5}" STREQUAL "${PROJ_DB_SQL_EXPECTED_MD5}")
3433
message(WARNING "all.sql.in content has changed. Running extra validation checks when building proj.db...")
3534

‎data/sql/alias_name.sql‎

Lines changed: 44 additions & 324 deletions
Large diffs are not rendered by default.

‎data/sql/alias_name_old_epsg.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,3 +1315,8 @@ INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5974','EUREF89 / UTM zone
13151315
INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5975','EUREF89 / UTM zone 35 + NN2000 height','EPSG_OLD');
13161316
INSERT INTO "alias_name" VALUES('compound_crs','EPSG','5976','EUREF89 / UTM zone 36 + NN2000 height','EPSG_OLD');
13171317
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','28992','RD Bessel','EPSG_OLD');
1318+
1319+
-- Changed in EPSG v12.055
1320+
INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','6666','JGD2011 - XYZ','EPSG_OLD');
1321+
INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','6667','JGD2011 - LatLonEHt','EPSG_OLD');
1322+
INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','6668','JGD2011 - LatLon','EPSG_OLD');

‎data/sql/compound_crs.sql‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ INSERT INTO "compound_crs" VALUES('EPSG','6665','NAD83(CSRS) / UTM zone 22N + CG
246246
INSERT INTO "usage" VALUES('EPSG','4884','compound_crs','EPSG','6665','EPSG','2152','EPSG','1142');
247247
INSERT INTO "compound_crs" VALUES('EPSG','6696','JGD2000 + JGD2000 (vertical) height',NULL,'EPSG','4612','EPSG','6694',0);
248248
INSERT INTO "usage" VALUES('EPSG','4915','compound_crs','EPSG','6696','EPSG','3263','EPSG','1142');
249-
INSERT INTO "compound_crs" VALUES('EPSG','6697','JGD2011 + JGD2011 (vertical) height',NULL,'EPSG','6668','EPSG','6695',0);
249+
INSERT INTO "compound_crs" VALUES('EPSG','6697','JGD2024 + JGD2011 (vertical) height',NULL,'EPSG','6668','EPSG','6695',0);
250250
INSERT INTO "usage" VALUES('EPSG','4916','compound_crs','EPSG','6697','EPSG','3263','EPSG','1142');
251251
INSERT INTO "compound_crs" VALUES('EPSG','6700','Tokyo + JSLD72 height',NULL,'EPSG','4301','EPSG','6693',0);
252252
INSERT INTO "usage" VALUES('EPSG','4917','compound_crs','EPSG','6700','EPSG','4168','EPSG','1142');
@@ -972,6 +972,36 @@ INSERT INTO "compound_crs" VALUES('EPSG','11312','ETRS89-SVK [SKTRF09] + Baltic
972972
INSERT INTO "usage" VALUES('EPSG','25093','compound_crs','EPSG','11312','EPSG','1211','EPSG','1203');
973973
INSERT INTO "compound_crs" VALUES('EPSG','11314','ETRS89-SVK [SKTRF09] + EVRF2007 height',NULL,'EPSG','11076','EPSG','5621',0);
974974
INSERT INTO "usage" VALUES('EPSG','25103','compound_crs','EPSG','11314','EPSG','1211','EPSG','1161');
975+
INSERT INTO "compound_crs" VALUES('EPSG','11318','JGD2024 + JGD2024 (vertical) height',NULL,'EPSG','6668','EPSG','11317',0);
976+
INSERT INTO "usage" VALUES('EPSG','25579','compound_crs','EPSG','11318','EPSG','1129','EPSG','1142');
977+
INSERT INTO "compound_crs" VALUES('EPSG','11319','JGD2024 / Japan Plane Rectangular CS I + JGD2024 (vertical) height',NULL,'EPSG','6669','EPSG','11317',0);
978+
INSERT INTO "usage" VALUES('EPSG','25737','compound_crs','EPSG','11319','EPSG','1854','EPSG','1092');
979+
INSERT INTO "compound_crs" VALUES('EPSG','11320','JGD2024 / Japan Plane Rectangular CS II + JGD2024 (vertical) height',NULL,'EPSG','6670','EPSG','11317',0);
980+
INSERT INTO "usage" VALUES('EPSG','25738','compound_crs','EPSG','11320','EPSG','1855','EPSG','1092');
981+
INSERT INTO "compound_crs" VALUES('EPSG','11321','JGD2024 / Japan Plane Rectangular CS III + JGD2024 (vertical) height',NULL,'EPSG','6671','EPSG','11317',0);
982+
INSERT INTO "usage" VALUES('EPSG','25739','compound_crs','EPSG','11321','EPSG','1856','EPSG','1092');
983+
INSERT INTO "compound_crs" VALUES('EPSG','11322','JGD2024 / Japan Plane Rectangular CS IV + JGD2024 (vertical) height',NULL,'EPSG','6672','EPSG','11317',0);
984+
INSERT INTO "usage" VALUES('EPSG','25582','compound_crs','EPSG','11322','EPSG','1857','EPSG','1092');
985+
INSERT INTO "compound_crs" VALUES('EPSG','11323','JGD2024 / Japan Plane Rectangular CS V + JGD2024 (vertical) height',NULL,'EPSG','6673','EPSG','11317',0);
986+
INSERT INTO "usage" VALUES('EPSG','25586','compound_crs','EPSG','11323','EPSG','1858','EPSG','1092');
987+
INSERT INTO "compound_crs" VALUES('EPSG','11324','JGD2024 / Japan Plane Rectangular CS VI + JGD2024 (vertical) height',NULL,'EPSG','6674','EPSG','11317',0);
988+
INSERT INTO "usage" VALUES('EPSG','25587','compound_crs','EPSG','11324','EPSG','1859','EPSG','1092');
989+
INSERT INTO "compound_crs" VALUES('EPSG','11325','JGD2024 / Japan Plane Rectangular CS VII + JGD2024 (vertical) height',NULL,'EPSG','6675','EPSG','11317',0);
990+
INSERT INTO "usage" VALUES('EPSG','25588','compound_crs','EPSG','11325','EPSG','1860','EPSG','1092');
991+
INSERT INTO "compound_crs" VALUES('EPSG','11326','JGD2024 / Japan Plane Rectangular CS VIII + JGD2024 (vertical) height',NULL,'EPSG','6676','EPSG','11317',0);
992+
INSERT INTO "usage" VALUES('EPSG','25740','compound_crs','EPSG','11326','EPSG','1861','EPSG','1092');
993+
INSERT INTO "compound_crs" VALUES('EPSG','11327','JGD2024 / Japan Plane Rectangular CS IX + JGD2024 (vertical) height',NULL,'EPSG','6677','EPSG','11317',0);
994+
INSERT INTO "usage" VALUES('EPSG','25741','compound_crs','EPSG','11327','EPSG','1862','EPSG','1092');
995+
INSERT INTO "compound_crs" VALUES('EPSG','11328','JGD2024 / Japan Plane Rectangular CS X + JGD2024 (vertical) height',NULL,'EPSG','6678','EPSG','11317',0);
996+
INSERT INTO "usage" VALUES('EPSG','25591','compound_crs','EPSG','11328','EPSG','1863','EPSG','1092');
997+
INSERT INTO "compound_crs" VALUES('EPSG','11329','JGD2024 / Japan Plane Rectangular CS XI + JGD2024 (vertical) height',NULL,'EPSG','6679','EPSG','11317',0);
998+
INSERT INTO "usage" VALUES('EPSG','25742','compound_crs','EPSG','11329','EPSG','1864','EPSG','1092');
999+
INSERT INTO "compound_crs" VALUES('EPSG','11330','JGD2024 / Japan Plane Rectangular CS XII + JGD2024 (vertical) height',NULL,'EPSG','6680','EPSG','11317',0);
1000+
INSERT INTO "usage" VALUES('EPSG','25743','compound_crs','EPSG','11330','EPSG','1865','EPSG','1092');
1001+
INSERT INTO "compound_crs" VALUES('EPSG','11333','JGD2024 / Japan Plane Rectangular CS XIII + JGD2024 (vertical) height',NULL,'EPSG','6681','EPSG','11317',0);
1002+
INSERT INTO "usage" VALUES('EPSG','25594','compound_crs','EPSG','11333','EPSG','1866','EPSG','1092');
1003+
INSERT INTO "compound_crs" VALUES('EPSG','11336','JGD2024 / Japan Plane Rectangular CS XIV + JGD2024 (vertical) height',NULL,'EPSG','6682','EPSG','11317',0);
1004+
INSERT INTO "usage" VALUES('EPSG','25676','compound_crs','EPSG','11336','EPSG','1867','EPSG','1092');
9751005
INSERT INTO "compound_crs" VALUES('EPSG','11383','DrukRef23 + Bhutan Vertical Datum 2022 height',NULL,'EPSG','11226','EPSG','11338',0);
9761006
INSERT INTO "usage" VALUES('EPSG','25561','compound_crs','EPSG','11383','EPSG','1048','EPSG','1270');
9771007
INSERT INTO "compound_crs" VALUES('EPSG','11385','Mexico ITRF2008 + NAVD88 height',NULL,'EPSG','6365','EPSG','5703',0);
@@ -1036,14 +1066,28 @@ INSERT INTO "compound_crs" VALUES('EPSG','11429','ETRS89-NOR [EUREF89] / NTM zon
10361066
INSERT INTO "usage" VALUES('EPSG','25546','compound_crs','EPSG','11429','EPSG','3674','EPSG','1029');
10371067
INSERT INTO "compound_crs" VALUES('EPSG','11430','ETRS89-NOR [EUREF89] / NTM zone 30 + NN2000:2025 height',NULL,'EPSG','5130','EPSG','11394',0);
10381068
INSERT INTO "usage" VALUES('EPSG','25547','compound_crs','EPSG','11430','EPSG','3676','EPSG','1029');
1069+
INSERT INTO "compound_crs" VALUES('EPSG','11434','JGD2024 / Japan Plane Rectangular CS XV + JGD2024 (vertical) height',NULL,'EPSG','6683','EPSG','11317',0);
1070+
INSERT INTO "usage" VALUES('EPSG','25677','compound_crs','EPSG','11434','EPSG','1868','EPSG','1092');
10391071
INSERT INTO "compound_crs" VALUES('EPSG','11435','ETRS89-NOR [EUREF89] / NTM zone 5 + NN2000:2025 height',NULL,'EPSG','5105','EPSG','11394',0);
10401072
INSERT INTO "usage" VALUES('EPSG','25550','compound_crs','EPSG','11435','EPSG','3636','EPSG','1029');
10411073
INSERT INTO "compound_crs" VALUES('EPSG','11436','ETRS89-NOR [EUREF89] / NTM zone 6 + NN2000:2025 height',NULL,'EPSG','5106','EPSG','11394',0);
10421074
INSERT INTO "usage" VALUES('EPSG','25551','compound_crs','EPSG','11436','EPSG','3639','EPSG','1029');
10431075
INSERT INTO "compound_crs" VALUES('EPSG','11437','ETRS89-NOR [EUREF89] / NTM zone 7 + NN2000:2025 height',NULL,'EPSG','5107','EPSG','11394',0);
10441076
INSERT INTO "usage" VALUES('EPSG','25552','compound_crs','EPSG','11437','EPSG','3647','EPSG','1029');
1077+
INSERT INTO "compound_crs" VALUES('EPSG','11442','JGD2024 / Japan Plane Rectangular CS XVI + JGD2024 (vertical) height',NULL,'EPSG','6684','EPSG','11317',0);
1078+
INSERT INTO "usage" VALUES('EPSG','25678','compound_crs','EPSG','11442','EPSG','1869','EPSG','1092');
1079+
INSERT INTO "compound_crs" VALUES('EPSG','11443','JGD2024 / Japan Plane Rectangular CS XVII + JGD2024 (vertical) height',NULL,'EPSG','6685','EPSG','11317',0);
1080+
INSERT INTO "usage" VALUES('EPSG','25679','compound_crs','EPSG','11443','EPSG','1870','EPSG','1092');
1081+
INSERT INTO "compound_crs" VALUES('EPSG','11444','JGD2024 / Japan Plane Rectangular CS XVIII + JGD2024 (vertical) height',NULL,'EPSG','6686','EPSG','11317',0);
1082+
INSERT INTO "usage" VALUES('EPSG','25680','compound_crs','EPSG','11444','EPSG','1871','EPSG','1092');
1083+
INSERT INTO "compound_crs" VALUES('EPSG','11445','JGD2024 / Japan Plane Rectangular CS XIX + JGD2024 (vertical) height',NULL,'EPSG','6687','EPSG','11317',0);
1084+
INSERT INTO "usage" VALUES('EPSG','25682','compound_crs','EPSG','11445','EPSG','1872','EPSG','1092');
10451085
INSERT INTO "compound_crs" VALUES('EPSG','11447','RGWF96 + NGFA 2022 height',NULL,'EPSG','8900','EPSG','11446',0);
10461086
INSERT INTO "usage" VALUES('EPSG','25698','compound_crs','EPSG','11447','EPSG','4855','EPSG','1026');
1087+
INSERT INTO "compound_crs" VALUES('EPSG','11452','GR96 + GLLAT(2025) depth',NULL,'EPSG','4747','EPSG','11450',0);
1088+
INSERT INTO "usage" VALUES('EPSG','25756','compound_crs','EPSG','11452','EPSG','4776','EPSG','1272');
1089+
INSERT INTO "compound_crs" VALUES('EPSG','11453','GR96 + GLMSL(2025) depth',NULL,'EPSG','4747','EPSG','11451',0);
1090+
INSERT INTO "usage" VALUES('EPSG','25757','compound_crs','EPSG','11453','EPSG','4776','EPSG','1272');
10471091
INSERT INTO "compound_crs" VALUES('EPSG','20001','ETRS89-NOR [EUREF89] + SVD2006 height',NULL,'EPSG','10875','EPSG','20000',0);
10481092
INSERT INTO "usage" VALUES('EPSG','17956','compound_crs','EPSG','20001','EPSG','4058','EPSG','1026');
10491093
INSERT INTO "compound_crs" VALUES('EPSG','20003','MWC18 Grid + ODN height',NULL,'EPSG','20002','EPSG','5701',0);

‎data/sql/concatenated_operation.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,3 +553,5 @@ INSERT INTO "concatenated_operation" VALUES('EPSG','11315','ITRF2020 to ETRS89-L
553553
INSERT INTO "usage" VALUES('EPSG','25133','concatenated_operation','EPSG','11315','EPSG','1139','EPSG','1027');
554554
INSERT INTO "concatenated_operation" VALUES('EPSG','11398','NN2000:2018 height to NN2000:2025 height (1)','Height difference derived through difference in geoid separation models.','EPSG','5941','EPSG','11394',0.03,'IOGP-Nor 2025',0);
555555
INSERT INTO "usage" VALUES('EPSG','25497','concatenated_operation','EPSG','11398','EPSG','1352','EPSG','1059');
556+
INSERT INTO "concatenated_operation" VALUES('EPSG','11441','JGD2024 to JGD2024 (vertical) height (2)','This concatenated operation is the path recommended by GSI for deriving JGD2024 (vertical) height from GNSS-derived ellipsoidal height in accordance with Survey Act requirements, as using the JPGEO2024 geoid separation model directly (JGD2024 to JGD2024 (vertical) height (1), CT code 11334) is not aligned with Survey Act requirements for coordinates to be at epoch 2011.395.','EPSG','6667','EPSG','11317',0.04,'GSI-Jpn',0);
557+
INSERT INTO "usage" VALUES('EPSG','25734','concatenated_operation','EPSG','11441','EPSG','3263','EPSG','1181');

‎data/sql/concatenated_operation_step.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,3 +584,5 @@ INSERT INTO "concatenated_operation_step" VALUES('EPSG','11315',2,'EPSG','10809'
584584
INSERT INTO "concatenated_operation_step" VALUES('EPSG','11315',3,'EPSG','11316',NULL);
585585
INSERT INTO "concatenated_operation_step" VALUES('EPSG','11398',1,'EPSG','9593',NULL);
586586
INSERT INTO "concatenated_operation_step" VALUES('EPSG','11398',2,'EPSG','11396',NULL);
587+
INSERT INTO "concatenated_operation_step" VALUES('EPSG','11441',1,'EPSG','11439',NULL);
588+
INSERT INTO "concatenated_operation_step" VALUES('EPSG','11441',2,'EPSG','11440',NULL);

‎data/sql/extent.sql‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ INSERT INTO "extent" VALUES('EPSG','1354','Europe - British Isles - UK and Irela
334334
INSERT INTO "extent" VALUES('EPSG','1355','Indonesia - Sumatra','Indonesia - Sumatra.',-5.99,5.97,95.16,106.13,0);
335335
INSERT INTO "extent" VALUES('EPSG','1356','Asia - Middle East - Israel, Jordan and Palestine onshore','Israel - onshore; Jordan; Palestine - onshore.',29.18,33.38,34.17,39.31,0);
336336
INSERT INTO "extent" VALUES('EPSG','1357','Europe - eastern and FSU','Albania; Bulgaria; Czech Republic; Germany (former DDR); Hungary; Poland; Romania; Slovakia. Armenia; Azerbaijan; Belarus; Estonia; Georgia; Kazakhstan; Kyrgyzstan; Latvia; Lithuania; Moldova; Russian Federation; Tajikistan; Turkmenistan; Ukraine; Uzbekistan.',35.1,78.0,9.87,-169.73,1);
337-
INSERT INTO "extent" VALUES('EPSG','1358','South America - SAD69 by country','Brazil - onshore and offshore. In rest of South America - onshore north of approximately 45°S and Tierra del Fuego.',-55.96,12.52,-91.72,-25.28,0);
337+
INSERT INTO "extent" VALUES('EPSG','1358','South America - SAD69 by country','Brazil - onshore and offshore. Chile - onshore south of 43°30''S including Tierra del Fuego. In rest of South America - onshore north of approximately 45°S.',-55.96,12.52,-91.72,-25.28,0);
338338
INSERT INTO "extent" VALUES('EPSG','1359','Indonesia - Kalimantan SE','Indonesia - Kalimantan - onshore southeast coastal area including Mahakam delta coastal and offshore shelf areas.',-4.24,0.0,114.55,117.99,0);
339339
INSERT INTO "extent" VALUES('EPSG','1360','Indonesia - Kalimantan E','Indonesia - Kalimantan - onshore east coastal area including Mahakam delta coastal and offshore shelf areas.',-4.24,4.29,114.55,119.06,0);
340340
INSERT INTO "extent" VALUES('EPSG','1361','Sudan - south','Sudan - south.',NULL,NULL,NULL,NULL,1);
@@ -3825,4 +3825,10 @@ INSERT INTO "extent" VALUES('EPSG','4845','USA - Montana - Mission','United Stat
38253825
INSERT INTO "extent" VALUES('EPSG','4846','USA - Montana - Missoula','United States (USA) - Montana - Missoula.',45.93,47.69,-114.93,-113.17,0);
38263826
INSERT INTO "extent" VALUES('EPSG','4847','USA - Montana - NECI','United States (USA) - Montana - NECI.',48.04,48.53,-110.22,-109.36,0);
38273827
INSERT INTO "extent" VALUES('EPSG','4848','USA - Montana - Phillips','United States (USA) - Montana - Phillips.',47.36,49.09,-109.03,-107.04,0);
3828+
INSERT INTO "extent" VALUES('EPSG','4849','Chile - onshore north of 43.5°S and west of 72°W','Chile - onshore north of 43°30''S and west of 72°W.',-43.5,-34.01,-74.48,-72.0,0);
3829+
INSERT INTO "extent" VALUES('EPSG','4850','Chile - onshore north of 43.5°S and east of 72°W','Chile - onshore north of 43°30''S and east of 72°W.',-43.5,-17.5,-72.0,-67.0,0);
3830+
INSERT INTO "extent" VALUES('EPSG','4851','Chile - onshore south of 43.5°S and west of 72°W','Chile - onshore south of 43°30''S and west of 72°W.',-54.48,-43.49,-75.8,-72.0,0);
3831+
INSERT INTO "extent" VALUES('EPSG','4852','Chile - Tierra del Fuego east of 72°W','Chile - onshore Tierra del Fuego west of 72°W.',-55.96,-51.99,-72.0,-66.33,0);
3832+
INSERT INTO "extent" VALUES('EPSG','4853','Japan - offshore and onshore mainland and outlying islands','Japan - offshore and onshore mainland and outlying islands (Tokara Islands and south, and Hachijo-jima and south).',20.88,46.05,122.38,147.86,0);
3833+
INSERT INTO "extent" VALUES('EPSG','4854','Japan - offshore and onshore outlying islands','Japan - offshore and onshore outlying islands (Tokara Islands and south, and Hachijo-jima and south).',20.88,33.93,122.38,146.0,0);
38283834
INSERT INTO "extent" VALUES('EPSG','4855','Wallis and Futuna - Futuna and Alofi','Wallis and Futuna - Futuna and Alofi - onshore.',-14.42,-14.18,-178.24,-177.94,0);

0 commit comments

Comments
 (0)