Fix the propfile properties reading/writing

This commit is contained in:
Patrick Niklaus
2017-06-16 09:30:37 +00:00
committed by Patrick Niklaus
parent 383640caaf
commit 4f13208ce8
5 changed files with 34 additions and 15 deletions
+1 -9
View File
@@ -347,7 +347,7 @@ std::vector<TurnRestriction> Extractor::ParseOSMData(ScriptingEnvironment &scrip
config.restriction_file_name,
config.names_file_name);
WriteProfileProperties(config.profile_properties_output_path,
files::writeProfileProperties(config.profile_properties_output_path,
scripting_environment.GetProfileProperties());
TIMER_STOP(extracting);
@@ -356,14 +356,6 @@ std::vector<TurnRestriction> Extractor::ParseOSMData(ScriptingEnvironment &scrip
return extraction_containers.unconditional_turn_restrictions;
}
void Extractor::WriteProfileProperties(const std::string &output_path,
const ProfileProperties &properties) const
{
storage::io::FileWriter file(output_path, storage::io::FileWriter::GenerateFingerprint);
file.WriteOne(properties);
}
void Extractor::FindComponents(unsigned max_edge_id,
const util::DeallocatingVector<EdgeBasedEdge> &input_edge_list,
const std::vector<EdgeBasedNodeSegment> &input_node_segments,
+1 -4
View File
@@ -819,12 +819,9 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr)
// load profile properties
{
io::FileReader profile_properties_file(config.properties_path,
io::FileReader::VerifyFingerprint);
const auto profile_properties_ptr = layout.GetBlockPtr<extractor::ProfileProperties, true>(
memory_ptr, DataLayout::PROPERTIES);
profile_properties_file.ReadInto(profile_properties_ptr,
layout.num_entries[DataLayout::PROPERTIES]);
extractor::files::readProfileProperties(config.properties_path, *profile_properties_ptr);
}
// Load intersection data