diff --git a/features/support/data.rb b/features/support/data.rb index 04dbb418d..19cd0bd4b 100644 --- a/features/support/data.rb +++ b/features/support/data.rb @@ -166,11 +166,11 @@ def reprocess Dir.chdir TEST_FOLDER do write_speedprofile write_osm - convert_osm_to_pbf + #convert_osm_to_pbf unless extracted? log_preprocess_info log "== Extracting #{@osm_file}.osm...", :preprocess - unless system "../osrm-extract #{@osm_file}.osm.pbf 1>>#{PREPROCESS_LOG_FILE} 2>>#{PREPROCESS_LOG_FILE}" + unless system "../osrm-extract #{@osm_file}.osm 1>>#{PREPROCESS_LOG_FILE} 2>>#{PREPROCESS_LOG_FILE}" log "*** Exited with code #{$?.exitstatus}.", :preprocess raise "*** osrm-extract exited with code #{$?.exitstatus}. The file preprocess.log might contain more info." end diff --git a/features/support/route.rb b/features/support/route.rb index fda46c78d..097233e07 100644 --- a/features/support/route.rb +++ b/features/support/route.rb @@ -1,7 +1,7 @@ require 'net/http' def request_route a,b - @query = "http://localhost:5000/viaroute?start=#{a}&dest=#{b}&output=json&geomformat=cmp" + @query = "http://localhost:5000/viaroute?loc=#{a}&loc=#{b}&output=json&geomformat=cmp" #log @query uri = URI.parse @query Net::HTTP.get_response uri