diff --git a/CHANGELOG.md b/CHANGELOG.md index e0a710101da..2dd49f54eb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,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) + - CHANGED: Add the PSV vehicle subtypes to the access_tag_blacklist of the car profile (taxi, share_taxi, minibus, and bus) [#7295](https://github.com/Project-OSRM/osrm-backend/pull/7295) # 6.0.0 - Changes from 6.0.0 RC2: None diff --git a/features/car/access.feature b/features/car/access.feature index 0bebd2589e0..6cc9b293106 100644 --- a/features/car/access.feature +++ b/features/car/access.feature @@ -123,6 +123,10 @@ Feature: Car - Restricted access | agricultural | | | forestry | | | psv | | + | taxi | | + | share_taxi | | + | minibus | | + | bus | | | delivery | x | | some_tag | x | | destination | x | @@ -139,6 +143,10 @@ Feature: Car - Restricted access | agricultural | | | forestry | | | psv | | + | taxi | | + | share_taxi | | + | minibus | | + | bus | | | delivery | x | | some_tag | x | diff --git a/profiles/car.lua b/profiles/car.lua index 35b4178d9cd..9a956a232eb 100644 --- a/profiles/car.lua +++ b/profiles/car.lua @@ -80,6 +80,10 @@ function setup() 'forestry', 'emergency', 'psv', + 'taxi', -- sub class of psv + 'share_taxi', -- sub class of psv + 'minibus', -- sub class of psv + 'bus', -- sub class of psv 'customers', 'private', 'delivery', diff --git a/profiles/lib/guidance.lua b/profiles/lib/guidance.lua index 04e87a93f0a..fc705aec6a6 100644 --- a/profiles/lib/guidance.lua +++ b/profiles/lib/guidance.lua @@ -136,6 +136,13 @@ end -- returns forward,backward psv lane count local function get_psv_counts(way,data) local psv_forward, psv_backward = Tags.get_forward_backward_by_key(way,data,'lanes:psv') + local taxi_forward, taxi_backward = Tags.get_forward_backward_by_key(way,data,'lanes:taxi') + local share_taxi_forward, share_taxi_backward = Tags.get_forward_backward_by_key(way,data,'lanes:share_taxi') + local minibus_forward, minibus_backward = Tags.get_forward_backward_by_key(way,data,'lanes:minibus') + local bus_forward, bus_backward = Tags.get_forward_backward_by_key(way,data,'lanes:bus') + psv_forward = psv_forward or taxi_forward or share_taxi_forward or minibus_forward or bus_forward + psv_backward = psv_backward or taxi_backward or share_taxi_backward or minibus_backward or bus_backward + if psv_forward then psv_forward = tonumber(psv_forward) end diff --git a/taginfo.json b/taginfo.json index c2bb0367d30..d97e3ea475b 100644 --- a/taginfo.json +++ b/taginfo.json @@ -152,6 +152,10 @@ {"key": "access", "value": "forestry"}, {"key": "access", "value": "emergency"}, {"key": "access", "value": "psv"}, + {"key": "access", "value": "taxi"}, + {"key": "access", "value": "share_taxi"}, + {"key": "access", "value": "minibus"}, + {"key": "access", "value": "bus"}, {"key": "access", "value": "delivery"}, {"key": "maxheight", "object_types": ["node", "way"]}, {"key": "maxspeed", "value": "none"},