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

[routing] Fixing routing quality and integration tests after map update to 190517.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2019-06-10 09:33:26 +03:00 • committed by mpimenov
parent 9213224293
commit be760427c8
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
routing/routing_integration_tests/routing_test_tools.cpp
View file

@ -18,7 +18,6 @@
#include "indexer/data_source.hpp"
#include "storage/country_parent_getter.hpp"
#include "storage/storage.hpp"
#include "platform/local_country_file.hpp"
#include "platform/local_country_file_utils.hpp"
@ -103,20 +102,19 @@ unique_ptr<IndexRouter> CreateVehicleRouter(DataSource & dataSource,
return infoGetter.GetLimitRectForLeaf(countryId);
};
storage::Storage storage;
auto countryParentGetter = std::make_unique<storage::CountryParentGetter>();
CHECK(countryParentGetter, ());
auto numMwmIds = make_shared<NumMwmIds>();
for (auto const & f : localFiles)
{
auto const & countryFile = f.GetCountryFile();
auto const mwmId = dataSource.GetMwmIdByCountryFile(countryFile);
CHECK(mwmId.IsAlive(), ());
if (storage.IsLeaf(countryFile.GetName()))
if (countryParentGetter->GetStorageForTesting().IsLeaf(countryFile.GetName()))
numMwmIds->RegisterFile(countryFile);
}
auto countryParentGetter = std::make_unique<storage::CountryParentGetter>();
CHECK(countryParentGetter, ());
bool const loadAltitudes = vehicleType != VehicleType::Car;
auto indexRouter = make_unique<IndexRouter>(vehicleType, loadAltitudes,
*countryParentGetter, countryFileGetter,

4
routing/routing_integration_tests/street_names_test.cpp
View file

@ -52,11 +52,11 @@ UNIT_TEST(RussiaTulskayaToPaveletskayaStreetNamesTest)
MoveRoute(route, ms::LatLon(55.73034, 37.63099));
integration::TestCurrentStreetName(route, "Валовая улица");
integration::TestNextStreetName(route, "");
integration::TestNextStreetName(route, "улица Зацепский Вал");
MoveRoute(route, ms::LatLon(55.730912, 37.636191));
integration::TestCurrentStreetName(route, "Валовая улица");
integration::TestCurrentStreetName(route, "улица Зацепский Вал");
integration::TestNextStreetName(route, "");
integration::TestRouteLength(route, 3390.);

2
routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp
View file

@ -17,7 +17,7 @@ UNIT_TEST(RoutingQuality_RussiaMoscowTushino)
UNIT_TEST(RoutingQuality_TurkeyIzmirArea)
{
TEST(CheckCarRoute({38.80146, 26.97696} /* start */, {39.06835, 26.88686} /* finish */,
TEST(CheckCarRoute({38.80146, 26.97696} /* start */, {39.0837, 26.90977} /* finish */,
{{{39.08146, 27.11798}}} /* reference track */),
());
}