Unpacking of intermediate paths

2014-02-11 11:42:24 +01:00
parent 3be644265b
commit c71c8b0047
20 changed files with 639 additions and 443 deletions
@@ -111,9 +111,9 @@ inline unsigned GenerateServerProgramOptions(
            boost::program_options::value<boost::filesystem::path>(&paths["edgesdata"]),
            ".edges file")
        (
-            "geometries",
+            "geometry",
            boost::program_options::value<boost::filesystem::path>(&paths["geometries"]),
-            ".geometries file")
+            ".geometry file")
        (
            "ramindex",
            boost::program_options::value<boost::filesystem::path>(&paths["ramindex"]),
@@ -256,6 +256,17 @@ inline unsigned GenerateServerProgramOptions(
        }


+        path_iterator = paths.find("geometries");
+        if(
+            path_iterator != paths.end() &&
+            !boost::filesystem::is_regular_file(path_iterator->second)
+        ) {
+            path_iterator->second = base_string + ".geometry";
+        } else {
+            throw OSRMException(base_string + ".geometry not found");
+        }
+
+
        path_iterator = paths.find("ramindex");
        if(
            path_iterator != paths.end() &&