refactor: replace reflection by polymorphism

Author: Sascha Fendrich

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/flagencoders/bike/CommonBikeFlagEncoder.java

@@ -100,12 +100,7 @@ public abstract class CommonBikeFlagEncoder extends BikeCommonFlagEncoder {
     private static final boolean DEBUG_OUTPUT = false;
     FileWriter logWriter;
 
-    // MARQ24 MOD START
-    // MARQ24 ADDON in the case of the RoadBike Encoder we want to skip some
-    // conditions...
-    private final boolean isRoadBikeEncoder = this instanceof RoadBikeFlagEncoder; // TODO: design: parent class should not need to know of child
     protected static final Logger LOGGER = Logger.getLogger(CommonBikeFlagEncoder.class.getName());
-    // MARQ24 MOD END
 
     // MARQ24 MOD START
     protected CommonBikeFlagEncoder(int speedBits, double speedFactor, int maxTurnCosts) {
@@ -415,7 +410,7 @@ public IntsRef handleWayTags(IntsRef edgeFlags, ReaderWay way, EncodingManager.A
         if (!access.isFerry()) {
             wayTypeSpeed = applyMaxSpeed(way, wayTypeSpeed);
             handleSpeed(edgeFlags, way, wayTypeSpeed);
-            handleBikeRelated(edgeFlags, way, priorityFromRelation > UNCHANGED.getValue());
+            handleBikeRelated(edgeFlags, way, isPartOfCycleRelation(priorityFromRelation));
             if (access.isConditional() && conditionalAccessEncoder != null)
                 conditionalAccessEncoder.setBool(false, edgeFlags, true);
             boolean isRoundabout = way.hasTag(KEY_JUNCTION, "roundabout") || way.hasTag(KEY_JUNCTION, "circular");
@@ -440,6 +435,10 @@ public IntsRef handleWayTags(IntsRef edgeFlags, ReaderWay way, EncodingManager.A
         return edgeFlags;
     }
 
+    protected boolean isPartOfCycleRelation(int priorityFromRelation) {
+        return priorityFromRelation > UNCHANGED.getValue();
+    }
+
     int getSpeed(ReaderWay way) {
         int speed = Integer.MIN_VALUE;
         String highwayTag = way.getTag(KEY_HIGHWAY);
@@ -639,28 +638,7 @@ private PriorityCode convertClassValueToPriority(String tagvalue) {
     void collect(ReaderWay way, double wayTypeSpeed, TreeMap<Double, Integer> weightToPrioMap) {
         String service = way.getTag(KEY_SERVICE);
         String highway = way.getTag(KEY_HIGHWAY);
-        // MARQ24 MOD START
-        if (!isRoadBikeEncoder) {
-            // MARQ24 MOD END
-            // MARQ24 MOD START
-            if (way.hasTag(KEY_BICYCLE, KEY_DESIGNATED) || way.hasTag(KEY_BICYCLE, KEY_OFFICIAL) || way.hasTag(KEY_BICYCLE_ROAD, "yes")) {
-                // MARQ24 MOD END
-                if ("path".equals(highway)) {
-                    weightToPrioMap.put(100d, VERY_NICE.getValue());
-                } else {
-                    weightToPrioMap.put(100d, PREFER.getValue());
-                }
-            }
-            if (KEY_CYCLEWAY.equals(highway)) {
-                if (way.hasTag("foot", intendedValues) && !way.hasTag(KEY_SEGREGATED, "yes")) {
-                    weightToPrioMap.put(100d, PREFER.getValue());
-                } else {
-                    weightToPrioMap.put(100d, VERY_NICE.getValue());
-                }
-            }
-            // MARQ24 MOD START
-        }
-        // MARQ24 MOD END
+        handleDesignatedCyclingPriority(way, weightToPrioMap, highway);
 
         double maxSpeed = getMaxSpeed(way);
         if (preferHighwayTags.contains(highway) || this.isValidSpeed(maxSpeed) && maxSpeed <= 30) {
@@ -679,27 +657,7 @@ void collect(ReaderWay way, double wayTypeSpeed, TreeMap<Double, Integer> weight
 
         if (pushingSectionsHighways.contains(highway)
                 || "parking_aisle".equals(service)) {
-            int pushingSectionPrio = AVOID_IF_POSSIBLE.getValue();
-            // MARQ24 MOD START
-            if (!isRoadBikeEncoder) {
-                // MARQ24 MOD END
-                if (way.hasTag(KEY_BICYCLE, "use_sidepath") || way.hasTag(KEY_BICYCLE, "yes") || way.hasTag(KEY_BICYCLE, "permissive")) {
-                    pushingSectionPrio = PREFER.getValue();
-                }
-                if (way.hasTag(KEY_BICYCLE, KEY_DESIGNATED) || way.hasTag(KEY_BICYCLE, KEY_OFFICIAL)) {
-                    pushingSectionPrio = VERY_NICE.getValue();
-                }
-                // MARQ24 MOD START
-            }
-            // MARQ24 MOD END
-
-            if (way.hasTag("foot", "yes")) {
-                pushingSectionPrio = Math.max(pushingSectionPrio - 1, WORST.getValue());
-                if (!isRoadBikeEncoder && way.hasTag(KEY_SEGREGATED, "yes")) {
-                    pushingSectionPrio = Math.min(pushingSectionPrio + 1, BEST.getValue());
-                }
-            }
-            weightToPrioMap.put(100d, pushingSectionPrio);
+            handlePushingSectionPriority(way, weightToPrioMap);
         }
 
         if (way.hasTag(KEY_RAILWAY, "tram")) {
@@ -724,6 +682,40 @@ void collect(ReaderWay way, double wayTypeSpeed, TreeMap<Double, Integer> weight
         }
     }
 
+    protected void handlePushingSectionPriority(ReaderWay way, TreeMap<Double, Integer> weightToPrioMap) {
+        int pushingSectionPrio = AVOID_IF_POSSIBLE.getValue();
+        if (way.hasTag(KEY_BICYCLE, "use_sidepath") || way.hasTag(KEY_BICYCLE, "yes") || way.hasTag(KEY_BICYCLE, "permissive")) {
+            pushingSectionPrio = PREFER.getValue();
+        }
+        if (way.hasTag(KEY_BICYCLE, KEY_DESIGNATED) || way.hasTag(KEY_BICYCLE, KEY_OFFICIAL)) {
+            pushingSectionPrio = VERY_NICE.getValue();
+        }
+        if (way.hasTag("foot", "yes")) {
+            pushingSectionPrio = Math.max(pushingSectionPrio - 1, WORST.getValue());
+            if (way.hasTag(KEY_SEGREGATED, "yes")) {
+                pushingSectionPrio = Math.min(pushingSectionPrio + 1, BEST.getValue());
+            }
+        }
+        weightToPrioMap.put(100d, pushingSectionPrio);
+    }
+
+    protected void handleDesignatedCyclingPriority(ReaderWay way, TreeMap<Double, Integer> weightToPrioMap, String highway) {
+        if (way.hasTag(KEY_BICYCLE, KEY_DESIGNATED) || way.hasTag(KEY_BICYCLE, KEY_OFFICIAL) || way.hasTag(KEY_BICYCLE_ROAD, "yes")) {
+            if ("path".equals(highway)) {
+                weightToPrioMap.put(100d, VERY_NICE.getValue());
+            } else {
+                weightToPrioMap.put(100d, PREFER.getValue());
+            }
+        }
+        if (KEY_CYCLEWAY.equals(highway)) {
+            if (way.hasTag("foot", intendedValues) && !way.hasTag(KEY_SEGREGATED, "yes")) {
+                weightToPrioMap.put(100d, PREFER.getValue());
+            } else {
+                weightToPrioMap.put(100d, VERY_NICE.getValue());
+            }
+        }
+    }
+
     /**
      * Handle surface and wayType encoding
      */
@@ -751,7 +743,7 @@ void handleBikeRelated(IntsRef edgeFlags, ReaderWay way, boolean partOfCycleRela
             wayType = WayType.PUSHING_SECTION;
         } else {
             // boost "none identified" partOfCycleRelation
-            if (!isRoadBikeEncoder && partOfCycleRelation) {
+            if (partOfCycleRelation) {
                 wayType = WayType.CYCLEWAY;
             }
 

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/flagencoders/bike/RoadBikeFlagEncoder.java

@@ -204,4 +204,24 @@ public String toString() {
     protected double getDownhillMaxSpeed() {
         return 60;
     }
+
+    @Override
+    protected void handlePushingSectionPriority(ReaderWay way, TreeMap<Double, Integer> weightToPrioMap) {
+        int pushingSectionPrio = AVOID_IF_POSSIBLE.getValue();
+        if (way.hasTag("foot", "yes")) {
+            pushingSectionPrio = Math.max(pushingSectionPrio - 1, WORST.getValue());
+        }
+        weightToPrioMap.put(100d, pushingSectionPrio);
+    }
+
+    @Override
+    protected void handleDesignatedCyclingPriority(ReaderWay way, TreeMap<Double, Integer> weightToPrioMap, String highway) {
+        // do nothing
+    }
+
+    @Override
+    protected boolean isPartOfCycleRelation(int priorityFromRelation) {
+        return false;
+    }
+
 }