From 6cc6337781fa82c92e1b37a3aca37c2aef6078d0 Mon Sep 17 00:00:00 2001 From: Frederik Ramm Date: Thu, 26 Sep 2024 12:02:44 +0200 Subject: [PATCH 1/2] do not overwrite vehicle maxspeed with higher value, fixes #6979 --- profiles/lib/way_handlers.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/profiles/lib/way_handlers.lua b/profiles/lib/way_handlers.lua index b1341023509..87b4b6e2cc1 100644 --- a/profiles/lib/way_handlers.lua +++ b/profiles/lib/way_handlers.lua @@ -438,11 +438,11 @@ function WayHandlers.maxspeed(profile,way,result,data) backward = WayHandlers.parse_maxspeed(backward,profile) if forward and forward > 0 then - result.forward_speed = forward * profile.speed_reduction + result.forward_speed = math.min(forward * profile.speed_reduction, result.forward_speed) end if backward and backward > 0 then - result.backward_speed = backward * profile.speed_reduction + result.backward_speed = math.min(backward * profile.speed_reduction, result.backward_speed) end end From 051d10d729b07a540b9231e980fc994df178a65a Mon Sep 17 00:00:00 2001 From: Frederik Ramm Date: Thu, 26 Sep 2024 12:08:24 +0200 Subject: [PATCH 2/2] add PR #7036 to changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 614601a6c37..ff5dc6d9885 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -79,6 +79,8 @@ - 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: edge maxspeed now doesn't overwrite a vehicle maxspeed [#7036](https://github.com/Project-OSRM/osrm-backend/pull/7036) + - 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)