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

Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-01-18 16:49:00 +03:00 • committed by Yuri Gorshenin
parent 1b5ce65565
commit 9092296d88
2 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
routing/routing_integration_tests/get_altitude_test.cpp
View file

@ -25,18 +25,19 @@
namespace
{
using namespace feature;
using namespace platform;
LocalCountryFile GetLocalCountryFileByCountryId(string const & countryId)
LocalCountryFile GetLocalCountryFileByCountryId(CountryFile const & country)
{
vector<LocalCountryFile> localFiles;
integration::GetAllLocalFiles(localFiles);
for (auto const & lf : localFiles)
{
if (lf.GetCountryName() == countryId)
if (lf.GetCountryFile() == country)
return lf;
}
return LocalCountryFile();
return {};
}
void TestAltitudeOfAllMwmFeatures(string const & countryId, TAltitude const altitudeLowerBoundMeters,
@ -44,8 +45,8 @@ void TestAltitudeOfAllMwmFeatures(string const & countryId, TAltitude const alti
{
Index index;
platform::LocalCountryFile const country = GetLocalCountryFileByCountryId(countryId);
TEST_NOT_EQUAL(country, platform::LocalCountryFile(), ());
LocalCountryFile const country = GetLocalCountryFileByCountryId(CountryFile(countryId));
TEST_NOT_EQUAL(country, LocalCountryFile(), ());
TEST_NOT_EQUAL(country.GetFiles(), MapOptions::Nothing, (country));
pair<MwmSet::MwmId, MwmSet::RegResult> const regResult = index.RegisterMap(country);

25
routing/routing_integration_tests/route_test.cpp
View file

@ -26,20 +26,17 @@ namespace
MercatorBounds::FromLatLon(55.66237, 37.63560), 1700.);
}
// Fails because checkpoints are far from roads (inside Kremlin and inside the airport).
// This test is commented because the feature, the test is on, will not implement
// in short time perspective. When it does the test should be uncommented.
// UNIT_TEST(MoscowToSVOAirport)
// {
// integration::CalculateRouteAndTestRouteLength(
// integration::GetVehicleComponents<VehicleType::Car>(),
// MercatorBounds::FromLatLon(55.75100, 37.61790), {0., 0.},
// MercatorBounds::FromLatLon(55.97310, 37.41460), 30470.);
// integration::CalculateRouteAndTestRouteLength(
// integration::GetVehicleComponents<VehicleType::Car>(),
// MercatorBounds::FromLatLon(55.97310, 37.41460), {0., 0.},
// MercatorBounds::FromLatLon(55.75100, 37.61790), 30470.);
// }
UNIT_TEST(MoscowToSVOAirport)
{
integration::CalculateRouteAndTestRouteLength(
integration::GetVehicleComponents<VehicleType::Car>(),
MercatorBounds::FromLatLon(55.75100, 37.61790), {0., 0.},
MercatorBounds::FromLatLon(55.97310, 37.41460), 37284.);
integration::CalculateRouteAndTestRouteLength(
integration::GetVehicleComponents<VehicleType::Car>(),
MercatorBounds::FromLatLon(55.97310, 37.41460), {0., 0.},
MercatorBounds::FromLatLon(55.75100, 37.61790), 39449.);
}
// Restrictions tests. Check restrictions generation, if there are any errors.
UNIT_TEST(RestrictionTestNeatBaumanAndTTK)