Use fallback speed also for ways that are neither highways nor ferries (graphhopper#2845)

Author: easbar

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

@@ -105,7 +105,7 @@ public CarAverageSpeedParser(DecimalEncodedValue speedEnc, double maxPossibleSpe
     }
 
     protected double getSpeed(ReaderWay way) {
-        String highwayValue = way.getTag("highway");
+        String highwayValue = way.getTag("highway", "");
         Integer speed = defaultSpeedMap.get(highwayValue);
 
         // even inaccessible edges get a speed assigned
@@ -126,13 +126,11 @@ protected double getSpeed(ReaderWay way) {
     @Override
     public void handleWayTags(int edgeId, EdgeIntAccess edgeIntAccess, ReaderWay way) {
         String highwayValue = way.getTag("highway");
-        if (highwayValue == null) {
-            if (way.hasTag("route", ferries)) {
-                double ferrySpeed = ferrySpeedCalc.getSpeed(way);
-                setSpeed(false, edgeId, edgeIntAccess, ferrySpeed);
-                if (avgSpeedEnc.isStoreTwoDirections())
-                    setSpeed(true, edgeId, edgeIntAccess, ferrySpeed);
-            }
+        if (highwayValue == null && way.hasTag("route", ferries)) {
+            double ferrySpeed = ferrySpeedCalc.getSpeed(way);
+            setSpeed(false, edgeId, edgeIntAccess, ferrySpeed);
+            if (avgSpeedEnc.isStoreTwoDirections())
+                setSpeed(true, edgeId, edgeIntAccess, ferrySpeed);
             return;
         }
 

core/src/test/java/com/graphhopper/routing/util/parsers/CarTagParserTest.java

@@ -730,4 +730,35 @@ void footway_etc_not_allowed_despite_vehicle_yes(String vehicle) {
             assertEquals(WayAccess.CAN_SKIP, parser.getAccess(way));
         }
     }
+
+    @Test
+    void nonHighwaysFallbackSpeed_issue2845() {
+        ReaderWay way = new ReaderWay(1);
+        way.setTag("man_made", "pier");
+        EdgeIntAccess edgeIntAccess = new ArrayEdgeIntAccess(em.getIntsForFlags());
+        speedParser.handleWayTags(0, edgeIntAccess, way);
+        assertEquals(10, avSpeedEnc.getDecimal(false, 0, edgeIntAccess), 1e-1);
+
+        way.clearTags();
+        way.setTag("railway", "platform");
+        speedParser.handleWayTags(0, edgeIntAccess = new ArrayEdgeIntAccess(em.getIntsForFlags()), way);
+        assertEquals(10, avSpeedEnc.getDecimal(false, 0, edgeIntAccess), 1e-1);
+
+        way.clearTags();
+        way.setTag("route", "ski");
+        speedParser.handleWayTags(0, edgeIntAccess = new ArrayEdgeIntAccess(em.getIntsForFlags()), way);
+        assertEquals(10, avSpeedEnc.getDecimal(false, 0, edgeIntAccess), 1e-1);
+
+        way.clearTags();
+        way.setTag("highway", "abandoned");
+        speedParser.handleWayTags(0, edgeIntAccess = new ArrayEdgeIntAccess(em.getIntsForFlags()), way);
+        assertEquals(10, avSpeedEnc.getDecimal(false, 0, edgeIntAccess), 1e-1);
+
+        way.clearTags();
+        way.setTag("highway", "construction");
+        way.setTag("maxspeed", "100");
+        speedParser.handleWayTags(0, edgeIntAccess = new ArrayEdgeIntAccess(em.getIntsForFlags()), way);
+        // unknown highways can be quite fast in combination with maxspeed!?
+        assertEquals(90, avSpeedEnc.getDecimal(false, 0, edgeIntAccess), 1e-1);
+    }
 }