Avoid -> Exclude

This commit is contained in:
Patrick Niklaus
2017-08-16 20:21:19 +00:00
committed by Patrick Niklaus
parent 45140ca9f7
commit d09f5c0e3a
27 changed files with 145 additions and 142 deletions
@@ -1,5 +1,5 @@
@routing @testbot @avoid @mld
Feature: Testbot - Avoid flags
@routing @testbot @exclude @mld
Feature: Testbot - Exclude flags
Background:
Given the profile "testbot"
Given the node map
@@ -10,17 +10,17 @@ Feature: Testbot - Avoid flags
"""
And the ways
| nodes | highway | toll | # |
| ab | primary | | always drivable |
| bc | motorway | | not drivable for avoid=motorway and avoid=motorway,toll |
| be | primary | yes | not drivable for avoid=toll and avoid=motorway,toll |
| ef | primary | yes | not drivable for avoid=toll and avoid=motorway,toll |
| fc | primary | yes | not drivable for avoid=toll and avoid=motorway,toll |
| cd | motorway | yes | not drivable for avoid=motorway avoid=toll and avoid=motorway,toll |
| fg | primary | | always drivable |
| gd | primary | | always drivable |
| nodes | highway | toll | # |
| ab | primary | | always drivable |
| bc | motorway | | not drivable for exclude=motorway and exclude=motorway,toll |
| be | primary | yes | not drivable for exclude=toll and exclude=motorway,toll |
| ef | primary | yes | not drivable for exclude=toll and exclude=motorway,toll |
| fc | primary | yes | not drivable for exclude=toll and exclude=motorway,toll |
| cd | motorway | yes | not drivable for exclude=motorway exclude=toll and exclude=motorway,toll |
| fg | primary | | always drivable |
| gd | primary | | always drivable |
Scenario: Testbot - avoid nothing
Scenario: Testbot - exclude nothing
When I route I should get
| from | to | route |
| a | d | ab,bc,cd,cd |
@@ -28,9 +28,9 @@ Feature: Testbot - Avoid flags
| a | c | ab,bc,bc |
| a | f | ab,be,ef,ef |
Scenario: Testbot - avoid motorway
Scenario: Testbot - exclude motorway
Given the query options
| avoid | motorway |
| exclude | motorway |
When I route I should get
| from | to | route |
@@ -39,9 +39,9 @@ Feature: Testbot - Avoid flags
| a | c | ab,be,ef,fc,fc |
| a | f | ab,be,ef,ef |
Scenario: Testbot - avoid toll
Scenario: Testbot - exclude toll
Given the query options
| avoid | toll |
| exclude | toll |
When I route I should get
| from | to | route |
@@ -51,9 +51,9 @@ Feature: Testbot - Avoid flags
| a | f | |
| f | d | fg,gd,gd |
Scenario: Testbot - avoid motorway and toll
Scenario: Testbot - exclude motorway and toll
Given the query options
| avoid | motorway,toll |
| exclude | motorway,toll |
When I route I should get
| from | to | route |