From 661e8cf8cccfe4d1ca688dec226a5fd122381b8e Mon Sep 17 00:00:00 2001
From: Lev Dragunov <l.dragunov@corp.mail.ru>
Date: Wed, 20 Apr 2016 15:20:51 +0300
Subject: [PATCH] Generation migration fix.

---
 tools/unix/generate_planet.sh         | 27 ++++++++++-----------------
 tools/unix/generate_planet_routing.sh |  9 +++++----
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh
index 44db85f999..38416adbc9 100755
--- a/tools/unix/generate_planet.sh
+++ b/tools/unix/generate_planet.sh
@@ -148,7 +148,6 @@ NODE_STORAGE=${NODE_STORAGE:-${NS:-mem}}
 ASYNC_PBF=${ASYNC_PBF-}
 KEEP_INTDIR=${KEEP_INTDIR-1}
 OSRM_URL=${OSRM_URL-}
-MIGRATE=${MIGRATE-1}
 # nproc is linux-only
 if [ "$(uname -s)" == "Darwin" ]; then
   CPUS="$(sysctl -n hw.ncpu)"
@@ -284,23 +283,7 @@ if [ "$MODE" == "coast" ]; then
           fail
         fi
       fi
-
-    if [ -z "$TRY_AGAIN" ]; then
-      if [ -z "$OSRM_URL" ]; then
-        log "OSRM_URL variable not set. Generate local world OSRM server."
-        putmode "Step RO: Generating whole world OSRM files for osrm-routed server."
-        bash "$ROUTING_SCRIPT" online >> "$PLANET_LOG" 2>&1
-        OSRM_URL="127.0.0.1:10012/"
-        bash "$ROUTING_SCRIPT" server >> "$PLANET_LOG" 2>&1
-      fi
-
-      if [ -z "$OSRM_URL" ]; then
-        log "OSRM_URL still abcent. Generating without world level roads."
-      else
-        python "$ROADS_SCRIPT" "$INTCOASTSDIR" "$OSRM_URL" >>"$LOG_PATH"/road_runner.log
-      fi
     fi
-fi
   done
   # Make a working copy of generated coastlines file
   if [ -n "$OPT_COAST" ]; then
@@ -319,6 +302,16 @@ fi
 
 # This mode is started only after updating or processing a planet file
 if [ "$MODE" == "roads" ]; then
+  if [ -z "$OSRM_URL" ]; then
+    log "OSRM_URL variable not set. Generate local world OSRM server."
+    putmode "Step RO: Generating whole world OSRM files for osrm-routed server."
+
+    bash "$ROUTING_SCRIPT" stop >> "$PLANET_LOG" 2>&1
+    bash "$ROUTING_SCRIPT" online >> "$PLANET_LOG" 2>&1
+    OSRM_URL="127.0.0.1:10012"
+    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
diff --git a/tools/unix/generate_planet_routing.sh b/tools/unix/generate_planet_routing.sh
index 4a28a07287..d11579ff7f 100755
--- a/tools/unix/generate_planet_routing.sh
+++ b/tools/unix/generate_planet_routing.sh
@@ -54,7 +54,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 +127,10 @@ 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}"
@@ -178,10 +182,7 @@ elif [ "$1" == "server" ]; then
   LOG="$LOG_PATH/planet.log"
   if [ -s "$OSRM_FILE" ]; then
     echo "Starting: $OSRM_FILE" >> "$LOG"
-    pkill osrm-routed
-    echo "killed: $OSRM_FILE" >> "$LOG"
     "$OSRM_BUILD_PATH/osrm-routed" "$OSRM_FILE" --borders "$OMIM_PATH/data/" --port "$PORT" >> "$LOG" 2>&1 &
-    echo "started: $OSRM_FILE" >> "$LOG"
 
     echo "Waiting until OSRM server starts:" >> "$LOG"
     until $(curl --output /dev/null --silent --head --fail http://localhost:$PORT/mapsme); do