Skip to content

Commit

Permalink
Make pedestrian roads marked as destination routable with car profile.
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-j-h committed Sep 3, 2015
1 parent 70bb082 commit b6ef558
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
16 changes: 9 additions & 7 deletions features/car/access.feature
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,15 @@ Feature: Car - Restricted access

Scenario: Car - Access combinations
Then routability should be
| highway | accesss | vehicle | motor_vehicle | motorcar | bothw |
| runway | private | | | permissive | x |
| primary | forestry | | yes | | x |
| cycleway | | | designated | | x |
| residential | | yes | no | | |
| motorway | yes | permissive | | private | |
| trunk | agricultural | designated | permissive | no | |
| highway | accesss | vehicle | motor_vehicle | motorcar | bothw |
| runway | private | | | permissive | x |
| primary | forestry | | yes | | x |
| cycleway | | | designated | | x |
| residential | | yes | no | | |
| motorway | yes | permissive | | private | |
| trunk | agricultural | designated | permissive | no | |
| pedestrian | | | | | |
| pedestrian | | | | destination | x |

Scenario: Car - Ignore access tags for other modes
Then routability should be
Expand Down
6 changes: 5 additions & 1 deletion profiles/car.lua
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,12 @@ function way_function (way, result)
result.backward_speed = highway_speed
end
else
-- make an exception for restricted highway=pedestrian with motorcar=destination
local motorcar = way:get_value_by_key("motorcar")
local pedestrian_road = motorcar and "destination" == motorcar and "pedestrian" == highway

-- Set the avg speed on ways that are marked accessible
if access_tag_whitelist[access] then
if access_tag_whitelist[access] or pedestrian_road then
result.forward_speed = speed_profile["default"]
result.backward_speed = speed_profile["default"]
end
Expand Down

0 comments on commit b6ef558

Please sign in to comment.