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

replaces and/not with &&/! for windows

Browse Source
This commit is contained in:
Moritz Kobitzsch 2016-01-08 12:43:33 +01:00 committed by Patrick Niklaus
parent 21804aecdb
commit a2555983e6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/engine/api_response_generator.hpp
View File

@ -257,7 +257,7 @@ ApiResponseGenerator<DataFacadeT>::BuildRouteSegments(const Segments &segment_li
for (const auto &segment : segment_list.Get()) for (const auto &segment : segment_list.Get())
{ {
const auto current_turn = segment.turn_instruction; const auto current_turn = segment.turn_instruction;
if (extractor::TurnInstructionsClass::TurnIsNecessary(current_turn) and if (extractor::TurnInstructionsClass::TurnIsNecessary(current_turn) &&
(extractor::TurnInstruction::EnterRoundAbout != current_turn)) (extractor::TurnInstruction::EnterRoundAbout != current_turn))
{ {

10
include/engine/guidance/segment_list.hpp
View File

@ -77,7 +77,7 @@ SegmentList<DataFacadeT>::SegmentList(const InternalRouteResult &raw_route,
const DataFacade *facade) const DataFacade *facade)
: total_distance(0), total_duration(0) : total_distance(0), total_duration(0)
{ {
if (not raw_route.is_valid()) if (!raw_route.is_valid())
{ {
return; return;
} }
@ -105,7 +105,7 @@ SegmentList<DataFacadeT>::SegmentList(const InternalRouteResult &raw_route,
} }
} }
if (not allow_simplification) if (!allow_simplification)
{ {
// to prevent any simplifications, we mark all segments as necessary // to prevent any simplifications, we mark all segments as necessary
for (auto &segment : segments) for (auto &segment : segments)
@ -178,7 +178,7 @@ void SegmentList<DataFacadeT>::AppendSegment(const FixedPointCoordinate &coordin
{ {
// if the start location is on top of a node, the first movement might be zero-length, // if the start location is on top of a node, the first movement might be zero-length,
// in which case we dont' add a new description, but instead update the existing one // in which case we dont' add a new description, but instead update the existing one
if ((1 == segments.size()) and (segments.front().location == coordinate)) if ((1 == segments.size()) && (segments.front().location == coordinate))
{ {
if (path_point.segment_duration > 0) if (path_point.segment_duration > 0)
{ {
@ -191,8 +191,8 @@ void SegmentList<DataFacadeT>::AppendSegment(const FixedPointCoordinate &coordin
// make sure mode changes are announced, even when there otherwise is no turn // make sure mode changes are announced, even when there otherwise is no turn
const auto getTurn = [](const PathData &path_point, const extractor::TravelMode previous_mode) const auto getTurn = [](const PathData &path_point, const extractor::TravelMode previous_mode)
{ {
if (extractor::TurnInstruction::NoTurn == path_point.turn_instruction and if (extractor::TurnInstruction::NoTurn == path_point.turn_instruction &&
previous_mode != path_point.travel_mode and path_point.segment_duration > 0) previous_mode != path_point.travel_mode && path_point.segment_duration > 0)
{ {
return extractor::TurnInstruction::GoStraight; return extractor::TurnInstruction::GoStraight;
} }