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

[routing] remove template without bug

Browse source
This commit is contained in:
Mikhail Gorbushin 2019-05-08 18:15:28 +03:00 • committed by Vlad Mihaylenko
parent b166754ecf
commit 8a2e3eafa9
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
routing/routing_integration_tests/routing_test_tools.cpp
View file

@ -33,8 +33,10 @@
#include <functional>
#include <limits>
#include <map>
#include <memory>
#include <sys/resource.h>
#include <tuple>
using namespace routing;
using namespace routing_test;
@ -149,9 +151,14 @@ shared_ptr<VehicleRouterComponents> CreateAllMapsComponents(VehicleType vehicleT
IRouterComponents & GetVehicleComponents(VehicleType vehicleType)
{
static auto const instance = CreateAllMapsComponents(vehicleType);
ASSERT(instance, ());
return *instance;
static map<VehicleType, shared_ptr<VehicleRouterComponents>> kVehicleComponents;
auto it = kVehicleComponents.find(vehicleType);
if (it == kVehicleComponents.end())
tie(it, ignore) = kVehicleComponents.emplace(vehicleType, CreateAllMapsComponents(vehicleType));
CHECK(it->second, ());
return *(it->second);
}
TRouteResult CalculateRoute(IRouterComponents const & routerComponents,