Merge branch 'no_setDistance_hack_in_CH'

Author: Peter

core/nbactions.xml

@@ -18,7 +18,7 @@
         </goals>
         <properties>
             <exec.classpathScope>runtime</exec.classpathScope>
-            <exec.args>-classpath %classpath com.graphhopper.GraphHopper config=../config.properties osmreader.osm=../extract.osm</exec.args>
+            <exec.args>-classpath %classpath com.graphhopper.GraphHopper config=../config.properties osmreader.osm=./files/moscow.osm.gz</exec.args>
             <exec.executable>java</exec.executable>
         </properties>
     </action>
@@ -30,7 +30,7 @@
         </goals>
         <properties>
             <exec.classpathScope>runtime</exec.classpathScope>
-            <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath com.graphhopper.GraphHopper config=../config.properties osmreader.osm=../extract.osm</exec.args>
+            <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath com.graphhopper.GraphHopper config=../config.properties osmreader.osm=./files/moscow.osm.gz</exec.args>
             <jpda.listen>true</jpda.listen>
             <exec.executable>java</exec.executable>
         </properties>

core/src/main/java/com/graphhopper/routing/Path.java

@@ -102,7 +102,7 @@ protected Path setFromNode( int from )
      */
     private int getFromNode()
     {
-        if (!EdgeIterator.Edge.isValid(fromNode))
+        if (fromNode < 0)
             throw new IllegalStateException("Call extract() before retrieving fromNode");
 
         return fromNode;
@@ -196,20 +196,12 @@ public String getDebugInfo()
     protected void processEdge( int edgeId, int endNode )
     {
         EdgeIteratorState iter = graph.getEdgeProps(edgeId, endNode);
-        double dist = calcDistance(iter);
+        double dist = iter.getDistance();
         distance += dist;
         millis += calcMillis(dist, iter.getFlags());
         addEdge(edgeId);
     }
 
-    /**
-     * This method returns the distance in meter for the specified edge.
-     */
-    protected double calcDistance( EdgeIteratorState iter )
-    {
-        return iter.getDistance();
-    }
-
     /**
      * Calculates the time in millis for the specified distance in meter and speed (in km/h) via
      * flags.
@@ -486,7 +478,7 @@ private void updatePointsAndInstruction( EdgeIteratorState edge, PointList pl )
                     double lon = pl.getLongitude(i);
                     points.add(lat, lon);
                 }
-                double dist = calcDistance(edge);
+                double dist = edge.getDistance();
                 prevInstruction.setDistance(dist + prevInstruction.getDistance());
                 prevInstruction.setMillis(calcMillis(dist, flags) + prevInstruction.getMillis());
             }