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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/storage/storage.cpp
+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
src/storage/storage_config.cpp
+7 -6
View File
@@ -26,11 +26,11 @@ bool CheckFileList(const std::vector<boost::filesystem::path> &files)
StorageConfig::StorageConfig(const boost::filesystem::path &base)
: ram_index_path{base.string() + ".ramIndex"}, file_index_path{base.string() + ".fileIndex"},
hsgr_data_path{base.string() + ".hsgr"}, nodes_data_path{base.string() + ".nodes"},
edges_data_path{base.string() + ".edges"},
edge_based_nodes_data_path{base.string() + ".nodes_data"},
core_data_path{base.string() + ".core"}, geometries_path{base.string() + ".geometry"},
timestamp_path{base.string() + ".timestamp"},
hsgr_data_path{base.string() + ".hsgr"},
node_based_nodes_data_path{base.string() + ".nbg_nodes"},
edge_based_nodes_data_path{base.string() + ".ebg_nodes"},
edges_data_path{base.string() + ".edges"}, core_data_path{base.string() + ".core"},
geometries_path{base.string() + ".geometry"}, timestamp_path{base.string() + ".timestamp"},
turn_weight_penalties_path{base.string() + ".turn_weight_penalties"},
turn_duration_penalties_path{base.string() + ".turn_duration_penalties"},
datasource_names_path{base.string() + ".datasource_names"},
@@ -47,7 +47,8 @@ bool StorageConfig::IsValid() const
// Common files
if (!CheckFileList({ram_index_path,
file_index_path,
nodes_data_path,
node_based_nodes_data_path,
edge_based_nodes_data_path,
edges_data_path,
geometries_path,
timestamp_path,