no need for explicit levelgraph

Author: Peter

config-example.properties

@@ -8,13 +8,10 @@ osmreader.dataaccess=inmemory+save
 #osmreader.dataaccess=mmap
 
 # sorts the graph according to location which improves query times by 10-20%
-osmreader.sortGraph=true
+osmreader.sortGraph=false
 
-
-# use levelgraph to speed things up (requires more RAM/disc space for holding the graph)
-#osmreader.levelgraph=true
-#  the following options require levelgraph=true
-#osmreader.chShortcuts=true
+# use contraction hierarchies to speed things up. requires more RAM/disc space for holding the graph
+#osmreader.chShortcuts=fastest|shortest
 
 #  other options than CAR are currently not supported
 osmreader.type=CAR

src/main/java/com/graphhopper/reader/OSMReader.java

@@ -95,7 +95,7 @@ public static void main(String[] strs) throws Exception {
      * reallocation (default is 5mio)
      */
     public static OSMReader osm2Graph(final CmdArgs args) throws IOException {
-         if (!args.get("config", "").isEmpty()) {
+        if (!args.get("config", "").isEmpty()) {
             CmdArgs tmp = CmdArgs.readFromConfig(args.get("config", ""));
             // overwrite command line configuration
             args.merge(tmp);
@@ -128,10 +128,13 @@ public static OSMReader osm2Graph(final CmdArgs args) throws IOException {
                 dir = new RAMDirectory(graphLocation, false);
         }
 
-        if (args.getBool("osmreader.levelgraph", false))
+        String chShortcuts = args.get("osmreader.chShortcuts", "no");
+        boolean levelGraph = "true".equals(chShortcuts)
+                || "fastest".equals(chShortcuts) || "shortest".equals(chShortcuts);
+        if (levelGraph)
+            // necessary for simple or CH shortcuts
             storage = new LevelGraphStorage(dir);
         else
-            // necessary for simple or CH shortcuts
             storage = new GraphStorage(dir);
         return osm2Graph(new OSMReader(storage, size), args);
     }
@@ -221,7 +224,7 @@ public void optimize() {
             GraphUtility.sortDFS(graphStorage, newGraph);
             graphStorage = newGraph;
         }
-        
+
         // TODO at the moment a prepared levelgraph cannot be sorted, as otherwise edgeIds won't be copied+recognized
         if (prepare == null)
             setDefaultAlgoPrepare(Helper.createAlgoPrepare("astar"));

src/main/java/com/graphhopper/routing/util/RoutingAlgorithmSpecialAreaTests.java

@@ -65,7 +65,8 @@ public void start() {
 
     void testAlgos() {
         if (unterfrankenGraph instanceof LevelGraph)
-            throw new IllegalStateException("run testAlgos only with a none-LevelGraph. Use osmreader.levelgraph=false");
+            throw new IllegalStateException("run testAlgos only with a none-LevelGraph. Use osmreader.chShortcuts=false "
+                    + "Or use osmreader.chShortcuts=shortest and avoid the preparation");
 
         TestAlgoCollector testCollector = new TestAlgoCollector();
         Collection<RoutingAlgorithm> algos = createAlgos(unterfrankenGraph, false);