pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #2932 from gardster/osrm_rebuilding

Browse source 
Osrm rebuilding
This commit is contained in:
Ilya Zverev 2016-04-27 21:16:14 +04:00
commit b36586e934
2 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/python/road_runner.py
View file

@ -79,6 +79,16 @@ for p1, p2 in tasks:
filtered.append((p1,p2))
tasks = filtered
if not len(tasks):
print("Towns not found. No job.")
exit(1)
try:
get_way_ids(tasks[0][0], tasks[0][1], sys.argv[2])
except:
print("Can't connect to remote server: {0}".format(sys.argv[2]))
exit(1)
qtasks = Queue()
capitals_list = set()
towns_list = set()

36
tools/unix/generate_planet_routing.sh
View file

@ -14,6 +14,9 @@ if [ $# -lt 1 ]; then
echo " $0 pbf"
echo " $0 prepare"
echo " $0 mwm"
echo " $0 online"
echo " $0 serve"
echo " $0 stop"
echo ''
exit 1
fi
@ -54,7 +57,7 @@ if [ "$1" == "pbf" ]; then
export PLANET
export INTDIR
find "$TMPBORDERS" -maxdepth 1 -name '*.poly' -print0 | xargs -0 -P $NUM_PROCESSES -I % \
sh -c '"$OSMCTOOLS/osmconvert" "$PLANET" --hash-memory=2000 -B="%" --complex-ways --out-pbf -o="$INTDIR/$(basename "%" .poly).pbf"'
sh -c '"$OSMCTOOLS/osmconvert" "$PLANET" --hash-memory=2000 -B="%" --complete-ways --out-pbf -o="$INTDIR/$(basename "%" .poly).pbf"'
rm -r "$TMPBORDERS"
elif [ "$1" == "prepare" ]; then
@ -127,6 +130,11 @@ elif [ "$1" == "mwm" ]; then
fi
fi
elif [ "$1" == "stop" ]; then
LOG="$LOG_PATH/planet.log"
echo "Stopping osrm server..." >> "$LOG"
pkill osrm-routed || true
elif [ "$1" == "online" ]; then
PLANET="${PLANET:-$HOME/planet/planet-latest.o5m}"
OSMCTOOLS="${OSMCTOOLS:-$HOME/osmctools}"
@ -164,6 +172,32 @@ elif [ "$1" == "online" ]; then
echo "Failed to create $OSRM_FILE" >> "$LOG"
fi
elif [ "$1" == "serve" ]; then
OSRM_PATH="${OSRM_PATH:-$OMIM_PATH/3party/osrm/osrm-backend}"
OSRM_BUILD_PATH="${OSRM_BUILD_PATH:-$OMIM_PATH/../osrm-backend-release}"
[ ! -x "$OSRM_BUILD_PATH/osrm-extract" ] && fail "Please compile OSRM binaries to $OSRM_BUILD_PATH"
OSRM_THREADS=${OSRM_THREADS:-15}
OSRM_MEMORY=${OSRM_MEMORY:-50}
export STXXLCFG="$HOME/.stxxl"
OSRM_FILE="$INTDIR/planet.osrm"
PORT="10012"
RESTRICTIONS_FILE="$OSRM_FILE.restrictions"
LOG="$LOG_PATH/planet.log"
if [ -s "$OSRM_FILE" ]; then
echo "Starting: $OSRM_FILE"
"$OSRM_BUILD_PATH/osrm-routed" "$OSRM_FILE" --borders "$OMIM_PATH/data/" --port "$PORT" >> "$LOG" 2>&1 &
echo "Waiting until OSRM server starts:"
until $(curl --output /dev/null --silent --head --fail http://localhost:$PORT/mapsme); do
printf '.' >> "$LOG"
sleep 5
done
else
echo "Can't find OSRM file: $OSRM_FILE"
fi
else
fail "Incorrect parameter: $1"
fi