Skip to content

Commit

Permalink
Add proper support for travis CI
Browse files Browse the repository at this point in the history
Conflicts:
	.travis.yml
  • Loading branch information
Dennis Luxen committed Jul 31, 2013
2 parents 111e688 + f03d1a5 commit ef1d75d
Showing 4 changed files with 70 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -19,6 +19,9 @@ branches:
only:
- master
- develop
env:
- OPTIONS="-DCMAKE_BUILD_TYPE=Release"
- OPTIONS="-DCMAKE_BUILD_TYPE=Debug"
notifications:
irc:
channels:
30 changes: 30 additions & 0 deletions features/bicycle/roundabout.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
@routing @bicycle @roundabout @instruction
Feature: Roundabout Instructions

Background:
Given the profile "bicycle"

Scenario: Bicycle - Roundabout instructions
Given the node map
| | | v | | |
| | | d | | |
| s | a | | c | u |
| | | b | | |
| | | t | | |

And the ways
| nodes | junction |
| sa | |
| tb | |
| uc | |
| vd | |
| abcda | roundabout |

When I route I should get
| from | to | route | turns |
| s | t | sa,tb | head,enter_roundabout-1,destination |
| s | u | sa,uc | head,enter_roundabout-2,destination |
| s | v | sa,vd | head,enter_roundabout-3,destination |
| u | v | uc,vd | head,enter_roundabout-1,destination |
| u | s | uc,sa | head,enter_roundabout-2,destination |
| u | t | uc,tb | head,enter_roundabout-3,destination |
30 changes: 30 additions & 0 deletions features/car/roundabout.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
@routing @car @roundabout @instruction
Feature: Roundabout Instructions

Background:
Given the profile "car"

Scenario: Car - Roundabout instructions
Given the node map
| | | v | | |
| | | d | | |
| s | a | | c | u |
| | | b | | |
| | | t | | |

And the ways
| nodes | junction |
| sa | |
| tb | |
| uc | |
| vd | |
| abcda | roundabout |

When I route I should get
| from | to | route | turns |
| s | t | sa,tb | head,enter_roundabout-1,destination |
| s | u | sa,uc | head,enter_roundabout-2,destination |
| s | v | sa,vd | head,enter_roundabout-3,destination |
| u | v | uc,vd | head,enter_roundabout-1,destination |
| u | s | uc,sa | head,enter_roundabout-2,destination |
| u | t | uc,tb | head,enter_roundabout-3,destination |
10 changes: 7 additions & 3 deletions features/support/route.rb
Original file line number Diff line number Diff line change
@@ -122,9 +122,13 @@ def turn_list instructions
16 => :enter_contraflow,
17 => :leave_contraflow
}
instructions.
map { |r| types[r[0].to_i].to_s }.
join(',')
# replace instructions codes with strings
# "11-3" (enter roundabout and leave a 3rd exit) gets converted to "enter_roundabout-3"
instructions.map do |r|
r[0].to_s.gsub!(/^\d*/) do |match|
types[match.to_i].to_s
end
end.join(',')
end

def mode_list instructions

2 comments on commit ef1d75d

@emiltin
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wonder why the roundabout stuff got bundled with this commit. but oh well

@DennisOSRM
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, something fishy happened. I had to manually clean up. It appears to be fine now.

Please sign in to comment.