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

Port over profile properties

Browse Source
This commit is contained in:
Patrick Niklaus
2018-03-16 16:50:30 +00:00
parent 5d1b4ce71d
commit c61198b26b
4 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/storage/storage.cpp
+3 -5
View File
@@ -302,10 +302,6 @@ void Storage::PopulateLayout(DataLayout &layout)
make_block<std::uint64_t>(tree_levels_size));
}
{
layout.SetBlock(DataLayout::PROPERTIES, make_block<extractor::ProfileProperties>(1));
}
// read timestampsize
{
io::FileReader timestamp_file(config.GetPath(".osrm.timestamp"),
@@ -468,6 +464,7 @@ void Storage::PopulateLayout(DataLayout &layout)
{"/common/intersection_bearings/class_id_to_ranges/block_offsets", DataLayout::BEARING_OFFSETS},
{"/common/intersection_bearings/class_id_to_ranges/diff_blocks", DataLayout::BEARING_BLOCKS},
{"/common/entry_classes", DataLayout::ENTRY_CLASS},
{"/common/properties", DataLayout::PROPERTIES},
};
std::vector<NamedBlock> blocks;
@@ -479,7 +476,8 @@ void Storage::PopulateLayout(DataLayout &layout)
{OPTIONAL, config.GetPath(".osrm.partition")},
{OPTIONAL, config.GetPath(".osrm.cell_metrics")},
{OPTIONAL, config.GetPath(".osrm.hsgr")},
{REQUIRED, config.GetPath(".osrm.icd")}
{REQUIRED, config.GetPath(".osrm.icd")},
{REQUIRED, config.GetPath(".osrm.properties")}
};
for (const auto &file : tar_files)