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

Split if in ProcessWay to comform to old behavior

Browse Source
This commit is contained in:
Patrick Niklaus 2017-01-31 11:36:38 +00:00 committed by Patrick Niklaus
parent 9d2628b74f
commit eaed5c7a8e
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/extractor/extractor_callbacks.cpp
View File

@ -83,13 +83,21 @@ void ExtractorCallbacks::ProcessRestriction(
*/ */
void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const ExtractionWay &parsed_way) void ExtractorCallbacks::ProcessWay(const osmium::Way &input_way, const ExtractionWay &parsed_way)
{ {
if ((parsed_way.forward_travel_mode == TRAVEL_MODE_INACCESSIBLE && if ((parsed_way.forward_travel_mode == TRAVEL_MODE_INACCESSIBLE ||
parsed_way.backward_travel_mode == TRAVEL_MODE_INACCESSIBLE) || parsed_way.forward_speed <= 0) &&
(parsed_way.forward_speed <= 0 && parsed_way.backward_speed <= 0 && (parsed_way.backward_travel_mode == TRAVEL_MODE_INACCESSIBLE ||
parsed_way.duration <= 0) || parsed_way.backward_speed <= 0) &&
(!fallback_to_duration && parsed_way.forward_rate <= 0 && parsed_way.backward_rate <= 0 && parsed_way.duration <= 0)
parsed_way.weight <= 0)) { // Only true if the way is assigned a valid speed/duration
{ // Only true if the way is specified by the speed profile return;
}
if (!fallback_to_duration && (parsed_way.forward_travel_mode == TRAVEL_MODE_INACCESSIBLE ||
parsed_way.forward_rate <= 0) &&
(parsed_way.backward_travel_mode == TRAVEL_MODE_INACCESSIBLE ||
parsed_way.backward_rate <= 0) &&
parsed_way.weight <= 0)
{ // Only true if the way is assigned a valid rate/weight and there is no duration fallback
return; return;
} }