fix #288, Bug in LevelEdgeFilter

graphhopper · Jan 23, 2015 · be4dd6b · be4dd6b
1 parent a80ea42
commit be4dd6b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/core/src/main/java/com/graphhopper/routing/QueryGraph.java b/core/src/main/java/com/graphhopper/routing/QueryGraph.java
@@ -624,7 +624,7 @@ public AllEdgesIterator getAllEdges()
     public int getLevel( int nodeId )
     {
         if (isVirtualNode(nodeId))
-            return 0;
+            throw new IllegalStateException("LevelEdgeFilter should prevent fetching level for virtual nodes: " + nodeId + ", See #288");
 
         return ((LevelGraph) mainGraph).getLevel(nodeId);
     }

diff --git a/core/src/main/java/com/graphhopper/routing/util/LevelEdgeFilter.java b/core/src/main/java/com/graphhopper/routing/util/LevelEdgeFilter.java
@@ -28,21 +28,21 @@
 public class LevelEdgeFilter implements EdgeFilter
 {
     private final LevelGraph graph;
-    private final int nodes;
+    private final int maxNodes;
 
     public LevelEdgeFilter( LevelGraph g )
     {
         graph = g;
-        nodes = g.getNodes();
+        maxNodes = g.getNodes();
     }
 
     @Override
     public boolean accept( EdgeIteratorState edgeIterState )
     {
         int base = edgeIterState.getBaseNode();
         int adj = edgeIterState.getAdjNode();
-        // for now workaround for #288
+        // always accept virtual edges, see #288
-        if (base >= nodes || adj >= nodes)
+        if (base >= maxNodes || adj >= maxNodes)
             return true;
 
         return graph.getLevel(base) <= graph.getLevel(adj);

diff --git a/core/src/main/java/com/graphhopper/storage/LevelGraphStorage.java b/core/src/main/java/com/graphhopper/storage/LevelGraphStorage.java
@@ -80,7 +80,7 @@ public final int getLevel( int nodeIndex )
     {
         // automatically allocate new nodes only via creating edges or setting node properties
         if (nodeIndex >= getNodes())
-            return 0;
+            throw new IllegalStateException("node " + nodeIndex + " is invalid. Not in [0," + getNodes() + ")");
 
         return nodes.getInt((long) nodeIndex * nodeEntryBytes + I_LEVEL);
     }