organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[routing] Fixed OSRM initialization

Browse source
This commit is contained in:
Alex Zolotarev 2014-07-08 00:17:15 +02:00 • committed by Alex Zolotarev
parent bf4cb567c7
commit 9ae4979855
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
routing/routing_engine.cpp
View file

@ -1,6 +1,7 @@
#include "routing_engine.hpp"
#include "route.hpp"
#include "helicopter_router.hpp"
#include "osrm_router.hpp"
#include "../base/stl_add.hpp"
#include "../base/logging.hpp"
@ -20,8 +21,13 @@ RoutingEngine::~RoutingEngine()
void RoutingEngine::AddRouter(string const & name)
{
if (!FindRouter(name) && name == "helicopter")
m_routers.push_back(new HelicopterRouter);
if (!FindRouter(name))
{
if (name == "helicopter")
m_routers.push_back(new HelicopterRouter);
else if (name == "osrm")
m_routers.push_back(new OsrmRouter);
}
}
void RoutingEngine::RemoveRouter(string const & name)
@ -63,6 +69,13 @@ void RoutingEngine::SetFinalPoint(m2::PointD const & pt)
void RoutingEngine::Calculate(string const & name, IRouter::ReadyCallback const & callback)
{
if (name == "all")
{
for (size_t i = 0; i < m_routers.size(); ++i)
Calculate(m_routers[i]->GetName(), callback);
return;
}
IRouter * p = FindRouter(name);
if (!p)
{