Scripts update

.gitignore

@@ -1,6 +1,8 @@
 __pycache__/
+tmp_html/
+html/
 *.log
 *.json
 *.geojson
 *.osm
-validate.sh
+*.swp

README.md

@@ -12,6 +12,27 @@ of metro maps.
 * Run `mapsme_subways.py -x filtered_data.osm` to build metro structures and receive a validation log.
 * Run `validation_to_html.py` on that log to create readable HTML tables.
 
+## Validation Script
+
+There is a `process_subways.sh` in the `scripts` directory. The author uses it for
+updating both the planet and a city he's working on. Here is an example of a script
+for updating the London Underground network:
+
+```bash
+PLANET_PATH=$HOME/osm/planet
+export PLANET="$PLANET_PATH/london.o5m"
+export HTML_DIR=tmp_html
+export BBOX=-0.681152,51.286758,0.334015,51.740636
+export CITY="London"
+export OSMCTOOLS="$PLANET_PATH"
+
+scripts/process_subways.sh
+```
+
+The bounding box can be found in the
+[Google Spreadsheet](https://docs.google.com/spreadsheets/d/1-UHDzfBwHdeyFxgC5cE_MaNQotF3-Y0r1nW9IwpIEj8/edit?usp=sharing).
+If you are okay with rare updates, use [this website](http://osmz.ru/subways/).
+
 ## Adding Stop Areas To OSM
 
 To quickly add `stop_area` relations for the entire city, use the `make_stop_areas.py` script

scripts/process_subways.sh

@@ -0,0 +1,93 @@
+#!/bin/bash
+set -e -u
+
+if [ $# -lt 1 -a -z "${PLANET-}" ]; then
+  echo "This script updates a planet or an extract, processes metro networks in it"
+  echo "and produses a set of HTML files with validation results."
+  echo
+  echo "Usage: $0 <planet.o5m>"
+  echo
+  echo "Variable reference:"
+  echo "- PLANET: path for the source o5m file (the entire planet or an extract)"
+  echo "- CITY: name of a city to process"
+  echo "- BBOX: bounding box of an extract; x1,y1,x2,y2"
+  echo "- OSMCTOOLS: path to osmconvert and osmupdate binaries"
+  echo "- PYTHON: python 3 executable"
+  echo "- GIT_PULL: set to 1 to update the scripts"
+  echo "- TMPDIR: path to temporary files"
+  echo "- HTML_DIR: target path for generated HTML files"
+  echo "- SERVER: server name and path to upload HTML files (e.g. ilya@osmz.ru:/var/www/)"
+  echo "- SERVER_KEY: rsa key to supply for uploading the files"
+  echo "- REMOVE_HTML: set to 1 to remove HTML_DIR after uploading"
+  exit 1
+fi
+
+[ -n "${WHAT-}" ] && echo WHAT
+
+PLANET="${PLANET:-${1-}}"
+[ ! -f "$PLANET" ] && echo "Cannot find planet file $PLANET" && exit 2
+OSMCTOOLS="${OSMCTOOLS:-$HOME/osmctools}"
+if [ ! -f "$OSMCTOOLS/osmupdate" ]; then
+  if which osmupdate > /dev/null; then
+    OSMCTOOLS="$(dirname "$(which osmupdate)")"
+  else
+    echo "Please compile osmctools to $OSMCTOOLS"
+    exit 1
+  fi
+fi
+PYTHON=${PYTHON:-python3}
+# This will fail if there is no python
+"$PYTHON" --version > /dev/null
+SUBWAYS_PATH="$(dirname "$0")/.."
+[ ! -f "$SUBWAYS_PATH/mapsme_subways.py" ] && echo "Please clone the subways repo to $SUBWAYS_PATH" && exit 2
+TMPDIR="${TMPDIR:-$SUBWAYS_PATH}"
+
+# Downloading the latest version of the subways script
+
+
+if [ -n "${GIT_PULL-}" ]; then (
+  cd "$SUBWAYS_PATH"
+  git pull origin master
+) fi
+
+
+# Updating the planet file
+
+PLANET_ABS="$(cd "$(dirname "$PLANET")"; pwd)/$(basename "$PLANET")"
+(
+  cd "$OSMCTOOLS" # osmupdate requires osmconvert in a current directory
+  ./osmupdate --drop-author --drop-version --out-o5m "$PLANET_ABS" ${BBOX+"-b=$BBOX"} "$PLANET_ABS.new.o5m"
+  mv "$PLANET_ABS.new.o5m" "$PLANET_ABS"
+)
+
+# Filtering it
+
+FILTERED_DATA="$TMPDIR/subways.osm"
+QRELATIONS="route=subway =light_rail =monorail route_master=subway =light_rail =monorail public_transport=stop_area =stop_area_group"
+QNODES="station=subway =light_rail =monorail railway=subway_entrance subway=yes light_rail=yes monorail=yes"
+"$OSMCTOOLS/osmfilter" "$PLANET" --keep= --keep-relations="$QRELATIONS" --keep-nodes="$QNODES" --drop-author "-o=$FILTERED_DATA"
+
+# Running the validation
+
+VALIDATION="$TMPDIR/validation.json"
+"$PYTHON" "$SUBWAYS_PATH/mapsme_subways.py" -q -x "$FILTERED_DATA" -l "$VALIDATION" ${CITY+-c "$CITY"}
+rm "$FILTERED_DATA"
+
+# Preparing HTML files
+
+if [ -z "${HTML_DIR-}" ]; then
+  HTML_DIR="$SUBWAYS_PATH/html"
+  REMOVE_HTML=1
+fi
+
+mkdir -p $HTML_DIR
+rm -f $HTML_DIR/*
+"$PYTHON" "$SUBWAYS_PATH/validation_to_html.py" "$VALIDATION" "$HTML_DIR"
+rm "$VALIDATION"
+
+# Uploading files to the server
+
+if [ -n "${SERVER-}" ]; then
+  scp -q ${SERVER_KEY+-i "$SERVER_KEY"} "$HTML_DIR"/* "$SERVER"
+  [ -n "$REMOVE_HTML" ] && rm -r "$HTML_DIR"
+fi