Update bicycle tests to reflect not cutting off arrive step

This commit is contained in:
Lauren Budorick 2016-03-31 16:25:08 -07:00 committed by Patrick Niklaus
parent 97722adbfa
commit d09827b501
13 changed files with 213 additions and 213 deletions

View File

@ -18,14 +18,14 @@ Feature: Bike - Squares and other areas
When I route I should get
| from | to | route |
| a | b | abcda |
| a | d | abcda |
| b | c | abcda |
| c | b | abcda |
| c | d | abcda |
| d | c | abcda |
| d | a | abcda |
| a | d | abcda |
| a | b | abcda,abcda |
| a | d | abcda,abcda |
| b | c | abcda,abcda |
| c | b | abcda,abcda |
| c | d | abcda,abcda |
| d | c | abcda,abcda |
| d | a | abcda,abcda |
| a | d | abcda,abcda |
@building
Scenario: Bike - Don't route on buildings
@ -66,16 +66,17 @@ Feature: Bike - Squares and other areas
When I route I should get
| from | to | route |
| x | y | xa,abcda,by |
| y | x | by,abcda,xa |
| a | b | abcda |
| a | d | abcda |
| b | c | abcda |
| c | b | abcda |
| c | d | abcda |
| d | c | abcda |
| d | a | abcda |
| a | d | abcda |
| x | y | xa,abcda,by,by |
| y | x | by,abcda,xa,xa |
| a | b | abcda,abcda |
| a | d | abcda,abcda |
| b | c | abcda,abcda |
| c | b | abcda,abcda |
| c | d | abcda,abcda |
| d | c | abcda,abcda |
| d | a | abcda,abcda |
| a | d | abcda,abcda |
@train @platform @mokob @2154
Scenario: Bike - railway platforms
@ -91,13 +92,13 @@ Feature: Bike - Squares and other areas
When I route I should get
| from | to | route |
| x | y | xa,abcda,by |
| y | x | by,abcda,xa |
| a | b | abcda |
| a | d | abcda |
| b | c | abcda |
| c | b | abcda |
| c | d | abcda |
| d | c | abcda |
| d | a | abcda |
| a | d | abcda |
| x | y | xa,abcda,by,by |
| y | x | by,abcda,xa,xa |
| a | b | abcda,abcda |
| a | d | abcda,abcda |
| b | c | abcda,abcda |
| c | b | abcda,abcda |
| c | d | abcda,abcda |
| d | c | abcda,abcda |
| d | a | abcda,abcda |
| a | d | abcda,abcda |

View File

@ -18,14 +18,14 @@ Feature: Bicycle - Handle movable bridge
When I route I should get
| from | to | route | modes |
| a | g | abc,cde,efg | cycling,movable bridge,cycling |
| b | f | abc,cde,efg | cycling,movable bridge,cycling |
| e | c | cde | movable bridge |
| e | b | cde,abc | movable bridge,cycling |
| e | a | cde,abc | movable bridge,cycling |
| c | e | cde | movable bridge |
| c | f | cde,efg | movable bridge,cycling |
| c | g | cde,efg | movable bridge,cycling |
| a | g | abc,cde,efg,efg | cycling,movable bridge,cycling,cycling |
| b | f | abc,cde,efg,efg | cycling,movable bridge,cycling,cycling |
| e | c | cde,cde | movable bridge,movable bridge |
| e | b | cde,abc,abc | movable bridge,cycling,cycling |
| e | a | cde,abc,abc | movable bridge,cycling,cycling |
| c | e | cde,cde | movable bridge,movable bridge |
| c | f | cde,efg,efg | movable bridge,cycling,cycling |
| c | g | cde,efg,efg | movable bridge,cycling,cycling |
Scenario: Bicycle - Properly handle durations
Given the node map
@ -41,7 +41,7 @@ Feature: Bicycle - Handle movable bridge
When I route I should get
| from | to | route | modes | speed |
| a | g | abc,cde,efg | cycling,movable bridge,cycling | 5 km/h |
| b | f | abc,cde,efg | cycling,movable bridge,cycling | 4 km/h |
| c | e | cde | movable bridge | 2 km/h |
| e | c | cde | movable bridge | 2 km/h |
| a | g | abc,cde,efg,efg | cycling,movable bridge,cycling,cycling | 5 km/h |
| b | f | abc,cde,efg,efg | cycling,movable bridge,cycling,cycling | 4 km/h |
| c | e | cde,cde | movable bridge,movable bridge | 2 km/h |
| e | c | cde,cde | movable bridge,movable bridge | 2 km/h |

View File

@ -18,14 +18,14 @@ Feature: Bike - Handle ferry routes
When I route I should get
| from | to | route |
| a | g | abc,cde,efg |
| b | f | abc,cde,efg |
| e | c | cde |
| e | b | cde,abc |
| e | a | cde,abc |
| c | e | cde |
| c | f | cde,efg |
| c | g | cde,efg |
| a | g | abc,cde,efg,efg |
| b | f | abc,cde,efg,efg |
| e | c | cde,cde |
| e | b | cde,abc,abc |
| e | a | cde,abc,abc |
| c | e | cde,cde |
| c | f | cde,efg,efg |
| c | g | cde,efg,efg |
Scenario: Bike - Ferry duration, single node
Given the node map
@ -59,5 +59,5 @@ Feature: Bike - Handle ferry routes
When I route I should get
| from | to | route | time |
| a | d | abcd | 3600s +-10 |
| d | a | abcd | 3600s +-10 |
| a | d | abcd,abcd | 3600s +-10 |
| d | a | abcd,abcd | 3600s +-10 |

View File

@ -49,8 +49,8 @@ Feature: Bike - Max speed restrictions
When I route I should get
| from | to | route | speed |
| a | b | ab | 15 km/h |
| b | c | bc | 15 km/h |
| a | b | ab,ab | 15 km/h |
| b | c | bc,bc | 15 km/h |
Scenario: Bike - Forward/backward maxspeed
Given the shortcuts

View File

@ -17,12 +17,12 @@ Feature: Bike - Mode flag
When I route I should get
| from | to | route | turns | modes |
| a | d | ab,bc,cd | depart,right,left,arrive | cycling,ferry,cycling |
| d | a | cd,bc,ab | depart,right,left,arrive | cycling,ferry,cycling |
| c | a | bc,ab | depart,left,arrive | ferry,cycling |
| d | b | cd,bc | depart,right,arrive | cycling,ferry |
| a | c | ab,bc | depart,right,arrive | cycling,ferry |
| b | d | bc,cd | depart,left,arrive | ferry,cycling |
| a | d | ab,bc,cd,cd | depart,right,left,arrive | cycling,ferry,cycling,cycling |
| d | a | cd,bc,ab,ab | depart,right,left,arrive | cycling,ferry,cycling,cycling |
| c | a | bc,ab,ab | depart,left,arrive | ferry,cycling,cycling |
| d | b | cd,bc,bc | depart,right,arrive | cycling,ferry,ferry |
| a | c | ab,bc,bc | depart,right,arrive | cycling,ferry,ferry |
| b | d | bc,cd,cd | depart,left,arrive | ferry,cycling,cycling |
Scenario: Bike - Mode when using a train
Given the node map
@ -37,14 +37,13 @@ Feature: Bike - Mode flag
When I route I should get
| from | to | route | turns | modes |
| a | d | ab,bc,cd | depart,right,left,arrive | cycling,train,cycling |
| d | a | cd,bc,ab | depart,right,left,arrive | cycling,train,cycling |
| c | a | bc,ab | depart,left,arrive | train,cycling |
| d | b | cd,bc | depart,right,arrive | cycling,train |
| a | c | ab,bc | depart,right,arrive | cycling,train |
| b | d | bc,cd | depart,left,arrive | train,cycling |
| a | d | ab,bc,cd,cd | depart,right,left,arrive | cycling,train,cycling,cycling |
| d | a | cd,bc,ab,ab | depart,right,left,arrive | cycling,train,cycling,cycling |
| c | a | bc,ab,ab | depart,left,arrive | train,cycling,cycling |
| d | b | cd,bc,bc | depart,right,arrive | cycling,train,train |
| a | c | ab,bc,bc | depart,right,arrive | cycling,train,train |
| b | d | bc,cd,cd | depart,left,arrive | train,cycling,cycling |
@mokobreview
Scenario: Bike - Mode when pushing bike against oneways
Given the node map
| a | b | |
@ -58,12 +57,12 @@ Feature: Bike - Mode flag
When I route I should get
| from | to | route | turns | modes |
| a | d | ab,bc,cd | depart,right,left,arrive | cycling,cycling,cycling |
| d | a | cd,bc,ab | depart,right,left,arrive | cycling,pushing bike,cycling |
| c | a | bc,ab | depart,left,arrive | pushing bike,cycling |
| d | b | cd,bc | depart,right,arrive | cycling,pushing bike |
| a | c | ab,bc | depart,right,arrive | cycling,cycling |
| b | d | bc,cd | depart,left,arrive | cycling,cycling |
| a | d | ab,bc,cd,cd | depart,right,left,arrive | cycling,cycling,cycling,cycling |
| d | a | cd,bc,ab,ab | depart,right,left,arrive | cycling,pushing bike,cycling,cycling |
| c | a | bc,ab,ab | depart,left,arrive | pushing bike,cycling,cycling |
| d | b | cd,bc,bc | depart,right,arrive | cycling,pushing bike,pushing bike |
| a | c | ab,bc,bc | depart,right,arrive | cycling,cycling,cycling |
| b | d | bc,cd,cd | depart,left,arrive | cycling,cycling,cycling |
Scenario: Bike - Mode when pushing on pedestrain streets
Given the node map
@ -78,12 +77,12 @@ Feature: Bike - Mode flag
When I route I should get
| from | to | route | turns | modes |
| a | d | ab,bc,cd | depart,right,left,arrive | cycling,pushing bike,cycling |
| d | a | cd,bc,ab | depart,right,left,arrive | cycling,pushing bike,cycling |
| c | a | bc,ab | depart,left,arrive | pushing bike,cycling |
| d | b | cd,bc | depart,right,arrive | cycling,pushing bike |
| a | c | ab,bc | depart,right,arrive | cycling,pushing bike |
| b | d | bc,cd | depart,left,arrive | pushing bike,cycling |
| a | d | ab,bc,cd,cd | depart,right,left,arrive | cycling,pushing bike,cycling,cycling |
| d | a | cd,bc,ab,ab | depart,right,left,arrive | cycling,pushing bike,cycling,cycling |
| c | a | bc,ab,ab | depart,left,arrive | pushing bike,cycling,cycling |
| d | b | cd,bc,bc | depart,right,arrive | cycling,pushing bike,pushing bike |
| a | c | ab,bc,bc | depart,right,arrive | cycling,pushing bike,pushing bike |
| b | d | bc,cd,cd | depart,left,arrive | pushing bike,cycling,cycling |
Scenario: Bike - Mode when pushing on pedestrain areas
Given the node map
@ -98,12 +97,12 @@ Feature: Bike - Mode flag
When I route I should get
| from | to | route | modes |
| a | f | ab,bcd,df | cycling,pushing bike,cycling |
| f | a | df,bcd,ab | cycling,pushing bike,cycling |
| d | a | bcd,ab | pushing bike,cycling |
| f | b | df,bcd | cycling,pushing bike |
| a | d | ab,bcd | cycling,pushing bike |
| b | f | bcd,df | pushing bike,cycling |
| a | f | ab,bcd,df,df | cycling,pushing bike,cycling,cycling |
| f | a | df,bcd,ab,ab | cycling,pushing bike,cycling,cycling |
| d | a | bcd,ab,ab | pushing bike,cycling,cycling |
| f | b | df,bcd,bcd | cycling,pushing bike,pushing bike |
| a | d | ab,bcd,bcd | cycling,pushing bike,pushing bike |
| b | f | bcd,df,df | pushing bike,cycling,cycling |
Scenario: Bike - Mode when pushing on steps
Given the node map
@ -118,12 +117,12 @@ Feature: Bike - Mode flag
When I route I should get
| from | to | route | turns | modes |
| a | d | ab,bc,cd | depart,right,left,arrive | cycling,pushing bike,cycling |
| d | a | cd,bc,ab | depart,right,left,arrive | cycling,pushing bike,cycling |
| c | a | bc,ab | depart,left,arrive | pushing bike,cycling |
| d | b | cd,bc | depart,right,arrive | cycling,pushing bike |
| a | c | ab,bc | depart,right,arrive | cycling,pushing bike |
| b | d | bc,cd | depart,left,arrive | pushing bike,cycling |
| a | d | ab,bc,cd,cd | depart,right,left,arrive | cycling,pushing bike,cycling,cycling |
| d | a | cd,bc,ab,ab | depart,right,left,arrive | cycling,pushing bike,cycling,cycling |
| c | a | bc,ab,ab | depart,left,arrive | pushing bike,cycling,cycling |
| d | b | cd,bc,bc | depart,right,arrive | cycling,pushing bike,pushing bike |
| a | c | ab,bc,bc | depart,right,arrive | cycling,pushing bike,pushing bike |
| b | d | bc,cd,cd | depart,left,arrive | pushing bike,cycling,cycling |
Scenario: Bike - Mode when bicycle=dismount
Given the node map
@ -138,12 +137,12 @@ Feature: Bike - Mode flag
When I route I should get
| from | to | route | turns | modes |
| a | d | ab,bc,cd | depart,right,left,arrive | cycling,pushing bike,cycling |
| d | a | cd,bc,ab | depart,right,left,arrive | cycling,pushing bike,cycling |
| c | a | bc,ab | depart,left,arrive | pushing bike,cycling |
| d | b | cd,bc | depart,right,arrive | cycling,pushing bike |
| a | c | ab,bc | depart,right,arrive | cycling,pushing bike |
| b | d | bc,cd | depart,left,arrive | pushing bike,cycling |
| a | d | ab,bc,cd,cd | depart,right,left,arrive | cycling,pushing bike,cycling,cycling |
| d | a | cd,bc,ab,ab | depart,right,left,arrive | cycling,pushing bike,cycling,cycling |
| c | a | bc,ab,ab | depart,left,arrive | pushing bike,cycling,cycling |
| d | b | cd,bc,bc | depart,right,arrive | cycling,pushing bike,pushing bike |
| a | c | ab,bc,bc | depart,right,arrive | cycling,pushing bike,pushing bike |
| b | d | bc,cd,cd | depart,left,arrive | pushing bike,cycling,cycling |
Scenario: Bicycle - Modes when starting on forward oneway
Given the node map
@ -155,8 +154,8 @@ Feature: Bike - Mode flag
When I route I should get
| from | to | route | modes |
| a | b | ab | cycling |
| b | a | ab | pushing bike |
| a | b | ab,ab | cycling,cycling |
| b | a | ab,ab | pushing bike,pushing bike |
Scenario: Bicycle - Modes when starting on reverse oneway
Given the node map
@ -168,5 +167,5 @@ Feature: Bike - Mode flag
When I route I should get
| from | to | route | modes |
| a | b | ab | pushing bike |
| b | a | ab | cycling |
| a | b | ab,ab | pushing bike,pushing bike |
| b | a | ab,ab | cycling,cycling |

View File

@ -16,7 +16,7 @@ Feature: Bike - Street names in instructions
When I route I should get
| from | to | route |
| a | c | My Way,Your Way |
| a | c | My Way,Your Way,Your Way |
@unnamed
Scenario: Bike - Use way type to describe unnamed ways
@ -30,4 +30,4 @@ Feature: Bike - Street names in instructions
When I route I should get
| from | to | route |
| a | d | {highway:cycleway},{highway:track} |
| a | d | {highway:cycleway},{highway:track},{highway:track} |

View File

@ -30,8 +30,8 @@ Feature: Bike - Oneway streets
When I route I should get
| from | to | route |
| a | b | ab |
| b | a | bc,cd,da |
| a | b | ab,ab |
| b | a | bc,cd,da,da |
Scenario: Bike - Handle various oneway tag values
Then routability should be
@ -125,4 +125,4 @@ Feature: Bike - Oneway streets
When I route I should get
| from | to | route |
| a | c | ab,bc |
| a | c | ab,bc,bc |

View File

@ -46,14 +46,14 @@ Feature: Bike - Accessability of different way types
When I route I should get
| from | to | route |
| a | b | abcda |
| a | d | abcda |
| b | c | abcda |
| c | b | abcda |
| c | d | abcda |
| d | c | abcda |
| d | a | abcda |
| a | d | abcda |
| a | b | abcda,abcda |
| a | d | abcda,abcda |
| b | c | abcda,abcda |
| c | b | abcda,abcda |
| c | d | abcda,abcda |
| d | c | abcda,abcda |
| d | a | abcda,abcda |
| a | d | abcda,abcda |
Scenario: Bike - Pushing bikes on ways with foot=yes
Then routability should be
@ -99,10 +99,10 @@ Feature: Bike - Accessability of different way types
When I route I should get
| from | to | route | turns |
| a | d | ab,bc,cd | depart,right,left,arrive |
| d | a | cd,bc,ab | depart,right,left,arrive |
| c | a | bc,ab | depart,left,arrive |
| d | b | cd,bc | depart,right,arrive |
| a | d | ab,bc,cd,cd | depart,right,left,arrive |
| d | a | cd,bc,ab,ab | depart,right,left,arrive |
| c | a | bc,ab,ab | depart,left,arrive |
| d | b | cd,bc,bc | depart,right,arrive |
@todo
Scenario: Bike - Instructions when pushing bike on footway/pedestrian, etc.
@ -118,7 +118,7 @@ Feature: Bike - Accessability of different way types
When I route I should get
| from | to | route | turns |
| a | d | ab,bc,cd | depart,right,left,arrive |
| d | a | cd,bc,ab | depart,right,left,arrive |
| c | a | bc,ab | depart,left,arrive |
| d | b | cd,bc | depart,right,arrive |
| a | d | ab,bc,cd,cd | depart,right,left,arrive |
| d | a | cd,bc,ab,ab | depart,right,left,arrive |
| c | a | bc,ab,ab | depart,left,arrive |
| d | b | cd,bc,bc | depart,right,arrive |

View File

@ -14,7 +14,7 @@ Feature: Bike - Way ref
When I route I should get
| from | to | route |
| a | b | Utopia Drive / E7 |
| a | b | Utopia Drive / E7,Utopia Drive / E7 |
Scenario: Bike - Way with only ref
Given the node map
@ -26,7 +26,7 @@ Feature: Bike - Way ref
When I route I should get
| from | to | route |
| a | b | E7 |
| a | b | E7,E7 |
Scenario: Bike - Way with only name
Given the node map
@ -38,4 +38,4 @@ Feature: Bike - Way ref
When I route I should get
| from | to | route |
| a | b | Utopia Drive |
| a | b | Utopia Drive,Utopia Drive |

View File

@ -26,9 +26,9 @@ Feature: Bike - Turn restrictions
When I route I should get
| from | to | route |
| s | w | sj,wj |
| s | n | sj,nj |
| s | e | sj,ej |
| s | w | sj,wj,wj |
| s | n | sj,nj,nj |
| s | e | sj,ej,ej |
@no_turning
Scenario: Bike - No right turn
@ -50,9 +50,9 @@ Feature: Bike - Turn restrictions
When I route I should get
| from | to | route |
| s | w | sj,wj |
| s | n | sj,nj |
| s | e | sj,ej |
| s | w | sj,wj,wj |
| s | n | sj,nj,nj |
| s | e | sj,ej,ej |
@no_turning
Scenario: Bike - No u-turn
@ -74,9 +74,9 @@ Feature: Bike - Turn restrictions
When I route I should get
| from | to | route |
| s | w | sj,wj |
| s | n | sj,nj |
| s | e | sj,ej |
| s | w | sj,wj,wj |
| s | n | sj,nj,nj |
| s | e | sj,ej,ej |
@no_turning
Scenario: Bike - Handle any no_* relation
@ -98,9 +98,9 @@ Feature: Bike - Turn restrictions
When I route I should get
| from | to | route |
| s | w | sj,wj |
| s | n | sj,nj |
| s | e | sj,ej |
| s | w | sj,wj,wj |
| s | n | sj,nj,nj |
| s | e | sj,ej,ej |
@only_turning
Scenario: Bike - Only left turn
@ -122,9 +122,9 @@ Feature: Bike - Turn restrictions
When I route I should get
| from | to | route |
| s | w | sj,wj |
| s | n | sj,nj |
| s | e | sj,ej |
| s | w | sj,wj,wj |
| s | n | sj,nj,nj |
| s | e | sj,ej,ej |
@only_turning
Scenario: Bike - Only right turn
@ -146,9 +146,9 @@ Feature: Bike - Turn restrictions
When I route I should get
| from | to | route |
| s | w | sj,wj |
| s | n | sj,nj |
| s | e | sj,ej |
| s | w | sj,wj,wj |
| s | n | sj,nj,nj |
| s | e | sj,ej,ej |
@only_turning
Scenario: Bike - Only straight on
@ -170,9 +170,9 @@ Feature: Bike - Turn restrictions
When I route I should get
| from | to | route |
| s | w | sj,wj |
| s | n | sj,nj |
| s | e | sj,ej |
| s | w | sj,wj,wj |
| s | n | sj,nj,nj |
| s | e | sj,ej,ej |
@no_turning
Scenario: Bike - Handle any only_* restriction
@ -194,9 +194,9 @@ Feature: Bike - Turn restrictions
When I route I should get
| from | to | route |
| s | w | sj,wj |
| s | n | sj,nj |
| s | e | sj,ej |
| s | w | sj,wj,wj |
| s | n | sj,nj,nj |
| s | e | sj,ej,ej |
@except
Scenario: Bike - Except tag and on no_ restrictions
@ -223,10 +223,10 @@ Feature: Bike - Turn restrictions
When I route I should get
| from | to | route |
| s | a | sj,aj |
| s | b | sj,bj |
| s | c | sj,cj |
| s | d | sj,dj |
| s | a | sj,aj,aj |
| s | b | sj,bj,bj |
| s | c | sj,cj,cj |
| s | d | sj,dj,dj |
@except
Scenario: Bike - Except tag and on only_ restrictions
@ -247,8 +247,8 @@ Feature: Bike - Turn restrictions
When I route I should get
| from | to | route |
| s | a | sj,aj |
| s | b | sj,bj |
| s | a | sj,aj,aj |
| s | b | sj,bj,bj |
@except
Scenario: Bike - Multiple except tag values
@ -281,9 +281,9 @@ Feature: Bike - Turn restrictions
When I route I should get
| from | to | route |
| s | a | sj,ja |
| s | b | sj,jb |
| s | c | sj,jc |
| s | d | sj,jd |
| s | e | sj,je |
| s | f | sj,jf |
| s | a | sj,ja,ja |
| s | b | sj,jb,jb |
| s | c | sj,jc,jc |
| s | d | sj,jd,jd |
| s | e | sj,je,je |
| s | f | sj,jf,jf |

View File

@ -22,9 +22,9 @@ Feature: Roundabout Instructions
When I route I should get
| from | to | route | turns |
| s | t | sa,tb | depart,roundabout-exit-1,arrive |
| s | u | sa,uc | depart,roundabout-exit-2,arrive |
| s | v | sa,vd | depart,roundabout-exit-3,arrive |
| u | v | uc,vd | depart,roundabout-exit-1,arrive |
| u | s | uc,sa | depart,roundabout-exit-2,arrive |
| u | t | uc,tb | depart,roundabout-exit-3,arrive |
| s | t | sa,tb,tb | depart,roundabout-exit-1,arrive |
| s | u | sa,uc,uc | depart,roundabout-exit-2,arrive |
| s | v | sa,vd,vd | depart,roundabout-exit-3,arrive |
| u | v | uc,vd,vd | depart,roundabout-exit-1,arrive |
| u | s | uc,sa,sa | depart,roundabout-exit-2,arrive |
| u | t | uc,tb,tb | depart,roundabout-exit-3,arrive |

View File

@ -32,6 +32,6 @@ Feature: Bike - Stop areas for public transport
When I route I should get
| from | to | route |
| a | d | abcd |
| s | t | st |
| s | d | /st,.+,abcd/ |
| a | d | abcd,abcd |
| s | t | st,st |
| s | d | /st,.+,abcd/,abcd/ |

View File

@ -24,10 +24,10 @@ Feature: Turn Penalties
When I route I should get
| from | to | route | time | distance |
| s | a | sj,ja | 39s +-1 | 242m +-1 |
| s | b | sj,jb | 30s +-1 | 200m +-1 |
| s | c | sj,jc | 29s +-1 | 242m +-1 |
| s | d | sj,jd | 20s +-1 | 200m +-1 |
| s | e | sj,je | 29s +-1 | 242m +-1 |
| s | f | sj,jf | 30s +-1 | 200m +-1 |
| s | g | sj,jg | 39s +-1 | 242m +-1 |
| s | a | sj,ja,ja | 39s +-1 | 242m +-1 |
| s | b | sj,jb,jb | 30s +-1 | 200m +-1 |
| s | c | sj,jc,jc | 29s +-1 | 242m +-1 |
| s | d | sj,jd,jd | 20s +-1 | 200m +-1 |
| s | e | sj,je,je | 29s +-1 | 242m +-1 |
| s | f | sj,jf,jf | 30s +-1 | 200m +-1 |
| s | g | sj,jg,jg | 39s +-1 | 242m +-1 |