From 28e7af8e6dabec7cc61fab1e36d81a8609ebc74d Mon Sep 17 00:00:00 2001 From: "Re:My" Date: Thu, 19 Mar 2026 14:45:07 +0100 Subject: [PATCH 1/6] Add elevation switch --- scripts/run_valhalla.sh | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/scripts/run_valhalla.sh b/scripts/run_valhalla.sh index 0c26e33..232959c 100755 --- a/scripts/run_valhalla.sh +++ b/scripts/run_valhalla.sh @@ -29,6 +29,7 @@ log_message "INFO: CONCURRENCY set to $CONCURRENCY" log_message "INFO: MAX_CACHE_SIZE set to $MAX_CACHE_SIZE" log_message "INFO: PBF_LOCAL_PATH set to $PBF_LOCAL_PATH" log_message "INFO: PBF_URL set to $PBF_URL" +log_message "INFO: USE_ELEVATION set to $USE_ELEVATION" # watch the .lock file every 10 secs wait_for_lock() { @@ -145,15 +146,19 @@ while true; do log_message "INFO: Building initial graph with $PBF..." valhalla_build_tiles -c "${valhalla_config}" -s initialize -e build "$PBF" || exit 1 - - log_message "INFO: Downloading elevation to $ELEVATION_DIR..." - valhalla_build_elevation --from-tiles --decompress -c ${valhalla_config} -v || exit 1 - # debugging with andorra only: - # valhalla_build_elevation --decompress -c ${valhalla_config} -v -b 1,42,2,43 || exit 1 - - log_message "INFO: Enhancing initial tiles with elevation..." - valhalla_build_tiles -c "${valhalla_config}" -s enhance -e cleanup "$PBF" || exit 1 - + + if [ "$USE_ELEVATION" = "true" ]; then + log_message "INFO: Downloading elevation to $ELEVATION_DIR..." + valhalla_build_elevation --from-tiles --decompress -c ${valhalla_config} -v || exit 1 + # debugging with andorra only: + # valhalla_build_elevation --decompress -c ${valhalla_config} -v -b 1,42,2,43 || exit 1 + + log_message "INFO: Enhancing initial tiles with elevation..." + valhalla_build_tiles -c "${valhalla_config}" -s enhance -e cleanup "$PBF" || exit 1 + else + log_message "INFO: Skipping elevation enhancement." + fi + # reset config so the service won't load the graph reset_config From 2e7256db944ba198e7c550bdc7fc90e0ee6420b7 Mon Sep 17 00:00:00 2001 From: "Re:My" Date: Thu, 19 Mar 2026 14:46:49 +0100 Subject: [PATCH 2/6] Update valhalla.conf --- conf/valhalla.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/valhalla.conf b/conf/valhalla.conf index aadcfd0..35caf4d 100644 --- a/conf/valhalla.conf +++ b/conf/valhalla.conf @@ -16,4 +16,4 @@ stdout_logfile=/app/tmp_data/logs/builder.log stdout_logfile_maxbytes=10MB # stdout_logfile=/proc/1/fd/1 # stdout_logfile_maxbytes=0 -environment=NO_PROXY="%(ENV_NO_PROXY)s",PBF_LOCAL_PATH="%(ENV_PBF_LOCAL_PATH)s",PBF_URL="%(ENV_PBF_URL)s",HTTPS_PROXY="%(ENV_HTTPS_PROXY)s",HTTP_PROXY="%(ENV_HTTP_PROXY)s",MAX_CACHE_SIZE="%(ENV_MAX_CACHE_SIZE)s",CONCURRENCY="%(ENV_CONCURRENCY)s",DATA_DIR="/app/data",TMP_DATA_DIR="/app/tmp_data" +environment=NO_PROXY="%(ENV_NO_PROXY)s",USE_ELEVATION="%(ENV_USE_ELEVATION)s",PBF_LOCAL_PATH="%(ENV_PBF_LOCAL_PATH)s",PBF_URL="%(ENV_PBF_URL)s",HTTPS_PROXY="%(ENV_HTTPS_PROXY)s",HTTP_PROXY="%(ENV_HTTP_PROXY)s",MAX_CACHE_SIZE="%(ENV_MAX_CACHE_SIZE)s",CONCURRENCY="%(ENV_CONCURRENCY)s",DATA_DIR="/app/data",TMP_DATA_DIR="/app/tmp_data" From 90a1a353bd38013a8a2b68c0fc8c8f84e8266028 Mon Sep 17 00:00:00 2001 From: "Re:My" Date: Thu, 19 Mar 2026 14:47:46 +0100 Subject: [PATCH 3/6] Update docker-entrypoint.sh --- scripts/docker-entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index 80a15e7..73dc63d 100755 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -23,6 +23,7 @@ elif [ "${cmd}" == 'app' ]; then CONF_FILE="/etc/supervisor/conf.d/valhalla.conf" sed -i \ -e "s|%(ENV_MAX_CACHE_SIZE)s|${MAX_CACHE_SIZE}|g" \ + -e "s|%(ENV_USE_ELEVATION)s|${USE_ELEVATION}|g" \ -e "s|%(ENV_PBF_LOCAL_PATH)s|${PBF_LOCAL_PATH}|g" \ -e "s|%(ENV_PBF_URL)s|${PBF_URL}|g" \ -e "s|%(ENV_CONCURRENCY)s|${CONCURRENCY}|g" \ From 29125080cfb1753e1c50c86b9a9787a4662a25fc Mon Sep 17 00:00:00 2001 From: "Re:My" Date: Thu, 19 Mar 2026 14:48:40 +0100 Subject: [PATCH 4/6] Update deploy-prod.yml --- .github/workflows/deploy-prod.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index eb2eedd..fe5d567 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -32,6 +32,7 @@ jobs: SSL_KEY=${{ vars.SSL_KEY }} CONCURRENCY=${{ vars.CONCURRENCY }} MAX_CACHE_SIZE=${{ vars.MAX_CACHE_SIZE }} + USE_ELEVATION=${{ vars.USE_ELEVATION }} PBF_LOCAL_PATH=${{ vars.PBF_LOCAL_PATH }} PBF_URL=${{ vars.PBF_URL }} HTTP_PROXY=${{ vars.HTTP_PROXY }} From 046c9ec1dc19ef952ab475f013a2241394a4071a Mon Sep 17 00:00:00 2001 From: "Re:My" Date: Thu, 19 Mar 2026 14:49:09 +0100 Subject: [PATCH 5/6] Update deploy-int.yaml --- .github/workflows/deploy-int.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-int.yaml b/.github/workflows/deploy-int.yaml index 3588988..46c3586 100644 --- a/.github/workflows/deploy-int.yaml +++ b/.github/workflows/deploy-int.yaml @@ -36,6 +36,7 @@ jobs: SSL_KEY=${{ vars.SSL_KEY }} CONCURRENCY=${{ vars.CONCURRENCY }} MAX_CACHE_SIZE=${{ vars.MAX_CACHE_SIZE }} + USE_ELEVATION=${{ vars.USE_ELEVATION }} PBF_LOCAL_PATH=${{ vars.PBF_LOCAL_PATH }} PBF_URL=${{ vars.PBF_URL }} HTTP_PROXY=${{ vars.HTTP_PROXY }} From cb323c05c0df01f47670d3b7456ff9d30d2af8ac Mon Sep 17 00:00:00 2001 From: "Re:My" Date: Thu, 19 Mar 2026 14:49:37 +0100 Subject: [PATCH 6/6] Update deploy-local.yml --- .github/workflows/deploy-local.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-local.yml b/.github/workflows/deploy-local.yml index 9ac212f..448c12b 100644 --- a/.github/workflows/deploy-local.yml +++ b/.github/workflows/deploy-local.yml @@ -34,6 +34,7 @@ jobs: SSL_KEY=${{ vars.SSL_KEY }} CONCURRENCY=${{ vars.CONCURRENCY }} MAX_CACHE_SIZE=${{ vars.MAX_CACHE_SIZE }} + USE_ELEVATION=${{ vars.USE_ELEVATION }} PBF_LOCAL_PATH=${{ vars.PBF_LOCAL_PATH }} PBF_URL=${{ vars.PBF_URL }} HTTP_PROXY=${{ vars.HTTP_PROXY }}