clean cucumber comments, fixes 'file to long' problem with latest version of cucumber

This commit is contained in:
Emil Tin 2014-03-27 21:46:53 +01:00
parent 65e020a627
commit 5f7065848e
26 changed files with 52 additions and 54 deletions

View File

@ -1,6 +1,6 @@
@routing @bicycle @access @routing @bicycle @access
Feature: Bike - Access tags on ways Feature: Bike - Access tags on ways
Reference: http://wiki.openstreetmap.org/wiki/Key:access # Reference: http://wiki.openstreetmap.org/wiki/Key:access
Background: Background:
Given the profile "bicycle" Given the profile "bicycle"

View File

@ -1,6 +1,6 @@
@routing @bicycle @access @routing @bicycle @access
Feature: Bike - Access tags on nodes Feature: Bike - Access tags on nodes
Reference: http://wiki.openstreetmap.org/wiki/Key:access # Reference: http://wiki.openstreetmap.org/wiki/Key:access
Background: Background:
Given the profile "bicycle" Given the profile "bicycle"

View File

@ -1,6 +1,6 @@
@routing @bicycle @cycleway @routing @bicycle @cycleway
Feature: Bike - Cycle tracks/lanes Feature: Bike - Cycle tracks/lanes
Reference: http://wiki.openstreetmap.org/wiki/Key:cycleway # Reference: http://wiki.openstreetmap.org/wiki/Key:cycleway
Background: Background:
Given the profile "bicycle" Given the profile "bicycle"

View File

@ -1,7 +1,7 @@
@routing @bicycle @oneway @routing @bicycle @oneway
Feature: Bike - Oneway streets Feature: Bike - Oneway streets
Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing # Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing
Usually we can push bikes against oneways, but we use foot=no to prevent this in these tests # Usually we can push bikes against oneways, but we use foot=no to prevent this in these tests
Background: Background:
Given the profile "bicycle" Given the profile "bicycle"

View File

@ -1,7 +1,7 @@
@routing @bicycle @restrictions @routing @bicycle @restrictions
Feature: Bike - Turn restrictions Feature: Bike - Turn restrictions
Ignore turn restrictions on bicycle, since you always become a temporary pedestrian. # Ignore turn restrictions on bicycle, since you always become a temporary pedestrian.
Note that if u-turns are allowed, turn restrictions can lead to suprising, but correct, routes. # Note that if u-turns are allowed, turn restrictions can lead to suprising, but correct, routes.
Background: Background:
Given the profile "bicycle" Given the profile "bicycle"

View File

@ -1,7 +1,7 @@
@routing @bicycle @stop_area @todo @routing @bicycle @stop_area @todo
Feature: Bike - Stop areas for public transport Feature: Bike - Stop areas for public transport
Platforms and railway/bus lines are connected using a relation rather that a way, as specified in: # Platforms and railway/bus lines are connected using a relation rather that a way, as specified in:
http://wiki.openstreetmap.org/wiki/Tag:public_transport%3Dstop_area # http://wiki.openstreetmap.org/wiki/Tag:public_transport%3Dstop_area
Background: Background:
Given the profile "bicycle" Given the profile "bicycle"

View File

@ -1,6 +1,6 @@
@routing @bicycle @train @routing @bicycle @train
Feature: Bike - Handle ferry routes Feature: Bike - Handle ferry routes
Bringing bikes on trains and subways # Bringing bikes on trains and subways
Background: Background:
Given the profile "bicycle" Given the profile "bicycle"

View File

@ -5,8 +5,8 @@ Feature: Bike - Accessability of different way types
Given the profile "bicycle" Given the profile "bicycle"
Scenario: Bike - Routability of way types Scenario: Bike - Routability of way types
Bikes are allowed on footways etc because you can pull your bike at a lower speed. # 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. # Pier is not allowed, since it's tagged using man_made=pier.
Then routability should be Then routability should be
| highway | bothw | | highway | bothw |

View File

@ -1,6 +1,6 @@
@routing @car @access @routing @car @access
Feature: Car - Restricted access Feature: Car - Restricted access
Reference: http://wiki.openstreetmap.org/wiki/Key:access # Reference: http://wiki.openstreetmap.org/wiki/Key:access
Background: Background:
Given the profile "car" Given the profile "car"

View File

@ -1,6 +1,6 @@
@routing @car @oneway @routing @car @oneway
Feature: Car - Oneway streets Feature: Car - Oneway streets
Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing # Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing
Background: Background:
Given the profile "car" Given the profile "car"

View File

@ -1,7 +1,7 @@
@routing @car @restrictions @routing @car @restrictions
Feature: Car - Turn restrictions Feature: Car - Turn restrictions
Handle turn restrictions as defined by http://wiki.openstreetmap.org/wiki/Relation:restriction # Handle turn restrictions as defined by http://wiki.openstreetmap.org/wiki/Relation:restriction
Note that if u-turns are allowed, turn restrictions can lead to suprising, but correct, routes. # Note that if u-turns are allowed, turn restrictions can lead to suprising, but correct, routes.
Background: Use car routing Background: Use car routing
Given the profile "car" Given the profile "car"

View File

@ -1,6 +1,6 @@
@routing @foot @access @routing @foot @access
Feature: Foot - Access tags on ways Feature: Foot - Access tags on ways
Reference: http://wiki.openstreetmap.org/wiki/Key:access # Reference: http://wiki.openstreetmap.org/wiki/Key:access
Background: Background:
Given the profile "foot" Given the profile "foot"

View File

@ -1,6 +1,6 @@
@routing @foot @access @routing @foot @access
Feature: Foot - Access tags on nodes Feature: Foot - Access tags on nodes
Reference: http://wiki.openstreetmap.org/wiki/Key:access # Reference: http://wiki.openstreetmap.org/wiki/Key:access
Background: Background:
Given the profile "foot" Given the profile "foot"

View File

@ -1,6 +1,6 @@
@routing @foot @oneway @routing @foot @oneway
Feature: Foot - Oneway streets Feature: Foot - Oneway streets
Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing # Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing
Background: Background:
Given the profile "foot" Given the profile "foot"

View File

@ -1,6 +1,6 @@
@routing @foot @restrictions @routing @foot @restrictions
Feature: Foot - Turn restrictions Feature: Foot - Turn restrictions
Ignore turn restrictions on foot. # Ignore turn restrictions on foot.
Background: Background:
Given the profile "foot" Given the profile "foot"

View File

@ -6,8 +6,8 @@ Feature: Roundabout Instructions
@todo @todo
Scenario: Foot - Roundabout instructions Scenario: Foot - Roundabout instructions
You can walk in both directions on a roundabout, bu the normal roundabout instructions don't # You can walk in both directions on a roundabout, bu the normal roundabout instructions don't
make sense when you're going the opposite way around the roundabout. # make sense when you're going the opposite way around the roundabout.
Given the node map Given the node map
| | | v | | | | | | v | | |

View File

@ -1,11 +1,11 @@
@routing @options @files @routing @options @files
Feature: Command line options: files Feature: Command line options: files
Normally when launching osrm-routed, it will keep running as a server until it's shut down. # Normally when launching osrm-routed, it will keep running as a server until it's shut down.
For testing program options, the --trial option is used, which causes osrm-routed to quit # For testing program options, the --trial option is used, which causes osrm-routed to quit
immediately after initialization. This makes testing easier and faster. # immediately after initialization. This makes testing easier and faster.
#
The {base} part of the options to osrm-routed will be expanded to the actual base path of # The {base} part of the options to osrm-routed will be expanded to the actual base path of
the preprocessed file. # the preprocessed file.
Background: Background:
Given the profile "testbot" Given the profile "testbot"

View File

@ -45,8 +45,8 @@ Feature: Handle bad data in a graceful manner
@poles @poles
Scenario: Routing close to the north/south pole Scenario: Routing close to the north/south pole
Mercator is undefined close to the poles. # Mercator is undefined close to the poles.
All nodes and request with latitude to close to either of the poles should therefore be ignored. # All nodes and request with latitude to close to either of the poles should therefore be ignored.
Given the node locations Given the node locations
| node | lat | lon | | node | lat | lon |

View File

@ -141,8 +141,8 @@ Feature: Compass bearing
| f | e | abcdef | W | 270 | | f | e | abcdef | W | 270 |
Scenario: Bearings at high latitudes Scenario: Bearings at high latitudes
The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html, # The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html,
to form square with sides of 1 km. # to form square with sides of 1 km.
Given the node locations Given the node locations
| node | lat | lon | | node | lat | lon |
@ -176,8 +176,8 @@ Feature: Compass bearing
| d | b | bd | NW | 315 | | d | b | bd | NW | 315 |
Scenario: Bearings at high negative latitudes Scenario: Bearings at high negative latitudes
The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html, # The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html,
to form square with sides of 1 km. # to form square with sides of 1 km.
Given the node locations Given the node locations
| node | lat | lon | | node | lat | lon |

View File

@ -1,6 +1,5 @@
@routing @testbot @example @routing @testbot @example
Feature: Testbot - Walkthrough Feature: Testbot - Walkthrough
# A complete walk-through of how this data is processed can be found at: # A complete walk-through of how this data is processed can be found at:
# https://github.com/DennisOSRM/Project-OSRM/wiki/Processing-Flow # https://github.com/DennisOSRM/Project-OSRM/wiki/Processing-Flow

View File

@ -1,9 +1,8 @@
@routing @testbot @impedance @todo @routing @testbot @impedance @todo
Feature: Setting impedance and speed separately Feature: Setting impedance and speed separately
These tests assume that the speed is not factored into the impedance by OSRM internally. # These tests assume that the speed is not factored into the impedance by OSRM internally.
Instead the speed can optionally be factored into the weiht in the lua profile. # Instead the speed can optionally be factored into the weiht in the lua profile.
# Note: With the default grid size of 100m, the diagonals has a length if 141.42m
Note: With the default grid size of 100m, the diagonals has a length if 141.42m
Background: Background:
Given the profile "testbot" Given the profile "testbot"
@ -55,8 +54,8 @@ Note: With the default grid size of 100m, the diagonals has a length if 141.42m
| c | b | btc | | c | b | btc |
Scenario: Use both impedance and speed (multiplied) when picking route Scenario: Use both impedance and speed (multiplied) when picking route
OSRM should not factor speed into impedance internally. However, the profile can choose to do so, # OSRM should not factor speed into impedance internally. However, the profile can choose to do so,
and this test expect the testbot profile to do it. # and this test expect the testbot profile to do it.
Given the node map Given the node map
| | s | | t | | | | s | | t | |
| a | | b | | c | | a | | b | | c |

View File

@ -1,6 +1,6 @@
@routing @penalty @signal @routing @penalty @signal
Feature: Penalties Feature: Penalties
Testbot uses a signal penalty of 7s. # Testbot uses a signal penalty of 7s.
Background: Background:
Given the profile "testbot" Given the profile "testbot"

View File

@ -1,13 +1,13 @@
@routing @projection @routing @projection
Feature: Projection to nearest point on road Feature: Projection to nearest point on road
Waypoints are projected perpendiculary onto the closest road # Waypoints are projected perpendiculary onto the closest road
Background: Background:
The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html # The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html
The nodes are placed as follows, with ab, bc and bd all being 1 km in length each: # The nodes are placed as follows, with ab, bc and bd all being 1 km in length each:
| | | c | # | | | c |
| | b | | (this is sketch only, real data is in the table below) # | | b | | (this is sketch only, real data is in the table below)
| a | | d | # | a | | d |
Given the profile "testbot" Given the profile "testbot"
Given the node locations Given the node locations

View File

@ -5,7 +5,7 @@ Feature: OSM Route Relation
Given the profile "testbot" Given the profile "testbot"
Scenario: Prioritize ways that are part of route relations Scenario: Prioritize ways that are part of route relations
This scenario assumes that the testbot uses an impedance of 0.5 for ways that are part of 'testbot' routes. # This scenario assumes that the testbot uses an impedance of 0.5 for ways that are part of 'testbot' routes.
Given the node map Given the node map
| s | | | t | | | | | s | | | t | | | |

View File

@ -1,9 +1,9 @@
@routing @time @routing @time
Feature: Estimation of travel time Feature: Estimation of travel time
Testbot speeds: # Testbot speeds:
Primary road: 36km/h = 36000m/3600s = 100m/10s # Primary road: 36km/h = 36000m/3600s = 100m/10s
Secondary road: 18km/h = 18000m/3600s = 100m/20s # Secondary road: 18km/h = 18000m/3600s = 100m/20s
Tertiary road: 12km/h = 12000m/3600s = 100m/30s # Tertiary road: 12km/h = 12000m/3600s = 100m/30s
Background: Use specific speeds Background: Use specific speeds
Given the profile "testbot" Given the profile "testbot"

View File

@ -98,7 +98,7 @@ Feature: Turn directions/codes
| g | e | xg,xe | head,sharp_right,destination | | g | e | xg,xe | head,sharp_right,destination |
Scenario: Turn instructions at high latitude Scenario: Turn instructions at high latitude
https://github.com/DennisOSRM/Project-OSRM/issues/532 # https://github.com/DennisOSRM/Project-OSRM/issues/532
Given the node locations Given the node locations
| node | lat | lon | | node | lat | lon |
| a | 55.68740 | 12.52430 | | a | 55.68740 | 12.52430 |