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

Always use original weights when handling --parse-conditionals-from-now

Browse Source
This commit is contained in:
Siarhei Fedartsou 2022-10-11 23:04:20 +02:00
parent 4026ed54c0
commit 9fd452f6af
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
features/car/conditional_restrictions.feature
View File

@ -353,6 +353,18 @@ Feature: Car - Turn restrictions
| b | a | bj,jc,jc,aj,aj |
| b | d | bj,jd,jd |
# here we check that conditional restrictions can be updated via re-run of `contract`/`customize` with updated `--parse-conditionals-from-now`
# 10am utc, sat
When I run "osrm-contract {osm_file} --time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1494064800"
When I run "osrm-customize {osm_file} --time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1494064800"
When I route I should get
| from | to | route |
| b | c | bj,jc,jc |
| b | a | bj,aj,aj |
| b | d | bj,jd,jd |
@no_turning @conditionals
Scenario: Car - Conditional restriction with multiple time windows
Given the extract extra arguments "--parse-conditional-restrictions"

11
src/updater/updater.cpp
View File

@ -583,8 +583,15 @@ Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &e
[&] { extractor::files::readNodeData(config.GetPath(".osrm.ebg_nodes"), node_data); },
[&] {
extractor::files::readTurnWeightPenalty(
config.GetPath(".osrm.turn_weight_penalties"), turn_weight_penalties);
// we are going to overwrite this `.turn_weight_penalties` afterwards,
// so here we backup the original turn penalties if we didn't do that yet in order to
// guarantee that subsequent runs of this code will work on top of original weights
auto path = config.GetPath(".osrm.turn_weight_penalties").string() + ".original";
if (!boost::filesystem::exists(path))
{
boost::filesystem::copy_file(config.GetPath(".osrm.turn_weight_penalties"), path);
}
extractor::files::readTurnWeightPenalty(path, turn_weight_penalties);
},
[&] {
extractor::files::readTurnDurationPenalty(