organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[Routing] Refactoring

Browse source 
Merge of MakeTurnAnnotation and MakeTurnAnnotationPedestrian.
Part 3. Fix of missed "else".

Signed-off-by: Anton Makouski <anton.makouski@gmail.com>
This commit is contained in:
Anton Makouski 2022-05-12 18:14:19 +03:00
parent 66e5af0855
commit c363cde673
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
routing/turns_generator.cpp
View file

@ -487,8 +487,7 @@ RouterResultCode MakeTurnAnnotation(IRoutingResult const & result, NumMwmIds con
RoutingSettings const vehicleSettings = GetRoutingSettings(vehicleType);
for (auto loadedSegmentIt = loadedSegments.cbegin(); loadedSegmentIt != loadedSegments.cend();
++loadedSegmentIt)
for (auto loadedSegmentIt = loadedSegments.cbegin(); loadedSegmentIt != loadedSegments.cend(); ++loadedSegmentIt)
{
CHECK(loadedSegmentIt->IsValid(), ());
@ -560,16 +559,18 @@ RouterResultCode MakeTurnAnnotation(IRoutingResult const & result, NumMwmIds con
junctions.front() = result.GetStartPoint();
junctions.back() = result.GetEndPoint();
uint32_t turn_index = static_cast<uint32_t>(junctions.size() - 1);
if (vehicleType == VehicleType::Pedestrian)
{
turnsDir.emplace_back(TurnItem(base::asserted_cast<uint32_t>(junctions.size()) - 1,
PedestrianDirection::ReachedYourDestination));
turnsDir.emplace_back(TurnItem(turn_index, PedestrianDirection::ReachedYourDestination));
FixupTurnsPedestrian(junctions, turnsDir);
}
else
{
turnsDir.emplace_back(TurnItem(base::asserted_cast<uint32_t>(junctions.size()) - 1,
CarDirection::ReachedYourDestination));
turnsDir.emplace_back(TurnItem(turn_index, CarDirection::ReachedYourDestination));
FixupTurns(junctions, turnsDir);
}