remove FlagEncoder variable from abstract algo classes

Author: karussell

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

@@ -44,7 +44,6 @@ public abstract class AbstractNonCHBidirAlgo extends AbstractBidirAlgo implement
     protected final Graph graph;
     protected final NodeAccess nodeAccess;
     protected final Weighting weighting;
-    protected final FlagEncoder flagEncoder;
     protected EdgeExplorer edgeExplorer;
     protected EdgeFilter additionalEdgeFilter;
 
@@ -53,7 +52,6 @@ public AbstractNonCHBidirAlgo(Graph graph, Weighting weighting, TraversalMode tM
         this.weighting = weighting;
         if (weighting.hasTurnCosts() && !tMode.isEdgeBased())
             throw new IllegalStateException("Weightings supporting turn costs cannot be used with node-based traversal mode");
-        this.flagEncoder = weighting.getFlagEncoder();
         this.graph = graph;
         this.nodeAccess = graph.getNodeAccess();
         edgeExplorer = graph.createEdgeExplorer();

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

@@ -34,7 +34,6 @@
 public abstract class AbstractRoutingAlgorithm implements RoutingAlgorithm {
     protected final Graph graph;
     protected final Weighting weighting;
-    protected final FlagEncoder flagEncoder;
     protected final TraversalMode traversalMode;
     protected final NodeAccess nodeAccess;
     protected final EdgeExplorer edgeExplorer;
@@ -50,7 +49,6 @@ public AbstractRoutingAlgorithm(Graph graph, Weighting weighting, TraversalMode
         if (weighting.hasTurnCosts() && !traversalMode.isEdgeBased())
             throw new IllegalStateException("Weightings supporting turn costs cannot be used with node-based traversal mode");
         this.weighting = weighting;
-        this.flagEncoder = weighting.getFlagEncoder();
         this.traversalMode = traversalMode;
         this.graph = graph;
         this.nodeAccess = graph.getNodeAccess();

core/src/main/java/com/graphhopper/routing/lm/LandmarkStorage.java

@@ -368,7 +368,7 @@ private double estimateMaxWeight(EdgeExplorer requireBothDirExplorer, List<IntAr
                         int lmNodeId = tmpLandmarkNodeIds[lmIdx];
                         explorer = new LandmarkExplorer(graph, this, weighting, traversalMode, true);
                         explorer.setStartNode(lmNodeId);
-                        explorer.setFilter(blockedEdges, true, true);
+                        explorer.setFilter(blockedEdges, encoder.getAccessEnc(), true, true);
                         explorer.runAlgo();
                         maxWeight = Math.max(maxWeight, explorer.getLastEntry().weight);
                     }
@@ -439,7 +439,7 @@ private boolean createLandmarksForSubnetwork(final int startNode, final byte[] s
             int lmNodeId = tmpLandmarkNodeIds[lmIdx];
             LandmarkExplorer explorer = new LandmarkExplorer(graph, this, weighting, traversalMode, true);
             explorer.setStartNode(lmNodeId);
-            explorer.setFilter(blockedEdges, false, true);
+            explorer.setFilter(blockedEdges, encoder.getAccessEnc(), false, true);
             explorer.runAlgo();
             explorer.initLandmarkWeights(lmIdx, lmNodeId, LM_ROW_LENGTH, FROM_OFFSET);
 
@@ -451,7 +451,7 @@ private boolean createLandmarksForSubnetwork(final int startNode, final byte[] s
 
             explorer = new LandmarkExplorer(graph, this, weighting, traversalMode, false);
             explorer.setStartNode(lmNodeId);
-            explorer.setFilter(blockedEdges, true, false);
+            explorer.setFilter(blockedEdges, encoder.getAccessEnc(), true, false);
             explorer.runAlgo();
             explorer.initLandmarkWeights(lmIdx, lmNodeId, LM_ROW_LENGTH, TO_OFFSET);
 
@@ -740,15 +740,15 @@ private LandmarkExplorer findLandmarks(int[] landmarkNodeIdsToReturn, int startN
         Weighting initWeighting = lmSelectionWeighting;
         LandmarkExplorer explorer = new LandmarkExplorer(graph, this, initWeighting, traversalMode, true);
         explorer.setStartNode(startNode);
-        explorer.setFilter(blockedEdges, true, true);
+        explorer.setFilter(blockedEdges, encoder.getAccessEnc(), true, true);
         explorer.runAlgo();
 
         if (explorer.getFromCount() >= minimumNodes) {
             // 1b) we have one landmark, now determine the other landmarks
             landmarkNodeIdsToReturn[0] = explorer.getLastEntry().adjNode;
             for (int lmIdx = 0; lmIdx < landmarkNodeIdsToReturn.length - 1; lmIdx++) {
                 explorer = new LandmarkExplorer(graph, this, initWeighting, traversalMode, true);
-                explorer.setFilter(blockedEdges, true, true);
+                explorer.setFilter(blockedEdges, encoder.getAccessEnc(), true, true);
                 // set all current landmarks as start so that the next getLastNode is hopefully a "far away" node
                 for (int j = 0; j < lmIdx + 1; j++) {
                     explorer.setStartNode(landmarkNodeIdsToReturn[j]);
@@ -789,8 +789,8 @@ public LandmarkExplorer(Graph g, LandmarkStorage lms, Weighting weighting, Trave
             setUpdateBestPath(false);
         }
 
-        public void setFilter(IntHashSet set, boolean bwd, boolean fwd) {
-            edgeFilter = new BlockedEdgesFilter(flagEncoder.getAccessEnc(), bwd, fwd, set);
+        public void setFilter(IntHashSet set, BooleanEncodedValue accessEnc, boolean bwd, boolean fwd) {
+            edgeFilter = new BlockedEdgesFilter(accessEnc, bwd, fwd, set);
         }
 
         public void setStartNode(int startNode) {