pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Minor renaming.

Browse source
This commit is contained in:
Daria Volvenkova 2019-03-20 17:24:56 +03:00 • committed by Roman Kuznetsov
parent fccb7e3cd4
commit 23d292bc04
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
map/routing_manager.cpp
View file

@ -536,7 +536,7 @@ void RoutingManager::CollectRoadWarnings(std::vector<routing::RouteSegment> cons
m2::PointD const & startPt, double baseDistance,
GetMwmIdFn const & getMwmIdFn, RoadWarningsCollection & roadWarnings)
{
auto const isImportantType = [](RoutingOptions::Road roadType)
auto const isWarnedType = [](RoutingOptions::Road roadType)
{
return roadType == RoutingOptions::Road::Toll || roadType == RoutingOptions::Road::Ferry ||
roadType == RoutingOptions::Road::Dirty;
@ -550,10 +550,10 @@ void RoutingManager::CollectRoadWarnings(std::vector<routing::RouteSegment> cons
auto const currentType = ChooseMainRoutingOptionRoad(segments[i].GetRoadTypes());
if (currentType != lastType)
{
if (isImportantType(lastType))
if (isWarnedType(lastType))
roadWarnings[lastType].back().m_distance = segments[i].GetDistFromBeginningMeters() - startDistance;
if (isImportantType(currentType))
if (isWarnedType(currentType))
{
startDistance = currentDistance;
auto const featureId = FeatureID(getMwmIdFn(segments[i].GetSegment().GetMwmId()),
@ -565,7 +565,7 @@ void RoutingManager::CollectRoadWarnings(std::vector<routing::RouteSegment> cons
}
currentDistance = segments[i].GetDistFromBeginningMeters();
}
if (isImportantType(lastType))
if (isWarnedType(lastType))
roadWarnings[lastType].back().m_distance = segments.back().GetDistFromBeginningMeters() - startDistance;
}