Absent towns.csv file processing. Review fixes.

generator/tag_admixer.hpp

@@ -4,6 +4,8 @@
 
 #include "coding/file_reader.hpp"
 
+#include  "base/logging.hpp"
+
 #include "std/map.hpp"
 #include "std/string.hpp"
 
@@ -37,8 +39,18 @@ public:
   TagAdmixer(string const & fileName) : m_ferryTag("route", "ferry")
   {
     string data;
-    FileReader reader(fileName);
-    reader.ReadAsString(data);
+
+    try
+    {
+      FileReader reader(fileName);
+      reader.ReadAsString(data);
+    }
+    catch (Reader::OpenException const &)
+    {
+      LOG(LWARNING, ("World level ways file not found! Generating world without roads."));
+      return;
+    }
+
     WaysParserHelper parser(m_ways);
     parser.ParseString(data);
   }

tools/python/road_runner.py

@@ -35,6 +35,9 @@ def each_to_each(points):
 
 def load_towns(path):
     result = []
+    if not os.path.isfile(path):
+        print "WARNING! File with towns not found!"
+        return result
     with open(path, "r") as f:
         for line in f:
             data = line.split(";")
@@ -59,6 +62,10 @@ if len(sys.argv) < 3:
     print "road_runner.py <intermediate_dir> <osrm_addr>"
     exit(1)
 
+if not os.path.isdir(sys.argv[1]):
+    print sys.argv[1], "is not a directory!"
+    exit(1)
+
 towns = load_towns(os.path.join(sys.argv[1], "towns.csv"))
 print "Have {0} towns".format(len(towns))
 

tools/unix/generate_planet.sh

@@ -258,7 +258,7 @@ if [ "$MODE" == "coast" ]; then
       # Preprocess coastlines to separate intermediate directory
       "$GENERATOR_TOOL" --intermediate_data_path="$INTCOASTSDIR/" --node_storage=map --osm_file_type=o5m --osm_file_name="$COASTS_O5M" \
         -preprocess 2>> "$LOG_PATH/WorldCoasts.log"
-      python "$ROADS_SCRIPT" "$INTCOASTSDIR/" "$OSRM_URL" >>"$LOG_PATH"/road_runner.log
+      python "$ROADS_SCRIPT" "$INTCOASTSDIR" "$OSRM_URL" >>"$LOG_PATH"/road_runner.log
       # Generate temporary coastlines file in the coasts intermediate dir
       if ! "$GENERATOR_TOOL" --intermediate_data_path="$INTCOASTSDIR/" --node_storage=map --osm_file_type=o5m --osm_file_name="$COASTS_O5M" \
         --user_resource_path="$DATA_PATH/" -make_coasts -fail_on_coasts 2>&1 | tee -a "$LOG_PATH/WorldCoasts.log" | { grep -i 'not merged\|coastline polygons' || true; }