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

[routing] Rename OsrmRouter to OsrmOnlineRouter

Browse source
This commit is contained in:
Denis Koronchik 2014-08-06 16:01:53 +03:00 • committed by Alex Zolotarev
parent 38caa1161b
commit 3aaccc4d8d
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
routing/osrm_router.cpp → routing/osrm_online_router.cpp
View file

@ -1,4 +1,4 @@
#include "osrm_router.hpp"
#include "osrm_online_router.hpp"
#include "route.hpp"
#include "../indexer/mercator.hpp"
@ -19,17 +19,17 @@ namespace routing
char const * OSRM_CAR_ROUTING_URL = "http://router.project-osrm.org/viaroute?output=json&compression=false&";
string OsrmRouter::GetName() const
string OsrmOnlineRouter::GetName() const
{
return "osrm";
return "osrm-online";
}
void OsrmRouter::SetFinalPoint(m2::PointD const & finalPt)
void OsrmOnlineRouter::SetFinalPoint(m2::PointD const & finalPt)
{
m_finalPt = finalPt;
}
void OsrmRouter::CalculateRoute(m2::PointD const & startingPt, ReadyCallback const & callback)
void OsrmOnlineRouter::CalculateRoute(m2::PointD const & startingPt, ReadyCallback const & callback)
{
// Construct OSRM url request to get the route
string url = OSRM_CAR_ROUTING_URL;
@ -38,10 +38,10 @@ void OsrmRouter::CalculateRoute(m2::PointD const & startingPt, ReadyCallback con
+ "&loc=" + to_string(MercatorBounds::YToLat(m_finalPt.y)) + "," + to_string(MercatorBounds::XToLon(m_finalPt.x));
// Request will be deleted in the callback
downloader::HttpRequest::Get(url, bind(&OsrmRouter::OnRouteReceived, this, _1, callback));
downloader::HttpRequest::Get(url, bind(&OsrmOnlineRouter::OnRouteReceived, this, _1, callback));
}
void OsrmRouter::OnRouteReceived(downloader::HttpRequest & request, ReadyCallback callback)
void OsrmOnlineRouter::OnRouteReceived(downloader::HttpRequest & request, ReadyCallback callback)
{
if (request.Status() == downloader::HttpRequest::ECompleted)
{

2
routing/osrm_router.hpp → routing/osrm_online_router.hpp
View file

@ -9,7 +9,7 @@ namespace downloader { class HttpRequest; }
namespace routing
{
class OsrmRouter : public IRouter
class OsrmOnlineRouter : public IRouter
{
m2::PointD m_finalPt;

4
routing/routing.pro
View file

@ -14,7 +14,7 @@ SOURCES += \
routing_engine.cpp \
road_graph.cpp \
helicopter_router.cpp \
osrm_router.cpp \
osrm_online_router.cpp \
road_graph_router.cpp \
dijkstra_router.cpp \
features_road_graph.cpp \
@ -26,7 +26,7 @@ HEADERS += \
router.hpp \
road_graph.hpp \
helicopter_router.hpp \
osrm_router.hpp \
osrm_online_router.hpp \
road_graph_router.hpp \
dijkstra_router.hpp \
features_road_graph.hpp \

6
routing/routing_engine.cpp
View file

@ -2,7 +2,7 @@
#include "route.hpp"
#include "helicopter_router.hpp"
#include "osrm_router.hpp"
#include "osrm_online_router.hpp"
#include "dijkstra_router.hpp"
#include "../base/stl_add.hpp"
@ -28,8 +28,8 @@ void RoutingEngine::AddRouter(string const & name)
{
if (name == "helicopter")
m_routers.push_back(new HelicopterRouter());
else if (name == "osrm")
m_routers.push_back(new OsrmRouter());
else if (name == "osrm-online")
m_routers.push_back(new OsrmOnlineRouter());
}
}