Remove edgeHasNoAccess from Weighting interface (graphhopper#2872)

Author: easbar

core/src/main/java/com/graphhopper/routing/weighting/AbstractAdjustedWeighting.java

@@ -38,11 +38,6 @@ public double getMinWeight(double distance) {
         return superWeighting.getMinWeight(distance);
     }
 
-    @Override
-    public boolean edgeHasNoAccess(EdgeIteratorState edgeState, boolean reverse) {
-        return superWeighting.edgeHasNoAccess(edgeState, reverse);
-    }
-
     @Override
     public double calcEdgeWeight(EdgeIteratorState edgeState, boolean reverse) {
         return superWeighting.calcEdgeWeight(edgeState, reverse);

core/src/main/java/com/graphhopper/routing/weighting/AbstractWeighting.java

@@ -40,8 +40,7 @@ protected AbstractWeighting(BooleanEncodedValue accessEnc, DecimalEncodedValue s
         this.turnCostProvider = turnCostProvider;
     }
 
-    @Override
-    public boolean edgeHasNoAccess(EdgeIteratorState edgeState, boolean reverse) {
+    protected boolean edgeHasNoAccess(EdgeIteratorState edgeState, boolean reverse) {
         if (edgeState.getBaseNode() == edgeState.getAdjNode())
             throw new IllegalStateException("Unexpected loop-edge at node: " + edgeState.getBaseNode());
         return reverse ? !edgeState.getReverse(accessEnc) : !edgeState.get(accessEnc);

core/src/main/java/com/graphhopper/routing/weighting/QueryGraphWeighting.java

@@ -46,11 +46,6 @@ public double getMinWeight(double distance) {
         return weighting.getMinWeight(distance);
     }
 
-    @Override
-    public boolean edgeHasNoAccess(EdgeIteratorState edgeState, boolean reverse) {
-        return weighting.edgeHasNoAccess(edgeState, reverse);
-    }
-
     @Override
     public double calcEdgeWeight(EdgeIteratorState edgeState, boolean reverse) {
         return weighting.calcEdgeWeight(edgeState, reverse);

core/src/main/java/com/graphhopper/routing/weighting/SpeedWeighting.java

@@ -46,11 +46,6 @@ public double getMinWeight(double distance) {
         return distance / speedEnc.getMaxStorableDecimal();
     }
 
-    @Override
-    public boolean edgeHasNoAccess(EdgeIteratorState edgeState, boolean reverse) {
-        return false;
-    }
-
     @Override
     public double calcEdgeWeight(EdgeIteratorState edgeState, boolean reverse) {
         double speed = reverse ? edgeState.getReverse(speedEnc) : edgeState.get(speedEnc);

core/src/main/java/com/graphhopper/routing/weighting/Weighting.java

@@ -36,12 +36,6 @@ public interface Weighting {
      */
     double getMinWeight(double distance);
 
-    /**
-     * @return true if the edge is not accessible in the given direction. Note that when false is returned it does
-     * **not** mean the weight is finite! But when true is returned the weight must be infinite as well.
-     */
-    boolean edgeHasNoAccess(EdgeIteratorState edgeState, boolean reverse);
-
     /**
      * This method calculates the weight of a given {@link EdgeIteratorState}. E.g. a high value indicates that the edge
      * should be avoided during shortest path search. Make sure that this method is very fast and optimized as this is

core/src/test/java/com/graphhopper/routing/RoutingAlgorithmTest.java

@@ -931,13 +931,9 @@ public double getMinWeight(double distance) {
                 return 0.8 * distance;
             }
 
-            public boolean edgeHasNoAccess(EdgeIteratorState edgeState, boolean reverse) {
-                return tmpW.edgeHasNoAccess(edgeState, reverse);
-            }
-
             @Override
             public double calcEdgeWeight(EdgeIteratorState edgeState, boolean reverse) {
-                if (edgeHasNoAccess(edgeState, reverse))
+                if (Double.isInfinite(tmpW.calcEdgeWeight(edgeState, reverse)))
                     return Double.POSITIVE_INFINITY;
                 int adj = edgeState.getAdjNode();
                 int base = edgeState.getBaseNode();

reader-gtfs/src/main/java/com/graphhopper/gtfs/GraphExplorer.java

@@ -160,7 +160,7 @@ private Iterable<MultiModalEdge> streetEdgeStream(int streetNode) {
             @Override
             public boolean tryAdvance(Consumer<? super MultiModalEdge> action) {
                 while (e.next()) {
-                    if (!accessEgressWeighting.edgeHasNoAccess(e, reverse)) {
+                    if (Double.isFinite(accessEgressWeighting.calcEdgeWeight(e, reverse))) {
                         action.accept(new MultiModalEdge(e.getEdge(), e.getBaseNode(), e.getAdjNode(), (long) (accessEgressWeighting.calcEdgeMillis(e.detach(false), reverse) * (5.0 / walkSpeedKmH)), e.getDistance()));
                         return true;
                     }