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

Review fixes

Browse source
This commit is contained in:
tatiana-yan 2021-02-25 15:10:38 +03:00 • committed by Olga Khlopkova
parent 5474f1a427
commit e1c07f8bd9
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
transit/world_feed/world_feed.cpp
View file

@ -224,23 +224,15 @@ std::optional<size_t> GetStopIndex(
auto it = stopIndexes.find(id);
CHECK(it != stopIndexes.end(), (id));
auto stops = it->second;
std::sort(stops.begin(), stops.end());
if (direction == Direction::Forward)
std::optional<size_t> bestIdx;
for (auto const & index : it->second)
{
auto const stopIt =
std::find_if(stops.begin(), stops.end(), [&](size_t index) { return index >= fromIndex; });
if (stopIt == stops.end())
return {};
return *stopIt;
if (direction == Direction::Forward && index >= fromIndex && (!bestIdx || index < bestIdx))
bestIdx = index;
if (direction == Direction::Backward && index <= fromIndex && (!bestIdx || index > bestIdx))
bestIdx = index;
}
auto const stopIt =
std::find_if(stops.rbegin(), stops.rend(), [&](size_t index) { return index <= fromIndex; });
if (stopIt == stops.rend())
return {};
return *stopIt;
return bestIdx;
}
std::optional<std::pair<StopOnShape, StopOnShape>> GetStopPairOnShape(