osrm-prepare still reads xml, so avoid converting to pfb format. avoids dependency on osmosis tool

This commit is contained in:
Emil Tin 2012-03-06 15:05:52 +01:00
parent 8200f889fb
commit f41495dc7a

View File

@ -166,11 +166,11 @@ def reprocess
Dir.chdir TEST_FOLDER do Dir.chdir TEST_FOLDER do
write_speedprofile write_speedprofile
write_osm write_osm
convert_osm_to_pbf #convert_osm_to_pbf
unless extracted? unless extracted?
log_preprocess_info log_preprocess_info
log "== Extracting #{@osm_file}.osm...", :preprocess 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 log "*** Exited with code #{$?.exitstatus}.", :preprocess
raise "*** osrm-extract exited with code #{$?.exitstatus}. The file preprocess.log might contain more info." raise "*** osrm-extract exited with code #{$?.exitstatus}. The file preprocess.log might contain more info."
end end