From f41495dc7ade87ec46a5c3e2602c81b4c35e440a Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Tue, 6 Mar 2012 15:05:52 +0100 Subject: [PATCH] osrm-prepare still reads xml, so avoid converting to pfb format. avoids dependency on osmosis tool --- features/support/data.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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