From 97a5cd554a2111e1a4c709ce08bd1d6b4d92fcc5 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 22 Sep 2025 09:35:49 +0200 Subject: [PATCH] Database: enable transformations_czechia.sql now that cz_cuzk_table_-y-x_3_v1710.tif is available (https://github.com/OSGeo/PROJ-data/pull/147) --- data/CMakeLists.txt | 2 +- data/sql/grid_alternatives.sql | 1 + ..._extra.sql => transformations_czechia.sql} | 38 +++++++++---------- data/sql_filelist.cmake | 3 +- 4 files changed, 20 insertions(+), 24 deletions(-) rename data/sql/{transformations_czechia_extra.sql => transformations_czechia.sql} (89%) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index d6037e5f89..e76fc90cef 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -31,7 +31,7 @@ set(ALL_SQL_IN "${CMAKE_CURRENT_BINARY_DIR}/all.sql.in") set(PROJ_DB "${CMAKE_CURRENT_BINARY_DIR}/proj.db") include(sql_filelist.cmake) -set(PROJ_DB_SQL_EXPECTED_MD5 "b8daa2ff03527581ed3caa218d85b139") +set(PROJ_DB_SQL_EXPECTED_MD5 "6f423b1083f1699c286c0fb7c6f2d21e") add_custom_command( OUTPUT ${PROJ_DB} diff --git a/data/sql/grid_alternatives.sql b/data/sql/grid_alternatives.sql index f67904d5cf..8c6ea1154e 100644 --- a/data/sql/grid_alternatives.sql +++ b/data/sql/grid_alternatives.sql @@ -104,6 +104,7 @@ VALUES -- cz_cuzk - ČÚZK ('CR2005_GTX.gtx','cz_cuzk_CR-2005.tif',NULL,'GTiff','geoid_like',0,NULL,'https://cdn.proj.org/cz_cuzk_CR-2005.tif',1,1,NULL), +('cz_cuzk_table_-y-x_3_v1710.tif','cz_cuzk_table_-y-x_3_v1710.tif',NULL,'GTiff','gridshift',0,NULL,'https://cdn.proj.org/cz_cuzk_table_-y-x_3_v1710.tif',1,1,NULL), -- de_adv - Arbeitsgemeinschaft der Vermessungsverwaltungender der Länder der Bundesrepublik Deutschland (AdV) ('BETA2007.gsb','de_adv_BETA2007.tif','BETA2007.gsb','GTiff','hgridshift',0,NULL,'https://cdn.proj.org/de_adv_BETA2007.tif',1,1,NULL), diff --git a/data/sql/transformations_czechia_extra.sql b/data/sql/transformations_czechia.sql similarity index 89% rename from data/sql/transformations_czechia_extra.sql rename to data/sql/transformations_czechia.sql index 93592428e8..424ad19c9a 100644 --- a/data/sql/transformations_czechia_extra.sql +++ b/data/sql/transformations_czechia.sql @@ -1,18 +1,14 @@ -- This file is hand generated. --- WARNING: for now this file is not integrated in the default build, due to --- licensing of grids cz_cuzk_table_yx_3_v1710_east_north.tif and cz_cuzk_CR-2005.tif --- being not clarified. - -- Czechia transformations -- 2d transformations between S-JTSK / Krovak and S-JTSK/05 / Modified Krovak using a grid with easting,northing offsets INSERT INTO other_transformation VALUES( 'PROJ','S_JTSK_E_N_TO_S_JTSK05_E_N','S-JTSK / Krovak East North (EPSG:5514) to S-JTSK/05 / Modified Krovak East North (EPSG:5516)', - 'Transformation based on grid table_yx_3_v1710.dat', + 'Transformation based on grid table_-y-x_3_v1710.tif', 'PROJ','PROJString', - '+proj=gridshift +grids=cz_cuzk_table_yx_3_v1710_east_north.tif', + '+proj=gridshift +grids=cz_cuzk_table_-y-x_3_v1710.tif', 'EPSG','5514','EPSG','5516',0.035, 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,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('PROJ','S_JTSK_E_N_TO_S_JTSK05_E_N_USAGE','other_transformation','PROJ','S_JTSK_E_N_TO_S_JTSK05_E_N','EPSG','1079','EPSG','1189'); @@ -20,10 +16,10 @@ INSERT INTO "usage" VALUES('PROJ','S_JTSK_E_N_TO_S_JTSK05_E_N_USAGE','other_tran INSERT INTO other_transformation VALUES( 'PROJ','S_JTSK_E_N_TO_S_JTSK05','S-JTSK / Krovak East North (EPSG:5514) to S-JTSK/05 / Modified Krovak (EPSG:5515)', - 'Transformation based on grid table_yx_3_v1710.dat', + 'Transformation based on grid table_-y-x_3_v1710.tif', 'PROJ','PROJString', '+proj=pipeline ' || - '+step +proj=gridshift +grids=cz_cuzk_table_yx_3_v1710_east_north.tif ' || + '+step +proj=gridshift +grids=cz_cuzk_table_-y-x_3_v1710.tif ' || '+step +proj=axisswap +order=-2,-1', 'EPSG','5514','EPSG','5515',0.035, 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,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -32,11 +28,11 @@ INSERT INTO "usage" VALUES('PROJ','S_JTSK_E_N_TO_S_JTSK05_USAGE','other_transfor INSERT INTO other_transformation VALUES( 'PROJ','S_JTSK_TO_S_JTSK05_E_N','S-JTSK / Krovak (EPSG:5513) to S-JTSK/05 / Modified Krovak East North (EPSG:5516)', - 'Transformation based on grid table_yx_3_v1710.dat', + 'Transformation based on grid table_-y-x_3_v1710.tif', 'PROJ','PROJString', '+proj=pipeline ' || '+step +proj=axisswap +order=-2,-1 ' || - '+step +proj=gridshift +grids=cz_cuzk_table_yx_3_v1710_east_north.tif', + '+step +proj=gridshift +grids=cz_cuzk_table_-y-x_3_v1710.tif', 'EPSG','5513','EPSG','5516',0.035, 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,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); INSERT INTO "usage" VALUES('PROJ','S_JTSK_TO_S_JTSK05_E_N_USAGE','other_transformation','PROJ','S_JTSK_TO_S_JTSK05_E_N','EPSG','1079','EPSG','1189'); @@ -44,11 +40,11 @@ INSERT INTO "usage" VALUES('PROJ','S_JTSK_TO_S_JTSK05_E_N_USAGE','other_transfor INSERT INTO other_transformation VALUES( 'PROJ','S_JTSK_TO_S_JTSK05','S-JTSK / Krovak (EPSG:5513) to S-JTSK/05 / Modified Krovak (EPSG:5515)', - 'Transformation based on grid table_yx_3_v1710.dat', + 'Transformation based on grid table_-y-x_3_v1710.tif', 'PROJ','PROJString', '+proj=pipeline ' || '+step +proj=axisswap +order=-2,-1 ' || - '+step +proj=gridshift +grids=cz_cuzk_table_yx_3_v1710_east_north.tif ' || + '+step +proj=gridshift +grids=cz_cuzk_table_-y-x_3_v1710.tif ' || '+step +proj=axisswap +order=-2,-1', 'EPSG','5513','EPSG','5515',0.035, 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,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -60,21 +56,21 @@ UPDATE other_transformation SET accuracy = 0.1 WHERE name = 'S-JTSK to S-JTSK/05 INSERT INTO "concatenated_operation" VALUES( 'PROJ','S_JTSK_GEOG_TO_S_JTSK05_GEOG','S-JTSK (EPSG:4156) to S-JTSK/05 (EPSG:5228)', - 'Transformation based on grid table_yx_3_v1710.dat','EPSG','4156','EPSG','5228',NULL,NULL,0); -INSERT INTO "concatenated_operation_step" VALUES('PROJ','S_JTSK_GEOG_TO_S_JTSK05_GEOG',1,'EPSG','5510','reverse'); + 'Transformation based on grid table_-y-x_3_v1710.tif','EPSG','4156','EPSG','5228',NULL,NULL,0); +INSERT INTO "concatenated_operation_step" VALUES('PROJ','S_JTSK_GEOG_TO_S_JTSK05_GEOG',1,'EPSG','5510','forward'); INSERT INTO "concatenated_operation_step" VALUES('PROJ','S_JTSK_GEOG_TO_S_JTSK05_GEOG',2,'PROJ','S_JTSK_E_N_TO_S_JTSK05_E_N','forward'); -INSERT INTO "concatenated_operation_step" VALUES('PROJ','S_JTSK_GEOG_TO_S_JTSK05_GEOG',3,'EPSG','5512','forward'); +INSERT INTO "concatenated_operation_step" VALUES('PROJ','S_JTSK_GEOG_TO_S_JTSK05_GEOG',3,'EPSG','5512','reverse'); INSERT INTO "usage" VALUES('PROJ','S_JTSK_GEOG_TO_S_JTSK05_GEOG_USAGE','concatenated_operation','PROJ','S_JTSK_GEOG_TO_S_JTSK05_GEOG','EPSG','1079','EPSG','1189'); -- CUZK recommends to do ETRS89 to S-JTSK / Krovak by doing: -- 1) ETRS89 to S-JTSK/05 using a Helmert transformation (EPSG:5226) -- 2) S-JTSK/05 to S-JTSK/05 / Modified Krovak, using modified Krovak projection (EPSG:5512) --- 3) S-JTSK/05 / Modified Krovak to S-JTSK / Krovak using (reverse) grid table_yx_3_v1710.dat +-- 3) S-JTSK/05 / Modified Krovak to S-JTSK / Krovak using (reverse) grid table_-y-x_3_v1710.tif -- Cf https://www.cuzk.cz/Zememerictvi/Geodeticke-zaklady-na-uzemi-CR/GNSS/Nova-realizace-systemu-ETRS89-v-CR/Metodika-prevodu-ETRF2000-vs-S-JTSK-var2(101208).aspx (Metodika převodu mezi ETRF2000 a S-JTSK varianta 2) INSERT INTO "concatenated_operation" VALUES( 'PROJ','ETRS89_TO_S_JTSK_E_N','ETRS89 to S-JTSK / Krovak East North (EPSG:5514)', - 'Transformation based on grid table_yx_3_v1710.dat','EPSG','4258','EPSG','5514',NULL,NULL,0); + 'Transformation based on grid table_-y-x_3_v1710.tif','EPSG','4258','EPSG','5514',NULL,NULL,0); INSERT INTO "concatenated_operation_step" VALUES('PROJ','ETRS89_TO_S_JTSK_E_N',1,'EPSG','5226','reverse'); INSERT INTO "concatenated_operation_step" VALUES('PROJ','ETRS89_TO_S_JTSK_E_N',2,'EPSG','5512','forward'); INSERT INTO "concatenated_operation_step" VALUES('PROJ','ETRS89_TO_S_JTSK_E_N',3,'PROJ','S_JTSK_E_N_TO_S_JTSK05_E_N','reverse'); @@ -142,10 +138,10 @@ INSERT INTO "usage" VALUES('PROJ','S_JTSK_E_N_BALTIC_HEIGHT_USAGE','compound_crs INSERT INTO other_transformation VALUES( 'PROJ','ETRS89_3D_TO_S_JTSK_E_N_BALTIC_HEIGHT','ETRS89 to S-JTSK / Krovak East North + Baltic 1957 height', - 'Transformation based on grids CR-2005.gtx and table_yx_3_v1710.dat ', + 'Transformation based on grids CR-2005.gtx and table_-y-x_3_v1710.tif ', 'PROJ','PROJString', (SELECT v FROM temp_var WHERE k = 'ETRS89_3D_TO_S_JTSK05_E_N_BALTIC_HEIGHT') || - '+step +inv +proj=gridshift +grids=cz_cuzk_table_yx_3_v1710_east_north.tif ', + '+step +inv +proj=gridshift +grids=cz_cuzk_table_-y-x_3_v1710.tif ', 'EPSG','4937','PROJ','S_JTSK_E_N_BALTIC_HEIGHT', 0.05, -- guessed... 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,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0); @@ -157,10 +153,10 @@ INSERT INTO "usage" VALUES('PROJ','S_JTSK_BALTIC_HEIGHT_USAGE','compound_crs','P INSERT INTO other_transformation VALUES( 'PROJ','ETRS89_3D_TO_S_JTSK_BALTIC_HEIGHT','ETRS89 to S-JTSK / Krovak + Baltic 1957 height', - 'Transformation based on grids CR-2005.gtx and table_yx_3_v1710.dat ', + 'Transformation based on grids CR-2005.gtx and table_-y-x_3_v1710.tif ', 'PROJ','PROJString', (SELECT v FROM temp_var WHERE k = 'ETRS89_3D_TO_S_JTSK05_E_N_BALTIC_HEIGHT') || - '+step +inv +proj=gridshift +grids=cz_cuzk_table_yx_3_v1710_east_north.tif ' || + '+step +inv +proj=gridshift +grids=cz_cuzk_table_-y-x_3_v1710.tif ' || '+step +proj=axisswap +order=-2,-1', -- East North --> Southing Westing 'EPSG','4937','PROJ','S_JTSK_BALTIC_HEIGHT', 0.05, -- guessed... diff --git a/data/sql_filelist.cmake b/data/sql_filelist.cmake index d07c7fbb7e..5f2c0765ab 100644 --- a/data/sql_filelist.cmake +++ b/data/sql_filelist.cmake @@ -56,8 +56,7 @@ list(APPEND SQL_FILES "${SQL_DIR}/nkg.sql" "${SQL_DIR}/iau.sql" "${SQL_DIR}/nrcan.sql" - # Below file not yet integrated to unclear licensing of referenced grid file - # "${SQL_DIR}/transformations_czechia_extra.sql" + "${SQL_DIR}/transformations_czechia.sql" "${SQL_DIR}/grid_alternatives.sql" "${SQL_DIR}/grid_alternatives_generated_noaa.sql" "${SQL_DIR}/nadcon5_concatenated_operations.sql"