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

assertion for correct weight data

Browse Source
This commit is contained in:
Michael Krasnyk 2017-02-02 10:56:52 +01:00 committed by Patrick Niklaus
parent 9e5d45d86a
commit 5f1c7efd41
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/extractor/extractor_callbacks.cpp
View File

@ -142,15 +142,16 @@ void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const Extracti
forward_duration_data = forward_duration_data =
toValueByEdgeOrByMeter(parsed_way.duration, parsed_way.forward_speed / 3.6); toValueByEdgeOrByMeter(parsed_way.duration, parsed_way.forward_speed / 3.6);
// fallback to duration as weight // fallback to duration as weight
if (parsed_way.weight > 0 || parsed_way.forward_rate > 0) if (fallback_to_duration)
{
forward_weight_data =
toValueByEdgeOrByMeter(parsed_way.weight, parsed_way.forward_rate);
}
else if (fallback_to_duration)
{ {
forward_weight_data = forward_duration_data; forward_weight_data = forward_duration_data;
} }
else
{
BOOST_ASSERT(parsed_way.weight > 0 || parsed_way.forward_rate > 0);
forward_weight_data =
toValueByEdgeOrByMeter(parsed_way.weight, parsed_way.forward_rate);
}
} }
if (parsed_way.backward_travel_mode != TRAVEL_MODE_INACCESSIBLE) if (parsed_way.backward_travel_mode != TRAVEL_MODE_INACCESSIBLE)
{ {
@ -158,15 +159,16 @@ void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const Extracti
backward_duration_data = backward_duration_data =
toValueByEdgeOrByMeter(parsed_way.duration, parsed_way.backward_speed / 3.6); toValueByEdgeOrByMeter(parsed_way.duration, parsed_way.backward_speed / 3.6);
// fallback to duration as weight // fallback to duration as weight
if (parsed_way.weight > 0 || parsed_way.backward_rate > 0) if (fallback_to_duration)
{
backward_weight_data =
toValueByEdgeOrByMeter(parsed_way.weight, parsed_way.backward_rate);
}
else if (fallback_to_duration)
{ {
backward_weight_data = backward_duration_data; backward_weight_data = backward_duration_data;
} }
else
{
BOOST_ASSERT(parsed_way.weight > 0 || parsed_way.backward_rate > 0);
backward_weight_data =
toValueByEdgeOrByMeter(parsed_way.weight, parsed_way.backward_rate);
}
} }
const auto laneStringToDescription = [](const std::string &lane_string) -> TurnLaneDescription { const auto laneStringToDescription = [](const std::string &lane_string) -> TurnLaneDescription {