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

Review fixes.

Browse source
This commit is contained in:
vng 2014-07-14 13:32:59 +02:00 • committed by Alex Zolotarev
parent 05e5b8305c
commit d8780bbcfd
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
map/framework.cpp
View file

@ -1222,10 +1222,10 @@ void Framework::RestoreSesame()
bool enable = false;
if (Settings::Get(ROUTER_HELICOPTER, enable) && enable)
m_routingEngine.AddRouter(ROUTER_HELICOPTER);
// if (Settings::Get(ROUTER_OSRM, enable) && enable)
// m_routingEngine.AddRouter(ROUTER_OSRM);
if (Settings::Get(ROUTER_OSRM, enable) && enable)
m_routingEngine.AddRouter(ROUTER_OSRM);
if (Settings::Get(ROUTER_MAPSME, enable) && enable)
m_routingEngine.AddRouter(ROUTER_MAPSME, CreateRouter());
m_routingEngine.AddRouter(CreateRouter());
}
/// Activates hidden features via search queries
@ -1241,7 +1241,7 @@ bool Framework::SesameOpen(search::SearchParams const & params)
{
m_routingEngine.AddRouter(ROUTER_HELICOPTER);
m_routingEngine.AddRouter(ROUTER_OSRM);
m_routingEngine.AddRouter(ROUTER_MAPSME, CreateRouter());
m_routingEngine.AddRouter(CreateRouter());
// Enable all other engines here
Settings::Set(ROUTER_HELICOPTER, true);
@ -1287,7 +1287,7 @@ bool Framework::SesameOpen(search::SearchParams const & params)
}
else if (params.m_query == "?routeme on")
{
m_routingEngine.AddRouter(ROUTER_MAPSME, CreateRouter());
m_routingEngine.AddRouter(CreateRouter());
Settings::Set(ROUTER_MAPSME, true);
searchResult = "maps.me routing activated";
}

4
routing/routing_engine.cpp
View file

@ -33,9 +33,9 @@ void RoutingEngine::AddRouter(string const & name)
}
}
void RoutingEngine::AddRouter(string const & name, IRouter * pRouter)
void RoutingEngine::AddRouter(IRouter * pRouter)
{
if (!FindRouter(name))
if (!FindRouter(pRouter->GetName()))
m_routers.push_back(pRouter);
}

2
routing/routing_engine.hpp
View file

@ -17,7 +17,7 @@ public:
~RoutingEngine();
void AddRouter(string const & name);
void AddRouter(string const & name, IRouter * pRouter);
void AddRouter(IRouter * pRouter);
void RemoveRouter(string const & name);
bool IsRoutingEnabled() const;