From 660cea8fcc4af14f6c231e40057df713fb311126 Mon Sep 17 00:00:00 2001
From: Louis <42336759+32Vache@users.noreply.github.com>
Date: Fri, 23 Sep 2022 17:54:55 +0200
Subject: [PATCH] Bicycle surface speeds (#6212)

---
 CHANGELOG.md                     |  3 +++
 features/bicycle/surface.feature | 18 ++++++++++++------
 profiles/bicycle.lua             | 16 ++++++++++------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebce4742de1..b6ec2d73ede 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,9 @@
       - ADDED: Support snapping to multiple ways at an input location. [#5953](https://github.com/Project-OSRM/osrm-backend/pull/5953)
       - FIXED: Fix snapping target locations to ways used in turn restrictions. [#6339](https://github.com/Project-OSRM/osrm-backend/pull/6339)
       - ADDED: Support OSM traffic signal directions. [#6153](https://github.com/Project-OSRM/osrm-backend/pull/6153)
+    - Profile:
+      - CHANGED: Bicycle surface speeds [#6212](https://github.com/Project-OSRM/osrm-backend/pull/6212)
+
 
 # 5.26.0
   - Changes from 5.25.0
diff --git a/features/bicycle/surface.feature b/features/bicycle/surface.feature
index 98ec1c25003..e1062d0928f 100644
--- a/features/bicycle/surface.feature
+++ b/features/bicycle/surface.feature
@@ -9,28 +9,34 @@ Feature: Bike - Surfaces
             | highway  | surface               | bothw   |
             | cycleway |                       | 48 s    |
             | cycleway | asphalt               | 47.9 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.9 s |
             | cycleway | gravel                | 120 s   |
             | cycleway | pebblestone           | 120 s   |
-            | cycleway | dirt                  | 120 s   |
+            | cycleway | dirt                  | 90 s    |
             | cycleway | earth                 | 120 s   |
             | cycleway | grass                 | 120 s   |
             | cycleway | mud                   | 240 s   |
             | cycleway | sand                  | 240 s   |
-            | cycleway | sett                  | 72 s    |
+            | cycleway | sett                  | 80 s    |
 
     Scenario: Bicycle - Good surfaces on small paths
         Then routability should be
         | highway  | surface | bothw  |
         | cycleway |         | 48 s   |
-        | path     |         | 59.9 s |
+        | path     |         | 55.3 s |
         | track    |         | 60 s   |
         | track    | asphalt | 60 s   |
-        | path     | asphalt | 60 s   |
+        | path     | asphalt | 55.4 s |
 
     Scenario: Bicycle - Surfaces should not make unknown ways routable
         Then routability should be
diff --git a/profiles/bicycle.lua b/profiles/bicycle.lua
index 07032206e23..e520c35ea7e 100644
--- a/profiles/bicycle.lua
+++ b/profiles/bicycle.lua
@@ -133,7 +133,7 @@ function setup()
       road = default_speed,
       service = default_speed,
       track = 12,
-      path = 12
+      path = 13
     },
 
     pedestrian_speeds = {
@@ -174,21 +174,25 @@ function setup()
 
     surface_speeds = {
       asphalt = default_speed,
+      chipseal = default_speed,
+      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 {