kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[routing] Fix routing integration tests + Moscow-Minsk route

Browse source
This commit is contained in:
Добрый Ээх 2017-05-22 15:04:15 +03:00 • committed by Добрый Ээх
parent 716bcd2b83
commit f0b5279262
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
routing/routing_integration_tests/osrm_route_test.cpp
View file

@ -137,6 +137,13 @@ namespace
{39.836562407458047, 65.774372510437971}, 239426.);
}
UNIT_TEST(RussiaMoscowBelarusMinsk)
{
integration::CalculateRouteAndTestRouteLength(integration::GetOsrmComponents(),
MercatorBounds::FromLatLon(55.750650, 37.617673), {0., 0.},
MercatorBounds::FromLatLon(53.902114, 27.562020), 712649.0);
}
// TODO OSRM offers a possible turn to a pedestrian road in this test. It's fixing right now.
UNIT_TEST(UKRugbyStIvesRouteTest)
{

11
routing/routing_integration_tests/routing_test_tools.cpp
View file

@ -91,9 +91,14 @@ namespace integration
return infoGetter.GetLimitRectForLeaf(countryId);
};
shared_ptr<NumMwmIds> numMwmIds = make_shared<NumMwmIds>();
for (LocalCountryFile const & f : localFiles)
numMwmIds->RegisterFile(f.GetCountryFile());
auto numMwmIds = make_shared<NumMwmIds>();
for (auto const & f : localFiles)
{
auto const & countryFile = f.GetCountryFile();
auto const mwmId = index.GetMwmIdByCountryFile(countryFile);
if (mwmId.GetInfo()->GetType() == MwmInfo::COUNTRY && countryFile.GetName() != "minsk-pass")
numMwmIds->RegisterFile(countryFile);
}
auto carRouter = make_unique<CarRouter>(
index, countryFileGetter,