some final fixes after merging master to turn_costs

Author: b3nn0

core/src/main/java/com/graphhopper/storage/GraphHopperStorage.java

@@ -1365,14 +1365,6 @@ public boolean loadExisting()
         checkInit();
         if (nodes.loadExisting())
         {
-            if (!properties.loadExisting())
-                throw new IllegalStateException("Cannot load properties. Corrupt file or directory? " + dir);
-
-            if (!extStorage.loadExisting())
-            {
-                throw new IllegalStateException("cannot load extended storage. corrupt file or directory? " + dir);
-            }
-
             String acceptStr = "";
             if (properties.loadExisting())
             {

core/src/test/java/com/graphhopper/GraphHopperTest.java

@@ -73,7 +73,8 @@ public void testLoadOSM()
         assertEquals(3, ph.getPoints().getSize());
 
         closableInstance.close();
-        closableInstance = new GraphHopper().setStoreOnFlush(true);
+        closableInstance = new GraphHopper().setStoreOnFlush(true).
+                setEncodingManager(new EncodingManager("CAR"));
         assertTrue(closableInstance.load(ghLoc));
         ph = closableInstance.route(new GHRequest(51.2492152, 9.4317166, 51.2, 9.4));
         assertTrue(ph.isFound());
@@ -114,7 +115,8 @@ public void testLoadOSMNoCH()
 
         gh.close();
         gh = new GraphHopper().setStoreOnFlush(true).
-                setCHEnable(false);
+                setCHEnable(false).
+                setEncodingManager(new EncodingManager("CAR"));
         assertTrue(gh.load(ghLoc));
         ph = gh.route(new GHRequest(51.2492152, 9.4317166, 51.2, 9.4));
         assertTrue(ph.isFound());
@@ -470,6 +472,7 @@ public void testPrepareOnly()
 
         // use the encoding manager from the graph
         instance = new GraphHopper().setStoreOnFlush(true).
+                setEncodingManager(new EncodingManager("FOOT")).
                 setCHWeighting("shortest").
                 setGraphHopperLocation(ghLoc).
                 setOSMFile(testOsm3);

web/nbactions.xml

@@ -28,7 +28,7 @@
             <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
         </goals>
         <properties>
-            <exec.args>-classpath %classpath com.graphhopper.http.GHServer graph.elevation.cachedir=../srtmprovider jetty.port=8989 config=../config.properties osmreader.osm=../core/files/monaco.osm.gz</exec.args>
+            <exec.args>-classpath %classpath com.graphhopper.http.GHServer graph.elevation.cachedir=../srtmprovider jetty.port=8989 config=../config.properties osmreader.osm=../core/files/andorra.osm.gz</exec.args>
             <exec.executable>java</exec.executable>
         </properties>
     </action>
@@ -42,7 +42,7 @@
             <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
         </goals>
         <properties>
-            <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath com.graphhopper.http.GHServer graph.elevation.cachedir=../srtmprovider jetty.port=8989 config=../config.properties osmreader.osm=../core/files/monaco.osm.gz</exec.args>
+            <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath com.graphhopper.http.GHServer graph.elevation.cachedir=../srtmprovider jetty.port=8989 config=../config.properties osmreader.osm=../core/files/andorra.osm.gz</exec.args>
             <exec.executable>java</exec.executable>
             <jpda.listen>true</jpda.listen>
         </properties>
@@ -57,7 +57,7 @@
             <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
         </goals>
         <properties>
-            <exec.args>-classpath %classpath com.graphhopper.http.GHServer graph.elevation.cachedir=../srtmprovider jetty.port=8989 config=../config.properties osmreader.osm=../core/files/monaco.osm.gz</exec.args>
+            <exec.args>-classpath %classpath com.graphhopper.http.GHServer graph.elevation.cachedir=../srtmprovider jetty.port=8989 config=../config.properties osmreader.osm=../core/files/andorra.osm.gz</exec.args>
             <exec.executable>java</exec.executable>
         </properties>
     </action>