Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
- CHANGED: Upgrade Cucumber-js to v12 [#7221](https://github.com/Project-OSRM/osrm-backend/pull/7221)
- CHANGED: Add libcap-setcap to alpine dockerfile [#7241](https://github.com/Project-OSRM/osrm-backend/issues/7241)
- FIXED: Minor misspellings found in source code, comments and documents [#7215](https://github.com/Project-OSRM/osrm-backend/pull/7215)
- FIXED: Use `cycleway:both` if available. [#6179](https://github.com/Project-OSRM/osrm-backend/issues/6179)

# 6.0.0
- Changes from 6.0.0 RC2: None
Expand Down
10 changes: 10 additions & 0 deletions features/bicycle/cycleway.feature
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,13 @@ Feature: Bike - Cycle tracks/lanes
| residential | track | yes | 15 km/h | 4 km/h +-1 |
| cycleway | track | yes | 15 km/h | 4 km/h +-1 |
| footway | track | yes | 15 km/h | 4 km/h +-1 |

Scenario: Bike - Cycleway should fall back to cycleway:both
Then routability should be
| highway | cycleway:both | forw | backw |
| motorway | track | x | |
| motorway | lane | x | |
| motorway | shared | x | |
| primary | track | x | x |
| primary | lane | x | x |
| primary | shared | x | x |
3 changes: 2 additions & 1 deletion profiles/bicycle.lua
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,8 @@ function handle_bicycle_tags(profile,way,result,data)
data.barrier = way:get_value_by_key("barrier")
data.oneway = way:get_value_by_key("oneway")
data.oneway_bicycle = way:get_value_by_key("oneway:bicycle")
data.cycleway = way:get_value_by_key("cycleway")
local cycleway = way:get_value_by_key("cycleway")
data.cycleway = cycleway and cycleway or way:get_value_by_key("cycleway:both")
data.cycleway_left = way:get_value_by_key("cycleway:left")
data.cycleway_right = way:get_value_by_key("cycleway:right")
data.duration = way:get_value_by_key("duration")
Expand Down