diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh index 38416adbc9..4ac390ace2 100755 --- a/tools/unix/generate_planet.sh +++ b/tools/unix/generate_planet.sh @@ -312,12 +312,9 @@ if [ "$MODE" == "roads" ]; then bash "$ROUTING_SCRIPT" server >> "$PLANET_LOG" 2>&1 fi - if [ -z "${OSRM_URL-}" ]; then - log "OSRM_URL variable not set. World roads will not be calculated." - else - putmode "Step 2a: Generating road networks for the World map" - python "$ROADS_SCRIPT" "$INTDIR" "$OSRM_URL" >>"$LOG_PATH"/road_runner.log - fi + putmode "Step 2a: Generating road networks for the World map" + python "$ROADS_SCRIPT" "$INTDIR" "$OSRM_URL" >>"$LOG_PATH"/road_runner.log + MODE=inter fi diff --git a/tools/unix/generate_planet_routing.sh b/tools/unix/generate_planet_routing.sh index d11579ff7f..5f6db12c1a 100755 --- a/tools/unix/generate_planet_routing.sh +++ b/tools/unix/generate_planet_routing.sh @@ -131,6 +131,7 @@ 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}" @@ -167,6 +168,7 @@ elif [ "$1" == "online" ]; then else echo "Failed to create $OSRM_FILE" >> "$LOG" fi + elif [ "$1" == "server" ]; then OSRM_PATH="${OSRM_PATH:-$OMIM_PATH/3party/osrm/osrm-backend}" OSRM_BUILD_PATH="${OSRM_BUILD_PATH:-$OMIM_PATH/../osrm-backend-release}"