Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Support trunk access for some countries

Browse Source
This commit is contained in:
tombay
2024-10-05 16:01:09 +10:00
parent becfd8a56d
commit 4b24713d76
8 changed files with 494 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/bicycle/way.feature
+38 -1
View File
@@ -4,7 +4,7 @@ Feature: Bike - Accessability of different way types
Background:
Given the profile "bicycle"
Scenario: Bike - Routability of way types
Scenario: Bike - Routability of way types trunk not supported
# Bikes are allowed on footways etc because you can pull your bike at a lower speed.
# Pier is not allowed, since it's tagged using man_made=pier.
@@ -40,3 +40,40 @@ Feature: Bike - Accessability of different way types
| highway | man_made | bothw |
| (nil) | (nil) | |
| (nil) | pier | x |
Scenario: Bike - Routability of way types trunk supported
# Bikes are allowed on footways etc because you can pull your bike at a lower speed.
# Pier is not allowed, since it's tagged using man_made=pier.
Given the profile file "bicycle" initialized with
"""
profile.uselocationtags.trunk = true
"""
Then routability should be
| highway | bothw |
| (nil) | |
| motorway | |
| motorway_link | |
| trunk | x |
| trunk_link | x |
| primary | x |
| primary_link | x |
| secondary | x |
| secondary_link | x |
| tertiary | x |
| tertiary_link | x |
| residential | x |
| service | x |
| unclassified | x |
| living_street | x |
| road | x |
| track | x |
| path | x |
| footway | x |
| pedestrian | x |
| steps | x |
| cycleway | x |
| bridleway | |
| pier | |
features/bicycle/way_notrunk.feature
+183
View File
@@ -0,0 +1,183 @@
@testbot @way @notrunk
Feature: Testbot - notrunk allowed
# Check that Nodes need to be in the geojson file to support trunk access.
# Use the default geopoint around 0.0.
# This covers both trunk allowed notrunk allowed and no motorroad
Scenario: bicycle trunk allowed - notrunk failure original behavior
Given the profile "bicycle"
And the extract extra arguments "--threads 1"
And the partition extra arguments "--threads 1"
And the customize extra arguments "--threads 1"
And the node locations
# f through o should all fail
| node | lat | lon |
| a | 48.65729 | 22.26471 |
| b | 48.65648 | 22.26486 |
| c | 48.65503 | 22.26521 |
| d | 48.65489 | 22.26520 |
| e | 48.65426 | 22.26533 |
| f | 48.65277 | 22.26556 |
| g | 48.65026 | 22.26606 |
| h | 48.64937 | 22.26618 |
| i | 48.64858 | 22.26634 |
| j | 48.64763 | 22.26652 |
| k | 48.64730 | 22.26658 |
| l | 48.64616 | 22.26681 |
| m | 48.64599 | 22.26685 |
| n | 48.64568 | 22.26690 |
And the ways
| nodes | highway | motorroad |
| ab | primary | |
| bc | primary | |
| cd | primary | yes |
| de | primary | |
| ef | primary | |
| fg | trunk | |
| gh | trunk | |
| hi | trunk | |
| ij | trunk | |
| jk | trunk | |
| kl | trunk | |
| lm | trunk | yes |
| mn | primary | |
When I route I should get
| from | to | route | status| message | # |
| a | c | ab,bc,bc | 200 | | |
| a | f | | 400 | Impossible route between points | |
| d | f | de,ef,ef | 200 | | |
| d | g | de,ef,ef | 200 | | |
| d | n | | 400 | Impossible route between points | |
Scenario: bicycle trunk allowed - trunk ok with no geojson
Given the extract extra arguments "--threads 1"
And the partition extra arguments "--threads 1"
And the customize extra arguments "--threads 1"
And the profile file "bicycle" initialized with
"""
profile.uselocationtags.trunk = true
"""
And the node locations
# a through g are in Slovakia - in the no trunk allowed set
# h is on the edge (i.e. in Ukraine)
# i through n are in Ukraine
| node | lat | lon |
| a | 48.65729 | 22.26471 |
| b | 48.65648 | 22.26486 |
| c | 48.65503 | 22.26521 |
| d | 48.65489 | 22.26520 |
| e | 48.65426 | 22.26533 |
| f | 48.65277 | 22.26556 |
| g | 48.65026 | 22.26606 |
| h | 48.64937 | 22.26618 |
| i | 48.64858 | 22.26634 |
| j | 48.64763 | 22.26652 |
| k | 48.64730 | 22.26658 |
| l | 48.64616 | 22.26681 |
| m | 48.64599 | 22.26685 |
| n | 48.64568 | 22.26690 |
And the ways
| nodes | highway | motorroad |
| ab | primary | |
| bc | primary | |
| cd | primary | yes |
| de | primary | |
| ef | primary | |
| fg | trunk | |
| gh | trunk | |
| hi | trunk | |
| ij | trunk | |
| jk | trunk | |
| kl | trunk | |
| lm | trunk | yes |
| mn | primary | |
When I route I should get
| from | to | route | status| message | # |
| a | c | ab,bc,bc | 200 | | |
| a | d | | 400 | Impossible route between points | |
| d | f | de,ef,ef | 200 | | |
| d | g | de,ef,fg,fg | 200 | | |
| e | n | | 400 | Impossible route between points | |
| f | h | fg,gh | 200 | | |
| g | l | gh,ij,kl,kl | 200 | | |
| h | l | hi,ij,kl,kl | 200 | | |
| i | l | ij,kl,kl | 200 | | |
| i | m | | 400 | Impossible route between points | |
Scenario: bicycle trunk allowed - notrunk failure with geojson
Given the extract extra arguments "--threads 1 --location-dependent-data data/notrunk.geojson"
And the partition extra arguments "--threads 1"
And the customize extra arguments "--threads 1"
And the profile file "bicycle" initialized with
"""
profile.uselocationtags.trunk = true
"""
And the node locations
# a through g are in Slovakia - in the no trunk allowed set
# h is on the edge (i.e. in Ukraine)
# i through n are in Ukraine
| node | lat | lon |
| a | 48.65729 | 22.26471 |
| b | 48.65648 | 22.26486 |
| c | 48.65503 | 22.26521 |
| d | 48.65489 | 22.26520 |
| e | 48.65426 | 22.26533 |
| f | 48.65277 | 22.26556 |
| g | 48.65026 | 22.26606 |
| h | 48.64937 | 22.26618 |
| i | 48.64858 | 22.26634 |
| j | 48.64763 | 22.26652 |
| k | 48.64730 | 22.26658 |
| l | 48.64616 | 22.26681 |
| m | 48.64599 | 22.26685 |
| n | 48.64568 | 22.26690 |
And the ways
| nodes | highway | motorroad |
| ab | primary | |
| bc | primary | |
| cd | primary | yes |
| de | primary | |
| ef | primary | |
| fg | trunk | |
| gh | trunk | |
| hi | trunk | |
| ij | trunk | |
| jk | trunk | |
| kl | trunk | |
| lm | trunk | yes |
| mn | primary | |
When I route I should get
| from | to | route | status| message | # |
| a | c | ab,bc,bc | 200 | | |
| a | d | | 400 | Impossible route between points | |
| a | f | | 400 | Impossible route between points | |
| d | f | de,ef,ef | 200 | | |
| d | g | | 400 | Impossible route between points | |
| e | n | | 400 | Impossible route between points | |
| f | h | | 400 | Impossible route between points | |
| g | l | hi,ij,kl,kl | 200 | | |
| h | l | hi,ij,kl,kl | 200 | | |
| i | l | ij,kl,kl | 200 | | |
| i | m | | 400 | Impossible route between points | |