dynamic assignment of flag bits to encoders

minimized encoders to use only required number of bits
added safe_way flags
refactored acceptWay methods to encodingManager
removed all local encoder instantiations

Author: NopMap

core/src/main/java/com/graphhopper/GHRequest.java

@@ -37,7 +37,7 @@ public class GHRequest {
     private GHPlace from;
     private GHPlace to;
     private Map<String, Object> hints = new HashMap<String, Object>(5);
-    private EdgePropertyEncoder encoder = new CarFlagEncoder();
+    private String encoderName = "CAR";
     private WeightCalculation weightCalc = new ShortestCalc();
 
     /**
@@ -114,12 +114,12 @@ public WeightCalculation type() {
         return weightCalc;
     }
 
-    public GHRequest vehicle(EdgePropertyEncoder encoder) {
-        this.encoder = encoder;
+    public GHRequest vehicle(String encoder) {
+        this.encoderName = encoder;
         return this;
     }
 
-    public EdgePropertyEncoder vehicle() {
-        return encoder;
+    public String vehicle() {
+        return encoderName;
     }
 }

core/src/main/java/com/graphhopper/GraphHopper.java

@@ -22,17 +22,8 @@
 import com.graphhopper.routing.Path;
 import com.graphhopper.routing.RoutingAlgorithm;
 import com.graphhopper.routing.ch.PrepareContractionHierarchies;
-import com.graphhopper.routing.util.AcceptWay;
-import com.graphhopper.routing.util.AlgorithmPreparation;
-import com.graphhopper.routing.util.CarFlagEncoder;
-import com.graphhopper.routing.util.DefaultEdgeFilter;
-import com.graphhopper.routing.util.EdgeFilter;
-import com.graphhopper.routing.util.FastestCalc;
-import com.graphhopper.routing.util.EdgePropertyEncoder;
-import com.graphhopper.routing.util.NoOpAlgorithmPreparation;
-import com.graphhopper.routing.util.PrepareRoutingSubnetworks;
-import com.graphhopper.routing.util.RoutingAlgorithmSpecialAreaTests;
-import com.graphhopper.routing.util.ShortestCalc;
+import com.graphhopper.routing.util.*;
+import com.graphhopper.routing.util.EncodingManager;
 import com.graphhopper.storage.Directory;
 import com.graphhopper.storage.Graph;
 import com.graphhopper.storage.GraphStorage;
@@ -100,7 +91,7 @@ public static void main(String[] strs) throws Exception {
     private int neighborUpdates = 20;
     // for OSM import:
     private String osmFile;
-    private AcceptWay acceptWay = new AcceptWay("CAR");
+    private EncodingManager encodingManager = null;
     private long expectedNodes = 10;
     private double wayPointMaxDistance = 1;
     private int workerThreads = -1;
@@ -118,13 +109,13 @@ public GraphHopper() {
         initIndex();
     }
 
-    public GraphHopper acceptWay(AcceptWay acceptWay) {
-        this.acceptWay = acceptWay;
+    public GraphHopper encodingManager( EncodingManager acceptWay ) {
+        this.encodingManager = acceptWay;
         return this;
     }
 
-    public AcceptWay acceptWay() {
-        return acceptWay;
+    public EncodingManager encodingManager() {
+        return encodingManager;
     }
 
     public GraphHopper forServer() {
@@ -299,7 +290,7 @@ public GraphHopper init(CmdArgs args) throws IOException {
         // osm import
         wayPointMaxDistance = args.getDouble("osmreader.wayPointMaxDistance", 1);
         String type = args.get("osmreader.acceptWay", "CAR");
-        acceptWay = new AcceptWay(type);
+        encodingManager = new EncodingManager(type);
         workerThreads = args.getInt("osmreader.workerThreads", -1);
 
         // index
@@ -351,15 +342,15 @@ protected OSMReader importOSM(String file) throws IOException {
 
         logger.info("start creating graph from " + file);
         OSMReader reader = new OSMReader(graph, expectedNodes).workerThreads(workerThreads);
-        reader.acceptWay(acceptWay);
+        reader.encodingManager( encodingManager );
         reader.wayPointMaxDistance(wayPointMaxDistance);
 
-        properties.put("osmreader.acceptWay", acceptWay.toString());
+        properties.put( "osmreader.acceptWay", encodingManager.encoderList() );
         properties.putCurrentVersions();
         String info = graph.getClass().getSimpleName()
                 + "|" + graph.directory().getClass().getSimpleName()
                 + "|" + properties.versionsToString();
-        logger.info("using " + info + ", accepts:" + acceptWay + ", memory:" + Helper.memInfo());
+        logger.info("using " + info + ", accepts:" + encodingManager + ", memory:" + Helper.memInfo());
         reader.osm2Graph(osmTmpFile);
         return reader;
     }
@@ -378,6 +369,8 @@ protected OSMReader importOSM(String file) throws IOException {
     public boolean load(String graphHopperFolder) {
         if (Helper.isEmpty(graphHopperFolder))
             throw new IllegalStateException("graphHopperLocation is not specified. call init before");
+        if ( encodingManager == null )
+            throw new IllegalStateException("No vehicles are defined (no encoding manager set)");
         if (graph != null)
             throw new IllegalStateException("graph is already loaded");
 
@@ -407,10 +400,10 @@ else if (graphHopperFolder.endsWith(".osm") || graphHopperFolder.endsWith(".xml"
 
         properties = new StorableProperties(dir, "properties");
         if (chUsage) {
-            graph = new LevelGraphStorage(dir);
+            graph = new LevelGraphStorage(dir, encodingManager );
             PrepareContractionHierarchies tmpPrepareCH = new PrepareContractionHierarchies();
 
-            EdgePropertyEncoder encoder = acceptWay.getSingle();
+            EdgePropertyEncoder encoder = encodingManager.getSingle();
             if (chFast)
                 tmpPrepareCH.type(new FastestCalc(encoder));
             else
@@ -423,19 +416,19 @@ else if (graphHopperFolder.endsWith(".osm") || graphHopperFolder.endsWith(".xml"
             prepare = tmpPrepareCH;
             prepare.graph(graph);
         } else {
-            graph = new GraphStorage(dir);
-            prepare = NoOpAlgorithmPreparation.createAlgoPrepare(graph, defaultAlgorithm, new CarFlagEncoder());
+            graph = new GraphStorage(dir, encodingManager);
+            prepare = NoOpAlgorithmPreparation.createAlgoPrepare( graph, defaultAlgorithm, encodingManager.getFirst() );
         }
 
         if (!graph.loadExisting())
             return false;
 
         properties.loadExisting();
 
-        // overwrite configured accept way
+        // check encoding for compatiblity
         String acceptStr = properties.get("osmreader.acceptWay");
-        if (!acceptStr.isEmpty())
-            acceptWay = new AcceptWay(acceptStr);
+        if (!acceptStr.isEmpty() && !encodingManager.encoderList().equals( acceptStr ))
+            throw new IllegalStateException( "Encoding does not match:\nGraphhopper: " + encodingManager.encoderList() + "\nGraph: " + acceptStr );
         properties.checkVersions(false);
         if ("false".equals(properties.get("prepare.done")))
             prepare();
@@ -444,8 +437,8 @@ else if (graphHopperFolder.endsWith(".osm") || graphHopperFolder.endsWith(".xml"
         return true;
     }
 
-    private boolean supportsVehicle(EdgePropertyEncoder encoder) {
-        return acceptWay.accepts(encoder);
+    private boolean supportsVehicle( String encoder) {
+        return encodingManager.accepts(encoder);
     }
 
     @Override
@@ -455,11 +448,11 @@ public GHResponse route(GHRequest request) {
         GHResponse rsp = new GHResponse();
 
         if (!supportsVehicle(request.vehicle())) {
-            rsp.addError(new IllegalArgumentException("Vehicle " + request.vehicle() + " unsupported. Supported are: " + acceptWay()));
+            rsp.addError(new IllegalArgumentException("Vehicle " + request.vehicle() + " unsupported. Supported are: " + encodingManager()));
             return rsp;
         }
 
-        EdgeFilter edgeFilter = new DefaultEdgeFilter(request.vehicle());
+        EdgeFilter edgeFilter = new DefaultEdgeFilter( encodingManager.getEncoder( request.vehicle()));
         int from = index.findClosest(request.from().lat, request.from().lon, edgeFilter).closestNode();
         int to = index.findClosest(request.to().lat, request.to().lon, edgeFilter).closestNode();
         String debug = "idLookup:" + sw.stop().getSeconds() + "s";
@@ -482,7 +475,7 @@ else if (request.algorithm().equals("astarbi"))
                 // or use defaultAlgorithm here?
                 rsp.addError(new IllegalStateException("Only dijkstrabi and astarbi is supported for LevelGraph (using contraction hierarchies)!"));
         } else {
-            prepare = NoOpAlgorithmPreparation.createAlgoPrepare(graph, request.algorithm(), request.vehicle());
+            prepare = NoOpAlgorithmPreparation.createAlgoPrepare( graph, request.algorithm(), encodingManager.getEncoder( request.vehicle() ) );
             algo = prepare.createAlgo();
             algo.type(request.type());
         }
@@ -545,9 +538,9 @@ public void prepare() {
         boolean tmpPrepare = doPrepare && prepare != null;
         properties.put("prepare.done", tmpPrepare);
         if (tmpPrepare) {
-            if (prepare instanceof PrepareContractionHierarchies && acceptWay.countVehicles() > 1)
+            if (prepare instanceof PrepareContractionHierarchies && encodingManager.countVehicles() > 1)
                 throw new IllegalArgumentException("Contraction hierarchies preparation "
-                        + "requires (at the moment) only one vehicle. But was:" + acceptWay);
+                        + "requires (at the moment) only one vehicle. But was:" + encodingManager );
             logger.info("calling prepare.doWork ... (" + Helper.memInfo() + ")");
             prepare.doWork();
         }

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

@@ -242,7 +242,6 @@ public boolean isType(int type) {
     /**
      * Only for testing
      *
-     * @deprecated
      * @param tags
      */
     public void setTags(Map<String, String> tags) {

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

@@ -19,7 +19,7 @@
 package com.graphhopper.reader;
 
 import com.graphhopper.coll.LongIntMap;
-import com.graphhopper.routing.util.AcceptWay;
+import com.graphhopper.routing.util.EncodingManager;
 import com.graphhopper.storage.GraphStorage;
 import com.graphhopper.util.Helper;
 import static com.graphhopper.util.Helper.*;
@@ -43,13 +43,12 @@ public class OSMReader {
     private long skippedLocations;
     private GraphStorage graphStorage;
     private OSMReaderHelper helper;
-    private AcceptWay acceptWay;
+    private EncodingManager encodingManager = null;
     private int workerThreads = -1;
 
     public OSMReader(GraphStorage storage, long expectedNodes) {
         this.graphStorage = storage;
         helper = new OSMReaderHelper(graphStorage, expectedNodes);
-        acceptWay = new AcceptWay(AcceptWay.CAR);
     }
 
     public OSMReader workerThreads(int numOfWorkers) {
@@ -58,6 +57,9 @@ public OSMReader workerThreads(int numOfWorkers) {
     }
 
     public void osm2Graph(File osmFile) throws IOException {
+        if( encodingManager == null )
+            throw new IllegalStateException( "Encoding manager not set." );
+
         long start = System.currentTimeMillis();
         preProcess(osmFile);
 
@@ -118,7 +120,7 @@ boolean filterWay(OSMWay item) throws XMLStreamException {
         if (!item.hasTags())
             return false;
 
-        return acceptWay.accept(item) > 0;
+        return encodingManager.accept(item) > 0;
     }
 
     /**
@@ -180,9 +182,9 @@ public void processWay(OSMWay way) throws XMLStreamException {
         if (!way.hasTags())
             return;
 
-        int includeWay = acceptWay.accept(way);
+        int includeWay = encodingManager.accept(way);
         if (includeWay > 0) {
-            int flags = acceptWay.encodeTags(includeWay, way);
+            int flags = encodingManager.encodeTags(includeWay, way);
             if (flags != 0)
                 helper.addEdge(way.nodes(), flags);
         }
@@ -212,8 +214,8 @@ public GraphStorage graph() {
     /**
      * Specify the type of the path calculation (car, bike, ...).
      */
-    public OSMReader acceptWay(AcceptWay acceptWay) {
-        this.acceptWay = acceptWay;
+    public OSMReader encodingManager( EncodingManager acceptWay ) {
+        this.encodingManager = acceptWay;
         return this;
     }
 

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

@@ -58,6 +58,7 @@ public RoutingAlgorithm createAlgo(Graph g, EdgePropertyEncoder encoder) {
             return new AStar(g, encoder);
     }
 
+/*
     public static RoutingAlgorithm createAlgoForCar(String algoStr, Graph g, boolean shortest) {
         EdgePropertyEncoder carEncoder = new CarFlagEncoder();
         WeightCalculation weight;
@@ -71,4 +72,5 @@ public static RoutingAlgorithm createAlgoForCar(String algoStr, Graph g, boolean
             throw new RuntimeException(ex);
         }
     }
+*/
 }

core/src/main/java/com/graphhopper/routing/ch/PrepareContractionHierarchies.java

@@ -95,7 +95,8 @@ public class PrepareContractionHierarchies extends AbstractAlgoPreparation<Prepa
     private int neighborUpdatePercentage = 10;
 
     public PrepareContractionHierarchies() {
-        type(new ShortestCalc()).vehicle(new CarFlagEncoder());
+        type(new ShortestCalc());
+        //vehicle(new CarFlagEncoder());
         originalEdges = new RAMDirectory().findCreate("originalEdges");
         originalEdges.create(1000);
     }
@@ -178,6 +179,10 @@ public PrepareContractionHierarchies removeHigher2LowerEdges(boolean removeHighe
 
     @Override
     public PrepareContractionHierarchies doWork() {
+        if( prepareEncoder == null )
+            throw new IllegalStateException( "No vehicle encoder set." );
+        if( prepareWeightCalc == null )
+            throw new IllegalStateException( "No weight calculation set." );
         allSW.start();
         super.doWork();
         initFromGraph();

core/src/main/java/com/graphhopper/routing/rideshare/DijkstraTwoDrivers.java

@@ -22,6 +22,7 @@
 import com.graphhopper.routing.Path;
 import com.graphhopper.routing.util.CarFlagEncoder;
 import com.graphhopper.routing.util.EdgePropertyEncoder;
+import com.graphhopper.routing.util.EncodingManager;
 import com.graphhopper.storage.Graph;
 import com.graphhopper.storage.EdgeEntry;
 
@@ -41,7 +42,7 @@ public class DijkstraTwoDrivers {
 
     public DijkstraTwoDrivers(Graph graph) {
         this.graph = graph;
-        this.carEncoder = new CarFlagEncoder();
+        this.carEncoder = EncodingManager.instance().getEncoder( "CAR" );
     }
 
     public void setDriverA(int fromA, int toA) {