[routing] Rename OsrmRouter to OsrmOnlineRouter

routing/osrm_online_router.cpp

@@ -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)
   {

routing/osrm_online_router.hpp

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

routing/routing.pro

@@ -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 \

routing/routing_engine.cpp

@@ -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());
   }
 }