From 04fbc4dbab67223bedabaaf2b133e1b36967a414 Mon Sep 17 00:00:00 2001 From: Janne Bergman Date: Thu, 8 Jan 2026 09:07:00 +0200 Subject: [PATCH] Add digiroad version to filenames --- .gitignore | 1 + README.md | 10 +++++----- create_qgis_project_archive.sh | 2 +- export_infra_network_csv.sh | 2 +- export_mbtiles_dr_linkki.sh | 4 ++-- export_mbtiles_dr_pysakki.sh | 2 +- export_pgdump_digiroad.sh | 2 +- export_stops_csv.sh | 2 +- generate_fixup_data.sh | 2 +- import_digiroad_shapefiles.sh | 7 +++++++ import_infra_network_csv.sh | 2 +- set_env.sh | 5 +++++ upload_routing_dump_to_azure.sh | 2 +- 13 files changed, 28 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 1919d88..b83fb78 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ workdir .DS_Store docker/* !docker/docker-compose.custom.yml +.idea diff --git a/README.md b/README.md index 8167809..54e0cde 100644 --- a/README.md +++ b/README.md @@ -169,9 +169,9 @@ By executing `export_routing_schema.sh`, a separate routing schema is created in the database. The data is read from the Digiroad schema and is transformed into a table structure defined in and used by the JORE4 map-matching backend. As a result, two database dump files will be created: one in SQL format, named -`digiroad_r_routing_.sql`, and another in PostgreSQL's custom format, -named `digiroad_r_routing_.pgdump`. Both files will be written into -`workdir/pgdump` subdirectory. +`digiroad_r_routing__.sql`, and another in PostgreSQL's +custom format, named `digiroad_r_routing__.pgdump`. Both +files will be written into `workdir/pgdump` subdirectory. The SQL dump artifact can be uploaded to Azure Blob Storage with the command below. An active Azure subscription associated with JORE4 is required. Azure CLI @@ -241,8 +241,8 @@ run: ``` This command reads selected data items from filtered public transport stop data -imported from Digiroad and writes it to the _workdir/csv/digiroad_stops.csv_ -file. +imported from Digiroad and writes it to the +_workdir/csv/digiroad_stops_.csv_ file. ## Exporting vector tiles diff --git a/create_qgis_project_archive.sh b/create_qgis_project_archive.sh index d3779d5..ab5b966 100755 --- a/create_qgis_project_archive.sh +++ b/create_qgis_project_archive.sh @@ -6,6 +6,6 @@ source "$(dirname "$0")/set_env.sh" # Create a zip archive containing HSL QGIS fixup project. mkdir -p "$WORK_DIR"/zip -zip -r "${WORK_DIR}/zip/$(date "+%Y-%m-%d")_hsl_qgis_fixup_project.zip" \ +zip -r "${WORK_DIR}/zip/${DIGIROAD_IRROTUS_NRO}_$(date "+%Y-%m-%d")_hsl_qgis_fixup_project.zip" \ fixup/jore4-digiroad-fix-project.qgz \ fixup/digiroad workdir/shp/UUSIMAA/ diff --git a/export_infra_network_csv.sh b/export_infra_network_csv.sh index c23a31a..b368d30 100755 --- a/export_infra_network_csv.sh +++ b/export_infra_network_csv.sh @@ -10,7 +10,7 @@ source "$(dirname "$0")/set_env.sh" docker_start # Export CSV file to output directory. -OUTPUT_FILENAME="infra_network_digiroad.csv" +OUTPUT_FILENAME="infra_network_digiroad_${DIGIROAD_IRROTUS_NRO}.csv" mkdir -p "${WORK_DIR}/csv" diff --git a/export_mbtiles_dr_linkki.sh b/export_mbtiles_dr_linkki.sh index 5987e2e..08dbf42 100755 --- a/export_mbtiles_dr_linkki.sh +++ b/export_mbtiles_dr_linkki.sh @@ -8,7 +8,7 @@ source "$(dirname "$0")/set_env.sh" DB_TABLE_NAME="dr_linkki" -MBTILES_MAX_ZOOM_LEVEL=16 +MBTILES_MAX_ZOOM_LEVEL=17 MBTILES_LAYER_NAME=$DB_TABLE_NAME MBTILES_DESCRIPTION="Digiroad road links" @@ -19,7 +19,7 @@ GEOJSON_OUTPUT_DIR="${MBTILES_OUTPUT_DIR}/geojson_input" mkdir -p "$SHP_OUTPUT_DIR" mkdir -p "$GEOJSON_OUTPUT_DIR" -OUTPUT_FILE_BASENAME="${DB_TABLE_NAME}_$(date "+%Y-%m-%d")" +OUTPUT_FILE_BASENAME="${DB_TABLE_NAME}_${DIGIROAD_IRROTUS_NRO}_$(date "+%Y-%m-%d")" SHP_OUTPUT_FILE="${OUTPUT_FILE_BASENAME}.shp" GEOJSON_OUTPUT_FILE="${OUTPUT_FILE_BASENAME}.geojson" diff --git a/export_mbtiles_dr_pysakki.sh b/export_mbtiles_dr_pysakki.sh index 06be463..f79ed42 100755 --- a/export_mbtiles_dr_pysakki.sh +++ b/export_mbtiles_dr_pysakki.sh @@ -19,7 +19,7 @@ GEOJSON_OUTPUT_DIR="${MBTILES_OUTPUT_DIR}/geojson_input" mkdir -p "$SHP_OUTPUT_DIR" mkdir -p "$GEOJSON_OUTPUT_DIR" -OUTPUT_FILE_BASENAME="${DB_TABLE_NAME}_$(date "+%Y-%m-%d")" +OUTPUT_FILE_BASENAME="${DB_TABLE_NAME}_${DIGIROAD_IRROTUS_NRO}_$(date "+%Y-%m-%d")" SHP_OUTPUT_FILE="${OUTPUT_FILE_BASENAME}.shp" GEOJSON_OUTPUT_FILE="${OUTPUT_FILE_BASENAME}.geojson" diff --git a/export_pgdump_digiroad.sh b/export_pgdump_digiroad.sh index 41ca5a0..6289643 100755 --- a/export_pgdump_digiroad.sh +++ b/export_pgdump_digiroad.sh @@ -9,7 +9,7 @@ source "$(dirname "$0")/set_env.sh" # Start Docker container. The container is expected to exist and contain all the data to be exported. docker_start -PGDUMP_OUTPUT="digiroad_r_$(date "+%Y-%m-%d").pgdump" +PGDUMP_OUTPUT="digiroad_r_${DIGIROAD_IRROTUS_NRO}_$(date "+%Y-%m-%d").pgdump" OUTPUT_TABLES="dr_linkki dr_pysakki dr_kaantymisrajoitus" OUTPUT_TABLE_OPTIONS=$(echo "${OUTPUT_TABLES[@]}" | sed "s/dr_/-t ${DB_SCHEMA_NAME_DIGIROAD}.dr_/g") diff --git a/export_stops_csv.sh b/export_stops_csv.sh index bb130e1..2d188aa 100755 --- a/export_stops_csv.sh +++ b/export_stops_csv.sh @@ -10,7 +10,7 @@ source "$(dirname "$0")/set_env.sh" docker_start # Export csv file to output directory. -OUTPUT_FILENAME="digiroad_stops.csv" +OUTPUT_FILENAME="digiroad_stops_${DIGIROAD_IRROTUS_NRO}.csv" mkdir -p "$WORK_DIR"/csv diff --git a/generate_fixup_data.sh b/generate_fixup_data.sh index 8a5f830..2828831 100755 --- a/generate_fixup_data.sh +++ b/generate_fixup_data.sh @@ -16,7 +16,7 @@ source "$CWD"/set_env.sh docker_start # Generate HSL supplementary links and stop points. -docker_exec postgres "exec $PSQL -v ON_ERROR_STOP=1 -f /tmp/sql/add_hsl_fixup_data_for_dr_2025_02.sql -v schema=$DB_SCHEMA_NAME_DIGIROAD" +docker_exec postgres "exec $PSQL -v ON_ERROR_STOP=1 -f /tmp/sql/add_hsl_fixup_data_for_dr_${DIGIROAD_IRROTUS_NRO}.sql -v schema=$DB_SCHEMA_NAME_DIGIROAD" # Rewrite the GeoPackage file containing HSL's infrastructure network # supplementing data. diff --git a/import_digiroad_shapefiles.sh b/import_digiroad_shapefiles.sh index 75f398c..e630a04 100755 --- a/import_digiroad_shapefiles.sh +++ b/import_digiroad_shapefiles.sh @@ -9,6 +9,7 @@ source "$(dirname "$0")/set_env.sh" AREA="UUSIMAA" SHP_URL="https://aineistot.vayla.fi/?path=ava/Tie/Digiroad/Aineistojulkaisut/latest/Maakuntajako_digiroad_R/${AREA}.zip" +IRROTUS_NRO_URL="https://aineistot.vayla.fi/?path=ava/Tie/Digiroad/Aineistojulkaisut/latest/irrotus_nro.txt" DOWNLOAD_TARGET_DIR="${WORK_DIR}/zip" DOWNLOAD_TARGET_FILE="${DOWNLOAD_TARGET_DIR}/${AREA}_R.zip" @@ -17,6 +18,12 @@ DOWNLOAD_TARGET_FILE="${DOWNLOAD_TARGET_DIR}/${AREA}_R.zip" if [[ ! -f "$DOWNLOAD_TARGET_FILE" ]]; then mkdir -p "$DOWNLOAD_TARGET_DIR" curl -Lo "$DOWNLOAD_TARGET_FILE" "$SHP_URL" + + DIGIROAD_IRROTUS_NRO=$(curl -sL "$IRROTUS_NRO_URL") + if [[ ! -f "${DOWNLOAD_TARGET_DIR}/digiroad_${DIGIROAD_IRROTUS_NRO}.txt" ]]; then + echo $DIGIROAD_IRROTUS_NRO > "${DOWNLOAD_TARGET_DIR}/digiroad_${DIGIROAD_IRROTUS_NRO}.txt" + fi + echo $DIGIROAD_IRROTUS_NRO >| "${DOWNLOAD_TARGET_DIR}/digiroad_irrotus_nro.txt" fi SUB_AREAS="ITA-UUSIMAA UUSIMAA_1 UUSIMAA_2" diff --git a/import_infra_network_csv.sh b/import_infra_network_csv.sh index 60f69c3..8f53fda 100755 --- a/import_infra_network_csv.sh +++ b/import_infra_network_csv.sh @@ -20,6 +20,6 @@ PGPASSWORD="${PGPASSWORD:-adminpassword}" source "$(dirname "$0")/set_env.sh" # Import dump from csv file. -INPUT_FILENAME="infra_network_digiroad.csv" +INPUT_FILENAME="infra_network_digiroad_${DIGIROAD_IRROTUS_NRO}.csv" PGPASSWORD="$PGPASSWORD" psql -h "$PGHOSTNAME" -p "$PGPORT" -U "$PGUSERNAME" -d "$PGDATABASE" \ -v ON_ERROR_STOP=1 -f "$CWD"/sql/import_infra_links_from_csv.sql -v csvfile="${WORK_DIR}/csv/${INPUT_FILENAME}" diff --git a/set_env.sh b/set_env.sh index 074e470..de70dc9 100755 --- a/set_env.sh +++ b/set_env.sh @@ -5,6 +5,11 @@ CWD="$(dirname "$0")" export CWD export WORK_DIR="${CWD}/workdir" +export DIGIROAD_IRROTUS_NRO="" +if [[ -f "$WORK_DIR/zip/digiroad_irrotus_nro.txt" ]]; then + DIGIROAD_IRROTUS_NRO=$(cat "$WORK_DIR/zip/digiroad_irrotus_nro.txt") +fi + # shapefile encoding export SHP_ENCODING="UTF-8" diff --git a/upload_routing_dump_to_azure.sh b/upload_routing_dump_to_azure.sh index 47ea10f..ff79798 100755 --- a/upload_routing_dump_to_azure.sh +++ b/upload_routing_dump_to_azure.sh @@ -4,7 +4,7 @@ # NB: Not all versions of Azure CLI seem to work for uploading the files, see the error message below for more info. # The target file is an SQL dump file for routing schema for current date. -SQL_FILE="./workdir/pgdump/digiroad_r_routing_$(date "+%Y-%m-%d").sql" +SQL_FILE="./workdir/pgdump/digiroad_r_routing_${DIGIROAD_IRROTUS_NRO}_$(date "+%Y-%m-%d").sql" if [[ ! -f "${SQL_FILE}" ]]; then echo "File to upload does not exist: ${SQL_FILE}"