Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Do not convert osm xml files to pbf for the cucumber tests

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-01-13 14:41:55 +01:00 committed by Patrick Niklaus
parent 43dcdb21ec
commit 9959fd26bb
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
features/support/data.rb
View File

@ -229,17 +229,6 @@ def write_osm
end end
end end
def convert_osm_to_pbf
unless File.exist?("#{osm_file}.osm.pbf")
log_preprocess_info
log "== Converting #{osm_file}.osm to protobuffer format...", :preprocess
unless system "osmosis --read-xml #{osm_file}.osm --write-pbf #{osm_file}.osm.pbf omitmetadata=true >>#{PREPROCESS_LOG_FILE} 2>&1"
raise OsmosisError.new $?, "osmosis exited with code #{$?.exitstatus}"
end
log '', :preprocess
end
end
def extracted? def extracted?
Dir.chdir TEST_FOLDER do Dir.chdir TEST_FOLDER do
File.exist?("#{extracted_file}.osrm") && File.exist?("#{extracted_file}.osrm") &&
@ -258,15 +247,10 @@ def write_timestamp
File.open( "#{prepared_file}.osrm.timestamp", 'w') {|f| f.write(OSM_TIMESTAMP) } File.open( "#{prepared_file}.osrm.timestamp", 'w') {|f| f.write(OSM_TIMESTAMP) }
end end
def pbf?
input_format=='pbf'
end
def write_input_data def write_input_data
Dir.chdir TEST_FOLDER do Dir.chdir TEST_FOLDER do
write_osm write_osm
write_timestamp write_timestamp
convert_osm_to_pbf if pbf?
end end
end end
@ -274,7 +258,7 @@ def extract_data
Dir.chdir TEST_FOLDER do Dir.chdir TEST_FOLDER do
log_preprocess_info log_preprocess_info
log "== Extracting #{osm_file}.osm...", :preprocess log "== Extracting #{osm_file}.osm...", :preprocess
unless system "#{BIN_PATH}/osrm-extract #{osm_file}.osm#{'.pbf' if pbf?} #{@extract_args} --profile #{PROFILES_PATH}/#{@profile}.lua >>#{PREPROCESS_LOG_FILE} 2>&1" unless system "#{BIN_PATH}/osrm-extract #{osm_file}.osm #{@extract_args} --profile #{PROFILES_PATH}/#{@profile}.lua >>#{PREPROCESS_LOG_FILE} 2>&1"
log "*** Exited with code #{$?.exitstatus}.", :preprocess log "*** Exited with code #{$?.exitstatus}.", :preprocess
raise ExtractError.new $?.exitstatus, "osrm-extract exited with code #{$?.exitstatus}." raise ExtractError.new $?.exitstatus, "osrm-extract exited with code #{$?.exitstatus}."
end end

6
features/support/exceptions.rb
View File

@ -37,12 +37,6 @@ class FileError < OSRMError
end end
end end
class OsmosisError < OSRMError
def initialize code, msg
super 'osmosis', code, msg, PREPROCESS_LOG_FILE, 40
end
end
class ExtractError < OSRMError class ExtractError < OSRMError
def initialize code, msg def initialize code, msg
super 'osrm-extract', code, msg, PREPROCESS_LOG_FILE, 3 super 'osrm-extract', code, msg, PREPROCESS_LOG_FILE, 3