Skip to content

Commit 27dfb11

Browse files
rouaultrouault
authored
Merge pull request #4556 from rouault/epsg_12_018
Database: update to EPSG v12.018
2 parents 2d1c017 + 2750aec commit 27dfb11

17 files changed

+104
-28
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 "33e129d3f2778a36fcf34570dc00f3ca")
34+
set(PROJ_DB_SQL_EXPECTED_MD5 "004930031d8f51bc7a489fd2e35b0037")
3535

3636
add_custom_command(
3737
OUTPUT ${PROJ_DB}

‎data/sql/alias_name.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -775,6 +775,7 @@ INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','1418','CSRN2025 (ITRF20
775775
INSERT INTO "alias_name" VALUES('vertical_datum','EPSG','1416','COH88 2025 (NAVD88)','EPSG');
776776
INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','1414','CSRN2025 (NAD83 2011)','EPSG');
777777
INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','1420','GR96(1996)','EPSG');
778+
INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','1422','NATRF2022','EPSG');
778779
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','21100','Genuk / NEIEZ','EPSG');
779780
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2140','NAD83(CSRS98) / SCoPQ zone 3','EPSG');
780781
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2141','NAD83(CSRS98) / SCoPQ zone 4','EPSG');

‎data/sql/consistency_checks_triggers.sql

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,21 +315,23 @@ FOR EACH ROW BEGIN
315315
crs1.auth_name = NEW.source_crs_auth_name AND crs1.code = NEW.source_crs_code
316316
AND crs2.auth_name = NEW.target_crs_auth_name AND crs2.code = NEW.target_crs_code
317317
AND NEW.deprecated = 0 AND (
318-
NOT (crs1.type = crs2.type OR
319-
(crs1.type = 'geographic 3D' and crs2.type = 'compound'))));
318+
NOT ((crs1.type = crs2.type AND crs1.type IN ('geographic 2D', 'geographic 3D', 'geocentric') AND
319+
NOT(NEW.method_auth_name = 'EPSG' AND NEW.method_code = 1149)) OR
320+
(crs1.type = 'geographic 3D' and crs2.type = 'compound' AND
321+
NEW.method_auth_name = 'EPSG' AND NEW.method_code = 1149))));
320322

321323
-- check that the method used by a Helmert transformation is consistent with the dimensionality of the CRS
322324
SELECT RAISE(ABORT, 'insert on helmert_transformation violates constraint: the domain of the method of helmert_transformation should be consistent with the dimensionality of the CRS')
323325
WHERE NEW.deprecated = 0 AND
324-
(EXISTS (SELECT 1 FROM geodetic_crs crs
326+
(NOT(NEW.method_auth_name = 'EPSG' AND NEW.method_code = 1149) AND EXISTS (SELECT 1 FROM geodetic_crs crs
325327
LEFT JOIN coordinate_operation_method m ON
326328
NEW.method_auth_name = m.auth_name AND NEW.method_code = m.code
327329
WHERE
328330
crs.auth_name = NEW.source_crs_auth_name AND crs.code = NEW.source_crs_code AND
329331
((m.name LIKE '%geog2D domain%' AND crs.type != 'geographic 2D') OR
330332
(m.name LIKE '%geog3D domain%' AND crs.type != 'geographic 3D') OR
331333
(m.name LIKE '%geocentric domain%' AND crs.type != 'geocentric')))
332-
OR (EXISTS (SELECT 1 FROM compound_crs crs
334+
OR (NEW.method_auth_name = 'EPSG' AND NEW.method_code = 1149 AND EXISTS (SELECT 1 FROM compound_crs crs
333335
LEFT JOIN coordinate_operation_method m ON
334336
NEW.method_auth_name = m.auth_name AND NEW.method_code = m.code
335337
WHERE

‎data/sql/conversion.sql

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,6 +2052,25 @@ INSERT INTO "conversion" VALUES('EPSG','10933','SPCS83 Florida North zone (meter
20522052
INSERT INTO "usage" VALUES('EPSG','11145','conversion','EPSG','10933','EPSG','2187','EPSG','1142');
20532053
INSERT INTO "conversion" VALUES('EPSG','10934','Florida GDL Albers (meter)','','EPSG','9822','Albers Equal Area','EPSG','8821','Latitude of false origin',24.0,'EPSG','9110','EPSG','8822','Longitude of false origin',-84.0,'EPSG','9110','EPSG','8823','Latitude of 1st standard parallel',24.0,'EPSG','9110','EPSG','8824','Latitude of 2nd standard parallel',31.3,'EPSG','9110','EPSG','8826','Easting at false origin',400000.0,'EPSG','9001','EPSG','8827','Northing at false origin',0.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,0);
20542054
INSERT INTO "usage" VALUES('EPSG','11146','conversion','EPSG','10934','EPSG','1379','EPSG','1135');
2055+
INSERT INTO "conversion" VALUES('EPSG','10970','SPCS2022 Gulf zone','See code 10971 for equivalent non-metric definition.','EPSG','9801','Lambert Conic Conformal (1SP)','EPSG','8801','Latitude of natural origin',28.0,'EPSG','9110','EPSG','8802','Longitude of natural origin',-90.0,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.9996,'EPSG','9201','EPSG','8806','False easting',1600200.0,'EPSG','9001','EPSG','8807','False northing',533400.0,'EPSG','9001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
2056+
INSERT INTO "usage" VALUES('EPSG','23626','conversion','EPSG','10970','EPSG','3357','EPSG','1142');
2057+
INSERT INTO "conversion" VALUES('EPSG','10971','SPCS2022 Gulf zone (ft)','See code 10970 for equivalent metric definition.','EPSG','9801','Lambert Conic Conformal (1SP)','EPSG','8801','Latitude of natural origin',28.0,'EPSG','9110','EPSG','8802','Longitude of natural origin',-90.0,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.9996,'EPSG','9201','EPSG','8806','False easting',5250000.0,'EPSG','9002','EPSG','8807','False northing',1750000.0,'EPSG','9002',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
2058+
INSERT INTO "usage" VALUES('EPSG','23659','conversion','EPSG','10971','EPSG','3357','EPSG','1142');
2059+
INSERT INTO "conversion" VALUES('EPSG','10972','SPCS2022 Gulf Louisiana Shelf zone (ft)','Emulates offshore part of Louisiana CS27 South zone. NGS definition in meters has FE=609610.287m FN=147761.325m.
2060+
','EPSG','9801','Lambert Conic Conformal (1SP)','EPSG','8801','Latitude of natural origin',30.0,'EPSG','9110','EPSG','8802','Longitude of natural origin',-91.2,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.9999165,'EPSG','9201','EPSG','8806','False easting',2000033.75,'EPSG','9002','EPSG','8807','False northing',484781.25,'EPSG','9002',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
2061+
INSERT INTO "usage" VALUES('EPSG','23660','conversion','EPSG','10972','EPSG','4809','EPSG','1294');
2062+
INSERT INTO "conversion" VALUES('EPSG','10973','SPCS2022 Gulf Texas Shelf North zone (ft)','Emulates offshore part of Texas CS27 South Central zone. NGS definition in meters has FE=609633.909m FN=166114.095m.','EPSG','9801','Lambert Conic Conformal (1SP)','EPSG','8801','Latitude of natural origin',29.1957,'EPSG','9110','EPSG','8802','Longitude of natural origin',-99.0,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.9998499,'EPSG','9201','EPSG','8806','False easting',2000111.25,'EPSG','9002','EPSG','8807','False northing',544993.75,'EPSG','9002',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
2063+
INSERT INTO "usage" VALUES('EPSG','23629','conversion','EPSG','10973','EPSG','4808','EPSG','1294');
2064+
INSERT INTO "conversion" VALUES('EPSG','10974','SPCS2022 Gulf Texas Shelf South zone (ft)','Emulates offshore part of Texas CS27 South zone. NGS definition in meters has FE=609630.480m FN=147679.410m.','EPSG','9801','Lambert Conic Conformal (1SP)','EPSG','8801','Latitude of natural origin',27.0,'EPSG','9110','EPSG','8802','Longitude of natural origin',-98.3,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.9998844,'EPSG','9201','EPSG','8806','False easting',2000100.0,'EPSG','9002','EPSG','8807','False northing',484512.5,'EPSG','9002',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
2065+
INSERT INTO "usage" VALUES('EPSG','23630','conversion','EPSG','10974','EPSG','4807','EPSG','1294');
2066+
INSERT INTO "conversion" VALUES('EPSG','10975','SPCS2022 Gulf West zone (ft)','Emulates offshore deep water part of BLM zone 14N (US survey foot). NGS definition in meters has FE=500032.020m FN=-161.163m.','EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',0.0,'EPSG','9110','EPSG','8802','Longitude of natural origin',-99.0,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.999584,'EPSG','9201','EPSG','8806','False easting',1640525.0,'EPSG','9002','EPSG','8807','False northing',-528.75,'EPSG','9002',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
2067+
INSERT INTO "usage" VALUES('EPSG','23631','conversion','EPSG','10975','EPSG','4810','EPSG','1294');
2068+
INSERT INTO "conversion" VALUES('EPSG','10976','SPCS2022 Gulf West Central zone (ft)','Emulates offshore deep water part of BLM zone 15N (US survey foot). NGS definition in meters has FE=500012.589m FN=-167.259m.','EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',0.0,'EPSG','9110','EPSG','8802','Longitude of natural origin',-93.0,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.9995867,'EPSG','9201','EPSG','8806','False easting',1640461.25,'EPSG','9002','EPSG','8807','False northing',-548.75,'EPSG','9002',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
2069+
INSERT INTO "usage" VALUES('EPSG','23661','conversion','EPSG','10976','EPSG','4811','EPSG','1294');
2070+
INSERT INTO "conversion" VALUES('EPSG','10977','SPCS2022 Gulf East Central zone (ft)','Emulates offshore part of BLM zone 16N (US survey foot). NGS definition in meters has FE=499995.063m FN=-178.308m.','EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',0.0,'EPSG','9110','EPSG','8802','Longitude of natural origin',-87.0,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.9995904,'EPSG','9201','EPSG','8806','False easting',1640403.75,'EPSG','9002','EPSG','8807','False northing',-585.0,'EPSG','9002',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
2071+
INSERT INTO "usage" VALUES('EPSG','23633','conversion','EPSG','10977','EPSG','4812','EPSG','1294');
2072+
INSERT INTO "conversion" VALUES('EPSG','10978','SPCS2022 Gulf East zone (ft)','Emulates offshore part of BLM zone 17N (US survey foot). NGS definition in meters has FE=499980.204m FN=-206.121m.','EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',0.0,'EPSG','9110','EPSG','8802','Longitude of natural origin',-81.0,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.9995987,'EPSG','9201','EPSG','8806','False easting',1640355.0,'EPSG','9002','EPSG','8807','False northing',-676.25,'EPSG','9002',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
2073+
INSERT INTO "usage" VALUES('EPSG','23634','conversion','EPSG','10978','EPSG','2174','EPSG','1294');
20552074
INSERT INTO "conversion" VALUES('EPSG','11001','Georgia CS27 East zone','','EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',30.0,'EPSG','9110','EPSG','8802','Longitude of natural origin',-82.1,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.9999,'EPSG','9201','EPSG','8806','False easting',500000.0,'EPSG','9003','EPSG','8807','False northing',0.0,'EPSG','9003',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);
20562075
INSERT INTO "usage" VALUES('EPSG','11147','conversion','EPSG','11001','EPSG','2189','EPSG','1142');
20572076
INSERT INTO "conversion" VALUES('EPSG','11002','Georgia CS27 West zone','','EPSG','9807','Transverse Mercator','EPSG','8801','Latitude of natural origin',30.0,'EPSG','9110','EPSG','8802','Longitude of natural origin',-84.1,'EPSG','9110','EPSG','8805','Scale factor at natural origin',0.9999,'EPSG','9201','EPSG','8806','False easting',500000.0,'EPSG','9003','EPSG','8807','False northing',0.0,'EPSG','9003',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0);

0 commit comments

Comments
 (0)