organicmaps/subways
13
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity Actions

osmupdate tool returns 0 code on some kind of failures, so analyze its stderr to avoid proceeding with corrupted planet

Browse source
This commit is contained in:
Alexey Zakharenkov 2019-07-26 10:54:58 +03:00
parent 566675d15b
commit f78e68286e
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/process_subways.sh
View file

@ -34,14 +34,14 @@ if [ ! -f "$OSMCTOOLS/osmupdate" ]; then
OSMCTOOLS="$(dirname "$(which osmupdate)")"
else
echo "Please compile osmctools to $OSMCTOOLS"
exit 1
exit 3
fi
fi
PYTHON=${PYTHON:-python3}
# This will fail if there is no python
"$PYTHON" --version > /dev/null
SUBWAYS_PATH="$(dirname "$0")/.."
[ ! -f "$SUBWAYS_PATH/process_subways.py" ] && echo "Please clone the subways repo to $SUBWAYS_PATH" && exit 2
[ ! -f "$SUBWAYS_PATH/process_subways.py" ] && echo "Please clone the subways repo to $SUBWAYS_PATH" && exit 4
TMPDIR="${TMPDIR:-$SUBWAYS_PATH}"
# Downloading the latest version of the subways script
@ -56,11 +56,15 @@ if [ -n "${GIT_PULL-}" ]; then (
# Updating the planet file
PLANET_ABS="$(cd "$(dirname "$PLANET")"; pwd)/$(basename "$PLANET")"
(
cd "$OSMCTOOLS" # osmupdate requires osmconvert in a current directory
./osmupdate --drop-author --out-o5m "$PLANET_ABS" ${BBOX+"-b=$BBOX"} "$PLANET_ABS.new.o5m"
mv "$PLANET_ABS.new.o5m" "$PLANET_ABS"
)
pushd "$OSMCTOOLS" # osmupdate requires osmconvert in a current directory
OSMUPDATE_ERRORS=$(./osmupdate --drop-author --out-o5m "$PLANET_ABS" ${BBOX+"-b=$BBOX"} "$PLANET_ABS.new.o5m" 2>&1)
if [ -n "$OSMUPDATE_ERRORS" ]; then
echo "osmupdate failed: $OSMUPDATE_ERRORS"
exit 5
fi
popd
mv "$PLANET_ABS.new.o5m" "$PLANET_ABS"
# Filtering it