Skip to content

Commit 4bacf90

Browse files
rouaultrouault
authored
Merge pull request #4357 from rouault/concatenated_operation_step_direction
Database: add an optional step_direction column to the concatenated_operation_step table
2 parents 68ad9e8 + 299c472 commit 4bacf90

19 files changed

+797
-748
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 "5cae0af56a2189692c8e1cf83fe7929e")
34+
set(PROJ_DB_SQL_EXPECTED_MD5 "648183209a519b679cca32c4cec988e2")
3535

3636
add_custom_command(
3737
OUTPUT ${PROJ_DB}

‎data/sql/concatenated_operation_step.sql

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

‎data/sql/ignf.sql

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4345,41 +4345,41 @@ INSERT INTO "usage" VALUES('PROJ', 'IGNF_RGF93GDD_TO_EPSG_4326_USAGE','helmert_t
43454345

43464346
INSERT INTO "concatenated_operation" VALUES('IGNF','TSG62_NTFPGRAD_TO_ED50G','Nouvelle Triangulation Francaise Paris grades to ED50G',NULL,'IGNF','NTFPGRAD','IGNF','ED50G',NULL,'1.0.0',0);
43474347
INSERT INTO "usage" VALUES('IGNF', 'TSG62_NTFPGRAD_TO_ED50G_USAGE','concatenated_operation','IGNF','TSG62_NTFPGRAD_TO_ED50G','IGNF','91','IGNF','6');
4348-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFPGRAD_TO_ED50G',1,'IGNF','TSG1240');
4349-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFPGRAD_TO_ED50G',2,'IGNF','TSG62_NTFG_TO_ED50G');
4348+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFPGRAD_TO_ED50G',1,'IGNF','TSG1240',NULL);
4349+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFPGRAD_TO_ED50G',2,'IGNF','TSG62_NTFG_TO_ED50G',NULL);
43504350
INSERT INTO "concatenated_operation" VALUES('IGNF','TSG62_NTFP_TO_ED50G','Nouvelle Triangulation Francaise Paris grades to ED50G',NULL,'IGNF','NTFP','IGNF','ED50G',NULL,'1.0.0',0);
43514351
INSERT INTO "usage" VALUES('IGNF', 'TSG62_NTFP_TO_ED50G_USAGE','concatenated_operation','IGNF','TSG62_NTFP_TO_ED50G','IGNF','91','IGNF','6');
4352-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFP_TO_ED50G',1,'IGNF','TSG1240_IGNF_NTFP_TO_IGNF_NTFG');
4353-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFP_TO_ED50G',2,'IGNF','TSG62_NTFG_TO_ED50G');
4352+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFP_TO_ED50G',1,'IGNF','TSG1240_IGNF_NTFP_TO_IGNF_NTFG',NULL);
4353+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFP_TO_ED50G',2,'IGNF','TSG62_NTFG_TO_ED50G',NULL);
43544354
INSERT INTO "concatenated_operation" VALUES('IGNF','TSG62_NTFPGRAD_TO_ED50GEO','Nouvelle Triangulation Francaise Paris grades to ED50GEO',NULL,'IGNF','NTFPGRAD','IGNF','ED50GEO',NULL,'1.0.0',0);
43554355
INSERT INTO "usage" VALUES('IGNF', 'TSG62_NTFPGRAD_TO_ED50GEO_USAGE','concatenated_operation','IGNF','TSG62_NTFPGRAD_TO_ED50GEO','IGNF','91','IGNF','6');
4356-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFPGRAD_TO_ED50GEO',1,'IGNF','TSG1240');
4357-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFPGRAD_TO_ED50GEO',2,'IGNF','TSG62_NTFG_TO_ED50GEO');
4356+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFPGRAD_TO_ED50GEO',1,'IGNF','TSG1240',NULL);
4357+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFPGRAD_TO_ED50GEO',2,'IGNF','TSG62_NTFG_TO_ED50GEO',NULL);
43584358
INSERT INTO "concatenated_operation" VALUES('IGNF','TSG62_NTFP_TO_ED50GEO','Nouvelle Triangulation Francaise Paris grades to ED50GEO',NULL,'IGNF','NTFP','IGNF','ED50GEO',NULL,'1.0.0',0);
43594359
INSERT INTO "usage" VALUES('IGNF', 'TSG62_NTFP_TO_ED50GEO_USAGE','concatenated_operation','IGNF','TSG62_NTFP_TO_ED50GEO','IGNF','91','IGNF','6');
4360-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFP_TO_ED50GEO',1,'IGNF','TSG1240_IGNF_NTFP_TO_IGNF_NTFG');
4361-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFP_TO_ED50GEO',2,'IGNF','TSG62_NTFG_TO_ED50GEO');
4360+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFP_TO_ED50GEO',1,'IGNF','TSG1240_IGNF_NTFP_TO_IGNF_NTFG',NULL);
4361+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG62_NTFP_TO_ED50GEO',2,'IGNF','TSG62_NTFG_TO_ED50GEO',NULL);
43624362
INSERT INTO "concatenated_operation" VALUES('IGNF','TSG399_NTFPGRAD_TO_WGS84GDD','Nouvelle Triangulation Francaise Paris grades to WGS84GDD',NULL,'IGNF','NTFPGRAD','IGNF','WGS84GDD',NULL,'1.0.0',0);
43634363
INSERT INTO "usage" VALUES('IGNF', 'TSG399_NTFPGRAD_TO_WGS84GDD_USAGE','concatenated_operation','IGNF','TSG399_NTFPGRAD_TO_WGS84GDD','IGNF','91','IGNF','6');
4364-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFPGRAD_TO_WGS84GDD',1,'IGNF','TSG1240');
4365-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFPGRAD_TO_WGS84GDD',2,'IGNF','TSG399_NTFG_TO_WGS84GDD');
4364+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFPGRAD_TO_WGS84GDD',1,'IGNF','TSG1240',NULL);
4365+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFPGRAD_TO_WGS84GDD',2,'IGNF','TSG399_NTFG_TO_WGS84GDD',NULL);
43664366
INSERT INTO "concatenated_operation" VALUES('IGNF','TSG399_NTFP_TO_WGS84GDD','Nouvelle Triangulation Francaise Paris grades to WGS84GDD',NULL,'IGNF','NTFP','IGNF','WGS84GDD',NULL,'1.0.0',0);
43674367
INSERT INTO "usage" VALUES('IGNF', 'TSG399_NTFP_TO_WGS84GDD_USAGE','concatenated_operation','IGNF','TSG399_NTFP_TO_WGS84GDD','IGNF','91','IGNF','6');
4368-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFP_TO_WGS84GDD',1,'IGNF','TSG1240_IGNF_NTFP_TO_IGNF_NTFG');
4369-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFP_TO_WGS84GDD',2,'IGNF','TSG399_NTFG_TO_WGS84GDD');
4368+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFP_TO_WGS84GDD',1,'IGNF','TSG1240_IGNF_NTFP_TO_IGNF_NTFG',NULL);
4369+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFP_TO_WGS84GDD',2,'IGNF','TSG399_NTFG_TO_WGS84GDD',NULL);
43704370
INSERT INTO "concatenated_operation" VALUES('IGNF','TSG399_NTFPGRAD_TO_WGS84G','Nouvelle Triangulation Francaise Paris grades to WGS84G',NULL,'IGNF','NTFPGRAD','IGNF','WGS84G',NULL,'1.0.0',0);
43714371
INSERT INTO "usage" VALUES('IGNF', 'TSG399_NTFPGRAD_TO_WGS84G_USAGE','concatenated_operation','IGNF','TSG399_NTFPGRAD_TO_WGS84G','IGNF','91','IGNF','6');
4372-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFPGRAD_TO_WGS84G',1,'IGNF','TSG1240');
4373-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFPGRAD_TO_WGS84G',2,'IGNF','TSG399_NTFG_TO_WGS84G');
4372+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFPGRAD_TO_WGS84G',1,'IGNF','TSG1240',NULL);
4373+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFPGRAD_TO_WGS84G',2,'IGNF','TSG399_NTFG_TO_WGS84G',NULL);
43744374
INSERT INTO "concatenated_operation" VALUES('IGNF','TSG399_NTFP_TO_WGS84G','Nouvelle Triangulation Francaise Paris grades to WGS84G',NULL,'IGNF','NTFP','IGNF','WGS84G',NULL,'1.0.0',0);
43754375
INSERT INTO "usage" VALUES('IGNF', 'TSG399_NTFP_TO_WGS84G_USAGE','concatenated_operation','IGNF','TSG399_NTFP_TO_WGS84G','IGNF','91','IGNF','6');
4376-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFP_TO_WGS84G',1,'IGNF','TSG1240_IGNF_NTFP_TO_IGNF_NTFG');
4377-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFP_TO_WGS84G',2,'IGNF','TSG399_NTFG_TO_WGS84G');
4376+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFP_TO_WGS84G',1,'IGNF','TSG1240_IGNF_NTFP_TO_IGNF_NTFG',NULL);
4377+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFP_TO_WGS84G',2,'IGNF','TSG399_NTFG_TO_WGS84G',NULL);
43784378
INSERT INTO "concatenated_operation" VALUES('IGNF','TSG399_NTFPGRAD_TO_4326','Nouvelle Triangulation Francaise Paris grades to 4326',NULL,'IGNF','NTFPGRAD','EPSG','4326',NULL,'1.0.0',0);
43794379
INSERT INTO "usage" VALUES('IGNF', 'TSG399_NTFPGRAD_TO_4326_USAGE','concatenated_operation','IGNF','TSG399_NTFPGRAD_TO_4326','IGNF','91','IGNF','6');
4380-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFPGRAD_TO_4326',1,'IGNF','TSG1240');
4381-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFPGRAD_TO_4326',2,'IGNF','TSG399_NTFG_TO_4326');
4380+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFPGRAD_TO_4326',1,'IGNF','TSG1240',NULL);
4381+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFPGRAD_TO_4326',2,'IGNF','TSG399_NTFG_TO_4326',NULL);
43824382
INSERT INTO "concatenated_operation" VALUES('IGNF','TSG399_NTFP_TO_4326','Nouvelle Triangulation Francaise Paris grades to 4326',NULL,'IGNF','NTFP','EPSG','4326',NULL,'1.0.0',0);
43834383
INSERT INTO "usage" VALUES('IGNF', 'TSG399_NTFP_TO_4326_USAGE','concatenated_operation','IGNF','TSG399_NTFP_TO_4326','IGNF','91','IGNF','6');
4384-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFP_TO_4326',1,'IGNF','TSG1240_IGNF_NTFP_TO_IGNF_NTFG');
4385-
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFP_TO_4326',2,'IGNF','TSG399_NTFG_TO_4326');
4384+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFP_TO_4326',1,'IGNF','TSG1240_IGNF_NTFP_TO_IGNF_NTFG',NULL);
4385+
INSERT INTO "concatenated_operation_step" VALUES('IGNF','TSG399_NTFP_TO_4326',2,'IGNF','TSG399_NTFG_TO_4326',NULL);

‎data/sql/metadata.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-- DATABASE_LAYOUT_VERSION_MINOR constants in src/iso19111/factory.cpp must be
88
-- updated as well.
99
INSERT INTO "metadata" VALUES('DATABASE.LAYOUT.VERSION.MAJOR', 1);
10-
INSERT INTO "metadata" VALUES('DATABASE.LAYOUT.VERSION.MINOR', 4);
10+
INSERT INTO "metadata" VALUES('DATABASE.LAYOUT.VERSION.MINOR', 5);
1111

1212
INSERT INTO "metadata" VALUES('EPSG.VERSION', 'v11.025');
1313
INSERT INTO "metadata" VALUES('EPSG.DATE', '2024-12-14');

0 commit comments

Comments
 (0)