From 4f8f7416f32efa0245ef4242f8bcc2e366f7d061 Mon Sep 17 00:00:00 2001
From: Victor Popov <v.popov@corp.mail.ru>
Date: Tue, 28 Sep 2021 18:32:47 +0300
Subject: [PATCH] Various improvements

- Introduce PLANET_UPDATE_SERVER environment variable to allow
  overriding of default https://planet.openstreetmap.org/replication/
  update source.
- Explicitly specify path to temp files for osmupdate.
- Improve error handling in case when osmupdate fails: capture output
  and echo them (otherwise bash exits due to `set -e`)
- check_osmctools before using osmtools. This fixes error if both
  SKIP_PLANET_UPDATE and PLANET_METRO are specified.
---
 scripts/process_subways.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/process_subways.sh b/scripts/process_subways.sh
index b0d5f3b..4780678 100755
--- a/scripts/process_subways.sh
+++ b/scripts/process_subways.sh
@@ -31,6 +31,7 @@ Environment variable reference:
   - PLANET: path to a local or remote o5m or pbf source file (the entire planet or an extract)
   - PLANET_METRO: path to a local o5m file with extract of cities having metro
     It's used instead of \$PLANET if exists otherwise it's created first
+  - PLANET_UPDATE_SERVER: server to get replication data from. Defaults to https://planet.openstreetmap.org/replication/
   - CITY: name of a city/country to process
   - BBOX: bounding box of an extract; x1,y1,x2,y2. Has precedence over \$POLY
   - POLY: *.poly file with [multi]polygon comprising cities with metro
@@ -185,11 +186,15 @@ fi
 if [ -z "${SKIP_PLANET_UPDATE-}" -a -n "${NEED_FILTER-}" ]; then
   check_osmctools
   check_poly
+  PLANET_UPDATE_SERVER=${PLANET_UPDATE_SERVER:-https://planet.openstreetmap.org/replication/}
   PLANET_METRO_ABS="$(cd "$(dirname "$PLANET_METRO")"; pwd)/$(basename "$PLANET_METRO")"
+  mkdir -p $TMPDIR/osmupdate_temp/
   pushd "$OSMCTOOLS" # osmupdate requires osmconvert in a current directory
   OSMUPDATE_ERRORS=$(./osmupdate --drop-author --out-o5m ${BBOX:+"-b=$BBOX"} \
                                  ${POLY:+"-B=$POLY"} "$PLANET_METRO_ABS" \
-                                 "$PLANET_METRO_ABS.new.o5m" 2>&1)
+                                 --base-url=$PLANET_UPDATE_SERVER \
+                                 --tempfiles=$TMPDIR/osmupdate_temp/temp \
+                                 "$PLANET_METRO_ABS.new.o5m" 2>&1 || :)
   if [ -n "$OSMUPDATE_ERRORS" ]; then
     echo "osmupdate failed: $OSMUPDATE_ERRORS"
     exit 7
@@ -201,6 +206,7 @@ fi
 # Filtering planet-metro
 
 if [ -n "${NEED_FILTER-}" ]; then
+  check_osmctools
   QRELATIONS="route=subway =light_rail =monorail =train route_master=subway =light_rail =monorail =train public_transport=stop_area =stop_area_group"
   QNODES="railway=station station=subway =light_rail =monorail railway=subway_entrance subway=yes light_rail=yes monorail=yes train=yes"
   "$OSMCTOOLS/osmfilter" "$PLANET_METRO" \