Rename .nodes -> .nbg_nodes and .nodes_data -> .ebg_nodes

This commit is contained in:
Michael Krasnyk
2017-05-15 23:49:02 +02:00
committed by Patrick Niklaus
parent 65de940882
commit 1a7cd785f2
9 changed files with 44 additions and 72 deletions
+3 -2
View File
@@ -327,7 +327,8 @@ void Storage::PopulateLayout(DataLayout &layout)
// load coordinate size
{
io::FileReader node_file(config.nodes_data_path, io::FileReader::VerifyFingerprint);
io::FileReader node_file(config.node_based_nodes_data_path,
io::FileReader::VerifyFingerprint);
const auto coordinate_list_size = node_file.ReadElementCount64();
layout.SetBlockSize<util::Coordinate>(DataLayout::COORDINATE_LIST, coordinate_list_size);
node_file.Skip<util::Coordinate>(coordinate_list_size);
@@ -724,7 +725,7 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr)
layout.num_entries[DataLayout::OSM_NODE_ID_LIST] *
extractor::PackedOSMIDsView::BLOCK_ELEMENTS);
extractor::files::readNodes(config.nodes_data_path, coordinates, osm_node_ids);
extractor::files::readNodes(config.node_based_nodes_data_path, coordinates, osm_node_ids);
}
// load turn weight penalties