added calcEdges method

Author: Peter

core/src/main/java/com/graphhopper/reader/OSMInputFile.java

@@ -188,8 +188,13 @@ private OSMElement getNextXML() throws XMLStreamException
                 switch (name.charAt(0))
                 {
                     case 'n':
-                        id = Long.parseLong(parser.getAttributeValue(null, "id"));
-                        return new OSMNode(id, parser);
+                        // note vs. node
+                        if ("node".equals(name))
+                        {
+                            id = Long.parseLong(parser.getAttributeValue(null, "id"));
+                            return new OSMNode(id, parser);
+                        }
+                        break;
 
                     case 'w':
                     {

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

@@ -25,7 +25,8 @@
 import gnu.trove.list.array.TDoubleArrayList;
 import gnu.trove.list.array.TIntArrayList;
 import gnu.trove.list.array.TLongArrayList;
-
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Stores the nodes for the found path of an algorithm. It additionally needs the edgeIds to make
@@ -37,7 +38,7 @@
  */
 public class Path
 {
-    private DistanceCalc distCalc = new DistanceCalcEarth();
+    private final DistanceCalc distCalc = new DistanceCalcEarth();
     protected Graph graph;
     private FlagEncoder encoder;
     protected double distance;
@@ -248,6 +249,23 @@ private void forEveryEdge( EdgeVisitor visitor )
         }
     }
 
+    public List<EdgeIteratorState> calcEdges()
+    {
+        final List<EdgeIteratorState> edges = new ArrayList<EdgeIteratorState>(edgeIds.size());
+        if (edgeIds.isEmpty())
+            return edges;
+
+        forEveryEdge(new EdgeVisitor()
+        {
+            @Override
+            public void next( EdgeIteratorState eb, int i )
+            {
+                edges.add(eb);
+            }
+        });
+        return edges;
+    }
+
     /**
      * @return the uncached node indices of the tower nodes in this path.
      */
@@ -448,7 +466,7 @@ public void next( EdgeIteratorState edge, int index )
                 boolean lastEdge = index == edgeIds.size() - 1;
                 if (lastEdge)
                     cachedWays.add(new FinishInstruction(prevLat, prevLon));
-            }                       
+            }
 
             private void add( EdgeIteratorState edge, PointList pl )
             {

core/src/main/java/com/graphhopper/routing/util/FastestWeighting.java

@@ -42,15 +42,15 @@ public double getMinWeight( double distance )
     }
 
     @Override
-    public double calcWeight( EdgeIteratorState edgeIter )
+    public double calcWeight( EdgeIteratorState edge )
     {        
-        return edgeIter.getDistance() / encoder.getSpeed(edgeIter.getFlags());
+        return edge.getDistance() / encoder.getSpeed(edge.getFlags());
     }
 
     @Override
-    public double revertWeight( EdgeIteratorState iter, double weight )
+    public double revertWeight( EdgeIteratorState edge, double weight )
     {
-        return weight * encoder.getSpeed(iter.getFlags());
+        return weight * encoder.getSpeed(edge.getFlags());
     }
 
     @Override

core/src/main/java/com/graphhopper/routing/util/ShortestWeighting.java

@@ -38,13 +38,13 @@ public double getMinWeight( double currDistToGoal )
     }
 
     @Override
-    public double calcWeight( EdgeIteratorState iter )
+    public double calcWeight( EdgeIteratorState edge )
     {
-        return iter.getDistance();
+        return edge.getDistance();
     }
 
     @Override
-    public double revertWeight( EdgeIteratorState iter, double weight )
+    public double revertWeight( EdgeIteratorState edge, double weight )
     {
         return weight;
     }