better handling of access and barrier tags

This commit is contained in:
Emil Tin
2012-10-03 19:04:56 +02:00
parent 30465f08ac
commit 4b00557fda
13 changed files with 162 additions and 159 deletions
+14 -24
View File
@@ -7,6 +7,7 @@ Feature: Bike - Restricted access
Scenario: Bike - Access tags on ways
Then routability should be
| access | bothw |
| | x |
| yes | x |
| motorcar | x |
| motor_vehicle | x |
@@ -14,31 +15,17 @@ Feature: Bike - Restricted access
| permissive | x |
| designated | x |
| no | |
| foot | |
| private | |
| agricultural | |
| forestry | |
| designated | |
| forestery | |
| some_tag | x |
Scenario: Bike - Access tags for other modes should have no effect
Then routability should be
| access | bothw |
| ufo:yes | x |
| ufo:motorcar | x |
| ufo:motor_vehicle | x |
| ufo:vehicle | x |
| ufo:permissive | x |
| ufo:designated | x |
| ufo:no | x |
| ufo:private | x |
| ufo:agricultural | x |
| ufo:forestry | x |
| ufo:designated | x |
| ufo:some_tag | x |
Scenario: Bike - Access tags on nodes
Then routability should be
| node:access | bothw |
| node/access | bothw |
| | x |
| yes | x |
| motorcar | x |
| motor_vehicle | x |
@@ -46,21 +33,24 @@ Feature: Bike - Restricted access
| permissive | x |
| designated | x |
| no | |
| foot | |
| private | |
| agricultural | |
| forestry | |
| designated | |
| forestery | |
| some_tag | x |
Scenario: Bike - Access tags on both nodes and way
Then routability should be
| access | node:access | bothw |
| access | node/access | bothw |
| yes | yes | x |
| yes | no | |
| yes | some_tag | |
| yes | foot | |
| yes | some_tag | x |
| no | yes | |
| no | no | |
| no | foot | |
| no | some_tag | |
| some_tag | yes | |
| some_tag | yes | x |
| some_tag | no | |
| some_tag | some_tag | |
| some_tag | foot | |
| some_tag | some_tag | x |
+37 -31
View File
@@ -6,37 +6,43 @@ Feature: Barriers
Scenario: Bike - Barriers
Then routability should be
| highway | node/barrier | node/access | bothw |
| primary | | | x |
| primary | gate | | x |
| primary | cattle_grid | | x |
| primary | border_control | | x |
| primary | toll_booth | | x |
| primary | sally_port | | x |
| primary | bollard | | x |
| primary | some_tag | | |
| node/barrier | bothw |
| | x |
| bollard | x |
| gate | x |
| cattle_grid | x |
| border_control | x |
| toll_booth | x |
| sally_port | x |
| entrance | x |
| wall | |
| fence | |
| some_tag | |
Scenario: Bike - Access tag trumphs barriers
Then routability should be
| highway | node/barrier | node/access | bothw |
| primary | bollard | yes | x |
| primary | gate | yes | x |
| primary | cattle_grid | yes | x |
| primary | border_control | yes | x |
| primary | toll_booth | yes | x |
| primary | sally_port | yes | x |
| primary | bollard | no | |
| primary | gate | no | |
| primary | cattle_grid | no | |
| primary | border_control | no | |
| primary | toll_booth | no | |
| primary | sally_port | no | |
| primary | sally_port | some_tag | |
| primary | some_tag | bicycle | x |
| primary | some_tag | foot | |
| primary | some_tag | motorcar | |
| primary | some_tag | motor_vehicle | |
| primary | some_tag | vehicle | |
| primary | some_tag | motorcar | |
| primary | some_tag | permissive | |
| primary | some_tag | designated | |
| node/barrier | node/access | bothw |
| bollard | | x |
| bollard | yes | x |
| bollard | bicycle | x |
| bollard | vehicle | x |
| bollard | motorcar | x |
| bollard | motor_vehicle | x |
| bollard | permissive | x |
| bollard | designated | x |
| bollard | no | |
| bollard | foot | |
| bollard | private | |
| bollard | agricultural | |
| wall | | |
| wall | yes | x |
| wall | bicycle | x |
| wall | vehicle | x |
| wall | motorcar | x |
| wall | motor_vehicle | x |
| wall | permissive | x |
| wall | designated | x |
| wall | no | |
| wall | foot | |
| wall | private | |
| wall | agricultural | |