Merge branch 'master' of https://DennisOSRM@github.com/DennisOSRM/Project-OSRM.git

Rakefile

@@ -64,6 +64,7 @@ def write_server_ini osm_file
 
   hsgrData=#{DATA_FOLDER}/#{osm_file}.osrm.hsgr
   nodesData=#{DATA_FOLDER}/#{osm_file}.osrm.nodes
+  edgesData=#{DATA_FOLDER}/#{osm_file}.osrm.edges
   ramIndex=#{DATA_FOLDER}/#{osm_file}.osrm.ramIndex
   fileIndex=#{DATA_FOLDER}/#{osm_file}.osrm.fileIndex
   namesData=#{DATA_FOLDER}/#{osm_file}.osrm.names

features/step_definitions/processing.rb

@@ -58,6 +58,7 @@ Given /^the preprocessed files for "([^"]*)" are present and up to date$/ do |ar
   File.exists?("#{area}.osrm.restrictions").should == true
   File.exists?("#{area}.osrm.hsgr").should == true
   File.exists?("#{area}.osrm.nodes").should == true
+  File.exists?("#{area}.osrm.edges").should == true
   File.exists?("#{area}.osrm.ramIndex").should == true
   File.exists?("#{area}.osrm.fileIndex").should == true
 end

features/support/config.rb

@@ -10,7 +10,7 @@ end
 def read_speedprofile profile
   @speedprofile = {}
   @speedprofile_str = nil
-  s = File.read "speedprofiles/#{profile}.ini"
+  s = File.read "test/speedprofiles/#{profile}.ini"
   s.scan /(.*)=(.*)/ do |option|
     @speedprofile[option[0].strip] = option[1].strip
   end
@@ -32,6 +32,7 @@ Port = 5000
 
 hsgrData=#{@osm_file}.osrm.hsgr
 nodesData=#{@osm_file}.osrm.nodes
+edgesData=#{@osm_file}.osrm.edges
 ramIndex=#{@osm_file}.osrm.ramIndex
 fileIndex=#{@osm_file}.osrm.fileIndex
 namesData=#{@osm_file}.osrm.names

features/time.feature

@@ -6,9 +6,6 @@ Feature: Estimation of travel time
 	
 	Background: Use specific speeds
 		Given the speedprofile "bicycle"
-		And the speedprofile settings
-		 | primary | 15 |
-		 | footway | 5 |
 
 	Scenario: Basic travel time, 1m scale
 		Given a grid size of 1 meters
@@ -179,4 +176,3 @@ Feature: Estimation of travel time
 		 | 4    | 3  | ab    | 24s  |
 		 | 4    | 2  | ab    | 48s  |
 		 | 4    | 1  | ab    | 72s  |
-

test/speedprofiles/bicycle.ini

@@ -0,0 +1,10 @@
+[bicycle]
+	accessTag				= bicycle
+	obeyOneways				= yes
+	obeyBollards			= no
+	useRestrictions 		= yes
+	takeMinimumOfSpeeds 	= yes
+	defaultSpeed			= 15
+	primary					= 15
+	cycleway				= 15
+	footway					= 5

test/speedprofiles/car.ini

@@ -0,0 +1,23 @@
+[car]
+	accessTag		= motorcar
+	defaultSpeed	= 50
+	obeyOneways		= yes
+	useRestrictions = yes
+	barrier			= bollard
+	
+	motorway		= 100
+	motorway_link   = 90
+	trunk           = 90
+	trunk_link      = 70
+	primary         = 70
+	primary_link    = 60
+	secondary       = 60
+	secondary_link  = 50
+	tertiary        = 50
+	tertiary_link   = 40
+	road			= 40
+	residential     = 40
+	unclassified    = 30
+	service         = 20
+	living_street   = 10
+

test/speedprofiles/foot.ini

@@ -0,0 +1,28 @@
+[foot]
+	accessTag		= foot
+	defaultSpeed	= 5
+	obeyOneways		= no
+	useRestrictions = no
+	obeyBollards	= no
+
+	primary         = 5
+	primary_link    = 5
+	secondary       = 5
+	secondary_link  = 5
+	tertiary        = 5
+	residential     = 5
+	unclassified    = 5
+	living_street   = 5
+	road		    = 5
+	service         = 5
+	track			= 5
+	path			= 5
+	cycleway		= 5
+	footway			= 5
+	pedestrian		= 5
+	pier			= 5
+	steps			= 2
+	
+	ferry			= 5
+
+	excludeFromGrid = ferry