increase priority on avoided highways if there is bike network

Author: caspg

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

@@ -567,7 +567,7 @@ private double calcDistance(ReaderWay way, WaySegmentParser.CoordinateSupplier c
      * This method is called for each relation during the first pass of {@link WaySegmentParser}
      */
     protected void preprocessRelations(ReaderRelation relation) {
-        if (!relation.isMetaRelation() && relation.hasTag("type", "route")) {
+        if (relation.hasTag("type", "route")) {
             // we keep track of all route relations, so they are available when we create edges later
             for (ReaderRelation.Member member : relation.getMembers()) {
                 if (member.getType() != ReaderElement.Type.WAY)

core/src/main/java/com/graphhopper/routing/util/parsers/BikeCommonPriorityParser.java

@@ -15,7 +15,6 @@
 import static com.graphhopper.routing.util.parsers.AbstractAccessParser.INTENDED;
 
 public abstract class BikeCommonPriorityParser implements TagParser {
-
     // Bicycle tracks subject to compulsory use in Germany and Poland (https://wiki.openstreetmap.org/wiki/DE:Key:cycleway)
     private static final List<String> CYCLEWAY_BICYCLE_KEYS = List.of("cycleway:bicycle", "cycleway:both:bicycle", "cycleway:left:bicycle", "cycleway:right:bicycle");
 
@@ -85,6 +84,7 @@ protected BikeCommonPriorityParser(DecimalEncodedValue priorityEnc, DecimalEncod
     public void handleWayTags(int edgeId, EdgeIntAccess edgeIntAccess, ReaderWay way, IntsRef relationFlags) {
         String highwayValue = way.getTag("highway");
         Integer priorityFromRelation = routeMap.get(bikeRouteEnc.getEnum(false, edgeId, edgeIntAccess));
+        RouteNetwork bikeNetork = this.bikeRouteEnc.getEnum(false, edgeId, edgeIntAccess);
         if (highwayValue == null) {
             if (FerrySpeedCalculator.isFerry(way)) {
                 priorityFromRelation = SLIGHT_AVOID.getValue();
@@ -94,7 +94,7 @@ public void handleWayTags(int edgeId, EdgeIntAccess edgeIntAccess, ReaderWay way
         }
 
         double maxSpeed = Math.max(avgSpeedEnc.getDecimal(false, edgeId, edgeIntAccess), avgSpeedEnc.getDecimal(true, edgeId, edgeIntAccess));
-        priorityEnc.setDecimal(false, edgeId, edgeIntAccess, PriorityCode.getValue(handlePriority(way, maxSpeed, priorityFromRelation)));
+        priorityEnc.setDecimal(false, edgeId, edgeIntAccess, PriorityCode.getValue(handlePriority(way, maxSpeed, priorityFromRelation, bikeNetork)));
     }
 
     /**
@@ -103,14 +103,14 @@ public void handleWayTags(int edgeId, EdgeIntAccess edgeIntAccess, ReaderWay way
      *
      * @return new priority based on priorityFromRelation and on the tags in ReaderWay.
      */
-    int handlePriority(ReaderWay way, double wayTypeSpeed, Integer priorityFromRelation) {
+    int handlePriority(ReaderWay way, double wayTypeSpeed, Integer priorityFromRelation, RouteNetwork bikeNetork) {
         TreeMap<Double, PriorityCode> weightToPrioMap = new TreeMap<>();
         if (priorityFromRelation == null)
             weightToPrioMap.put(0d, UNCHANGED);
         else
             weightToPrioMap.put(110d, PriorityCode.valueOf(priorityFromRelation));
 
-        collect(way, wayTypeSpeed, weightToPrioMap);
+        collect(way, wayTypeSpeed, weightToPrioMap, bikeNetork);
 
         // pick priority with biggest order value
         return weightToPrioMap.lastEntry().getValue().getValue();
@@ -147,8 +147,9 @@ private PriorityCode convertClassValueToPriority(String tagvalue) {
      * @param weightToPrioMap associate a weight with every priority. This sorted map allows
      *                        subclasses to 'insert' more important priorities as well as overwrite determined priorities.
      */
-    void collect(ReaderWay way, double wayTypeSpeed, TreeMap<Double, PriorityCode> weightToPrioMap) {
+    void collect(ReaderWay way, double wayTypeSpeed, TreeMap<Double, PriorityCode> weightToPrioMap, RouteNetwork bikeNetork) {
         String highway = way.getTag("highway");
+
         if (isDesignated(way)) {
             boolean isGoodSurface = way.getTag("tracktype", "").equals("grade1") || goodSurface.contains(way.getTag("surface",""));
             if ("path".equals(highway) || "track".equals(highway) && isGoodSurface)
@@ -174,7 +175,15 @@ void collect(ReaderWay way, double wayTypeSpeed, TreeMap<Double, PriorityCode> w
         } else if (avoidHighwayTags.containsKey(highway)
                 || (maxSpeed != MaxSpeed.MAXSPEED_MISSING && maxSpeed >= avoidSpeedLimit && !"track".equals(highway))) {
             PriorityCode priorityCode = avoidHighwayTags.get(highway);
-            weightToPrioMap.put(50d, priorityCode == null ? AVOID : priorityCode);
+            
+
+            if (bikeNetork != RouteNetwork.MISSING) {
+                // If there's a bike network on an avoided highway, give it a better priority than REACH_DESTINATION
+                weightToPrioMap.put(50d, AVOID);
+            } else {
+                weightToPrioMap.put(50d, priorityCode == null ? AVOID : priorityCode);
+            }
+            
             if (way.hasTag("tunnel", INTENDED)) {
                 PriorityCode worse = priorityCode == null ? BAD : priorityCode.worse().worse();
                 weightToPrioMap.put(50d, worse == EXCLUDE ? REACH_DESTINATION : worse);

core/src/main/java/com/graphhopper/routing/util/parsers/MountainBikePriorityParser.java

@@ -39,8 +39,8 @@ protected MountainBikePriorityParser(DecimalEncodedValue speedEnc, DecimalEncode
     }
 
     @Override
-    void collect(ReaderWay way, double wayTypeSpeed, TreeMap<Double, PriorityCode> weightToPrioMap) {
-        super.collect(way, wayTypeSpeed, weightToPrioMap);
+    void collect(ReaderWay way, double wayTypeSpeed, TreeMap<Double, PriorityCode> weightToPrioMap, RouteNetwork bikeNetork) {
+        super.collect(way, wayTypeSpeed, weightToPrioMap, bikeNetork);
 
         String highway = way.getTag("highway");
         if ("track".equals(highway)) {

core/src/main/java/com/graphhopper/routing/util/parsers/RacingBikePriorityParser.java

@@ -48,8 +48,8 @@ protected RacingBikePriorityParser(DecimalEncodedValue priorityEnc, DecimalEncod
     }
 
     @Override
-    void collect(ReaderWay way, double wayTypeSpeed, TreeMap<Double, PriorityCode> weightToPrioMap) {
-        super.collect(way, wayTypeSpeed, weightToPrioMap);
+    void collect(ReaderWay way, double wayTypeSpeed, TreeMap<Double, PriorityCode> weightToPrioMap, RouteNetwork bikeNetork) {
+        super.collect(way, wayTypeSpeed, weightToPrioMap, bikeNetork);
 
         String highway = way.getTag("highway");
         if ("service".equals(highway) || "residential".equals(highway)) {