Merge 54c5830252 into 203314b1aa

CHANGELOG.md

@@ -79,6 +79,7 @@
       - ADDED: Extract prerelease/build information from package semver [#6839](https://github.com/Project-OSRM/osrm-backend/pull/6839)
     - Profiles:
       - FIXED: Bicycle and foot profiles now don't route on proposed ways [#6615](https://github.com/Project-OSRM/osrm-backend/pull/6615)
+      - FIXED: Bicycle and foot profiles now don't route on motor roads [#6697](https://github.com/Project-OSRM/osrm-backend/pull/6697)
     - Routing:
       - FIXED: Fix adding traffic signal penalties during compression [#6419](https://github.com/Project-OSRM/osrm-backend/pull/6419)
       - FIXED: Correctly handle compressed traffic signals. [#6724](https://github.com/Project-OSRM/osrm-backend/pull/6724)

features/bicycle/way.feature

@@ -40,3 +40,9 @@ Feature: Bike - Accessability of different way types
             | highway | man_made | bothw |
             | (nil)   | (nil)    |       |
             | (nil)   | pier     | x     |
+
+    Scenario: Bike - Motorroad
+        Then routability should be
+            | highway | motorroad  | bothw |
+            | (nil)   | (nil)      | x     |
+            | (nil)   | yes        |       |

features/foot/way.feature

@@ -42,3 +42,9 @@ Feature: Foot - Accessability of different way types
             | footway  |       |          | x    |
             | proposed |       |          |      |
             | proposed | yes   | yes      |      |
+
+    Scenario: Foot - Motorroad
+        Then routability should be
+            | highway | motorroad  | forw |
+            | (nil)   | (nil)      | x    |
+            | (nil)   | yes        |      |

profiles/bicycle.lua

@@ -217,7 +217,8 @@ function setup()
     avoid = Set {
       'impassable',
       'construction',
-      'proposed'
+      'proposed',
+      'motorroad'
     }
   }
 end

profiles/foot.lua

@@ -70,7 +70,8 @@ function setup()
 
     avoid = Set {
       'impassable',
-      'proposed'
+      'proposed',
+      'motorroad'
     },
 
     speeds = Sequence {

profiles/lib/way_handlers.lua

@@ -634,6 +634,11 @@ function WayHandlers.blocked_ways(profile,way,result,data)
     return false
   end
 
+  -- motorroad
+  if profile.avoid.motorroad and way:get_value_by_key("motorroad") == "yes" then
+    return false
+  end
+
   -- In addition to the highway=construction tag above handle the construction=* tag
   -- http://wiki.openstreetmap.org/wiki/Key:construction
   -- https://taginfo.openstreetmap.org/keys/construction#values