Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bicycle surface speeds #6212

Merged
merged 6 commits into from
Sep 23, 2022
Merged
Show file tree
Hide file tree
Changes from 4 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
- FIXED: Fix installation of Mason CMake and 32 bit CI build [#6170](https://github.com/Project-OSRM/osrm-backend/pull/6170)
- FIXED: Fixed Node docs generation check in CI. [#6058](https://github.com/Project-OSRM/osrm-backend/pull/6058)
- CHANGED: Docker build, enabled apt-get update/install caching in separate layer for build phase [#6175](https://github.com/Project-OSRM/osrm-backend/pull/6175)
- Profile:
- CHANGED: Bicycle surface speeds [#6212](https://github.com/Project-OSRM/osrm-backend/pull/6212)

# 5.26.0
- Changes from 5.25.0
Expand Down
15 changes: 10 additions & 5 deletions features/bicycle/surface.feature
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,19 @@ Feature: Bike - Surfaces
| highway | surface | bothw |
| cycleway | | 48 s |
| cycleway | asphalt | 48 s |
| cycleway | chipseal | 48 s |
| cycleway | concrete | 48 s |
| cycleway | concrete_lanes | 48 s |
| cycleway | cobblestone:flattened | 72 s |
| cycleway | paving_stones | 72 s |
| cycleway | wood | 72 s |
| cycleway | compacted | 72 s |
| cycleway | cobblestone | 120 s |
| cycleway | fine_gravel | 120 s |
| cycleway | fine_gravel | 72 s |
| cycleway | ground | 72 s |
| cycleway | dirt | 90 s |
| cycleway | cobblestone | 102 s |
| cycleway | gravel | 120 s |
| cycleway | pebblestone | 120.1 s |
| cycleway | dirt | 120 s |
| cycleway | earth | 120 s |
| cycleway | grass | 120 s |
| cycleway | mud | 240 s |
Expand All @@ -27,10 +32,10 @@ Feature: Bike - Surfaces
Then routability should be
| highway | surface | bothw |
| cycleway | | 48 s |
| path | | 60 s |
| path | | 55 s |
| track | | 60 s |
| track | asphalt | 60 s |
| path | asphalt | 60 s |
| path | asphalt | 55 s |

Scenario: Bicycle - Surfaces should not make unknown ways routable
Then routability should be
Expand Down
16 changes: 10 additions & 6 deletions profiles/bicycle.lua
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ function setup()
road = default_speed,
service = default_speed,
track = 12,
path = 12
path = 13
},

pedestrian_speeds = {
Expand Down Expand Up @@ -173,21 +173,25 @@ function setup()

surface_speeds = {
asphalt = default_speed,
chipseal = default_speed,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mjjbell wdyt? At least adding new surfaces seems to be useful, not sure about changed speeds though.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems reasonable 👍

concrete = default_speed,
concrete_lanes = default_speed,
wood = 10,
["cobblestone:flattened"] = 10,
paving_stones = 10,
compacted = 10,
cobblestone = 6,
cobblestone = 7,
unpaved = 6,
fine_gravel = 6,
fine_gravel = 10,
gravel = 6,
pebblestone = 6,
ground = 6,
dirt = 6,
ground = 10,
dirt = 8,
earth = 6,
grass = 6,
mud = 3,
sand = 3,
sett = 10
sett = 9
},

classes = Sequence {
Expand Down