From 3aaccc4d8dd7fc7497ab915e9c67d7cc4900f209 Mon Sep 17 00:00:00 2001
From: Denis Koronchik <denis@mapswithme.com>
Date: Wed, 6 Aug 2014 16:01:53 +0300
Subject: [PATCH] [routing] Rename OsrmRouter to OsrmOnlineRouter

---
 .../{osrm_router.cpp => osrm_online_router.cpp}    | 14 +++++++-------
 .../{osrm_router.hpp => osrm_online_router.hpp}    |  2 +-
 routing/routing.pro                                |  4 ++--
 routing/routing_engine.cpp                         |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename routing/{osrm_router.cpp => osrm_online_router.cpp} (88%)
 rename routing/{osrm_router.hpp => osrm_online_router.hpp} (92%)

diff --git a/routing/osrm_router.cpp b/routing/osrm_online_router.cpp
similarity index 88%
rename from routing/osrm_router.cpp
rename to routing/osrm_online_router.cpp
index 0f8a0f098a..6fad03f763 100644
--- a/routing/osrm_router.cpp
+++ b/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)
   {
diff --git a/routing/osrm_router.hpp b/routing/osrm_online_router.hpp
similarity index 92%
rename from routing/osrm_router.hpp
rename to routing/osrm_online_router.hpp
index 929146bcb3..a711bcbc2f 100644
--- a/routing/osrm_router.hpp
+++ b/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;
 
diff --git a/routing/routing.pro b/routing/routing.pro
index 18312ccd16..e2fbf03c7a 100644
--- a/routing/routing.pro
+++ b/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 \
diff --git a/routing/routing_engine.cpp b/routing/routing_engine.cpp
index e0a102433e..e79019c9f3 100644
--- a/routing/routing_engine.cpp
+++ b/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());
   }
 }