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

Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2019-02-19 18:23:58 +03:00 • committed by Vlad Mihaylenko
parent da102aef07
commit c3b9620254
3 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routing/index_router.cpp
View file

@ -1036,7 +1036,7 @@ void IndexRouter::FillSpeedCamProhibitedMwms(vector<Segment> const & segments,
set<NumMwmId> mwmIds;
for (auto const & s : segments)
mwmIds.insert(s.GetMwmId());
mwmIds.emplace(s.GetMwmId());
for (auto const id : mwmIds)
{

7
routing/routing_integration_tests/route_test.cpp
View file

@ -428,14 +428,14 @@ namespace
integration::TestRouteTime(route, 7136.04);
}
// Test on removing speed cameras form the route for maps from Jan 2019,
// Test on removing speed cameras from the route for maps from Jan 2019,
// and on the absence of speed cameras in maps for later maps for Switzerland.
UNIT_TEST(SwitzerlandNoSpeedCamerasInRouteTest)
{
TRouteResult const routeResult =
integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
MercatorBounds::FromLatLon(47.5194, 8.73093), {0., 0.},
MercatorBounds::FromLatLon(52.6756, 13.2745));
MercatorBounds::FromLatLon(46.80592, 7.13724));
RouterResultCode const result = routeResult.second;
TEST_EQUAL(result, RouterResultCode::NoError, ());
@ -445,9 +445,6 @@ namespace
auto const & routeSegments = route.GetRouteSegments();
for (auto const & routeSegment : routeSegments)
{
if (!routeSegment.GetSpeedCams().empty())
continue;
TEST(routeSegment.GetSpeedCams().empty(),
(routeSegment.GetSegment(), routeSegment.GetStreet()));
}

11
routing/speed_camera_prohibition.cpp
View file

@ -2,6 +2,7 @@
#include "base/string_utils.hpp"
#include <algorithm>
#include <vector>
namespace
@ -18,13 +19,9 @@ std::vector<std::string> kSpeedCamerasPartlyProhibitedCountries = {
bool IsMwmContained(platform::CountryFile const & mwm, std::vector<std::string> const & countryList)
{
for (auto const & country : countryList)
{
if (strings::StartsWith(mwm.GetName(), country))
return true;
}
return false;
return std::any_of(countryList.cbegin(), countryList.cend(), [&mwm](auto const & country) {
return strings::StartsWith(mwm.GetName(), country);
});
}
} // namespace