Merge pull request #459 from ibikecph/cuke_cache_names

add scenario names to cache files, makes it easier to inspect .osm files...
This commit is contained in:
Project OSRM 2012-09-28 13:14:54 -07:00
commit 6f00e8c936

View File

@ -17,6 +17,10 @@ DEFAULT_GRID_SIZE = 100 #meters
ORIGIN = [1,1] ORIGIN = [1,1]
def sanitized_scenario_title
@sanitized_scenario_title ||= @scenario_title.gsub /[^0-9A-Za-z.\-]/, '_'
end
def set_grid_size meters def set_grid_size meters
#the constant is calculated (with BigDecimal as: 1.0/(DEG_TO_RAD*EARTH_RADIUS_IN_METERS #the constant is calculated (with BigDecimal as: 1.0/(DEG_TO_RAD*EARTH_RADIUS_IN_METERS
#see ApproximateDistance() in ExtractorStructs.h #see ApproximateDistance() in ExtractorStructs.h
@ -134,10 +138,10 @@ def osm_str
@osm_str @osm_str
end end
def write_osm def write_osm
#write .oms file if needed #write .oms file if needed
Dir.mkdir DATA_FOLDER unless File.exist? DATA_FOLDER Dir.mkdir DATA_FOLDER unless File.exist? DATA_FOLDER
@osm_file = "#{DATA_FOLDER}/#{fingerprint}" @osm_file = "#{DATA_FOLDER}/#{sanitized_scenario_title}_#{fingerprint}"
unless File.exist?("#{@osm_file}.osm") unless File.exist?("#{@osm_file}.osm")
File.open( "#{@osm_file}.osm", 'w') {|f| f.write(osm_str) } File.open( "#{@osm_file}.osm", 'w') {|f| f.write(osm_str) }
end end
@ -162,8 +166,7 @@ def extracted?
end end
def prepared? def prepared?
base = "#{DATA_FOLDER}/#{fingerprint}" File.exist?("#{@osm_file}.osrm.hsgr")
File.exist?("#{base}.osrm.hsgr")
end end
def reprocess def reprocess