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

[bicycle routing] Infrastructure for testing bicycle turns.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-05-11 13:30:58 +03:00
parent e26af8f1f4
commit 995d7be548
2 changed files with 43 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
routing/routing_integration_tests/routing_test_tools.cpp
View file

@ -31,6 +31,8 @@
using namespace routing;
using TRouterFactory = function<unique_ptr<IRouter>(Index & index, TCountryFileFn const & countryFileFn)>;
namespace
{
void ChangeMaxNumberOfOpenFiles(size_t n)
@ -81,14 +83,15 @@ namespace integration
return osrmRouter;
}
shared_ptr<IRouter> CreatePedestrianRouter(Index & index,
storage::CountryInfoGetter const & infoGetter)
shared_ptr<IRouter> CreateAStarRouter(Index & index,
storage::CountryInfoGetter const & infoGetter,
TRouterFactory const & routerFactory)
{
auto countryFileGetter = [&infoGetter](m2::PointD const & pt)
{
return infoGetter.GetRegionCountryId(pt);
};
unique_ptr<IRouter> router = CreatePedestrianAStarBidirectionalRouter(index, countryFileGetter);
unique_ptr<IRouter> router = routerFactory(index, countryFileGetter);
return shared_ptr<IRouter>(move(router));
}
@ -112,7 +115,24 @@ namespace integration
public:
PedestrianRouterComponents(vector<LocalCountryFile> const & localFiles)
: IRouterComponents(localFiles)
, m_router(CreatePedestrianRouter(m_featuresFetcher->GetIndex(), *m_infoGetter))
, m_router(CreateAStarRouter(m_featuresFetcher->GetIndex(), *m_infoGetter,
CreatePedestrianAStarBidirectionalRouter))
{
}
IRouter * GetRouter() const override { return m_router.get(); }
private:
shared_ptr<IRouter> m_router;
};
class BicycleRouterComponents : public IRouterComponents
{
public:
BicycleRouterComponents(vector<LocalCountryFile> const & localFiles)
: IRouterComponents(localFiles)
, m_router(CreateAStarRouter(m_featuresFetcher->GetIndex(), *m_infoGetter,
CreateBicycleAStarBidirectionalRouter))
{
}
@ -158,7 +178,7 @@ namespace integration
shared_ptr<IRouterComponents> GetPedestrianComponents(vector<platform::LocalCountryFile> const & localFiles)
{
return shared_ptr<IRouterComponents>(new PedestrianRouterComponents(localFiles));
return make_shared<PedestrianRouterComponents>(localFiles);
}
IRouterComponents & GetPedestrianComponents()
@ -168,6 +188,18 @@ namespace integration
return *inst;
}
shared_ptr<IRouterComponents> GetBicycleComponents(vector<platform::LocalCountryFile> const & localFiles)
{
return make_shared<BicycleRouterComponents>(localFiles);
}
IRouterComponents & GetBicycleComponents()
{
static shared_ptr<IRouterComponents> const inst = CreateAllMapsComponents<BicycleRouterComponents>();
ASSERT(inst, ());
return *inst;
}
TRouteResult CalculateRoute(IRouterComponents const & routerComponents,
m2::PointD const & startPoint, m2::PointD const & startDirection,
m2::PointD const & finalPoint)

8
routing/routing_integration_tests/routing_test_tools.hpp
View file

@ -78,14 +78,18 @@ unique_ptr<storage::CountryInfoGetter> CreateCountryInfoGetter();
void TestOnlineFetcher(ms::LatLon const & startPoint, ms::LatLon const & finalPoint,
vector<string> const & expected, IRouterComponents & routerComponents);
/// Get OSRM router components
/// Gets OSRM router components
IRouterComponents & GetOsrmComponents();
shared_ptr<IRouterComponents> GetOsrmComponents(vector<platform::LocalCountryFile> const & localFiles);
/// Get pedestrian router components
/// Gets pedestrian router components
IRouterComponents & GetPedestrianComponents();
shared_ptr<IRouterComponents> GetPedestrianComponents(vector<platform::LocalCountryFile> const & localFiles);
/// Gets bicycle router components.
IRouterComponents & GetBicycleComponents();
shared_ptr<IRouterComponents> GetBicycleComponents(vector<platform::LocalCountryFile> const & localFiles);
TRouteResult CalculateRoute(IRouterComponents const & routerComponents,
m2::PointD const & startPoint, m2::PointD const & startDirection,
m2::PointD const & finalPoint);