Creating routing mode intead of using onewayAsBidirectional flag.

8 files changed, 34 insertions, 26 deletions

diff --git a/routing/features_road_graph.cpp b/routing/features_road_graph.cpp
index 8b3f2a17c2..f04a0049f5 100644
--- a/routing/features_road_graph.cpp
+++ b/routing/features_road_graph.cpp
@@ -101,10 +101,10 @@ void FeaturesRoadGraph::RoadInfoCache::Clear()
   m_cache.clear();
 }
 
-FeaturesRoadGraph::FeaturesRoadGraph(Index const & index, bool onewayAsBidirectional,
+FeaturesRoadGraph::FeaturesRoadGraph(Index const & index, IRoadGraph::Mode mode,
                                      unique_ptr<IVehicleModelFactory> && vehicleModelFactory)
   : m_index(index)
-  , m_onewayAsBidirectional(onewayAsBidirectional)
+  , m_mode(mode)
   , m_vehicleModel(move(vehicleModelFactory))
 {
 }
@@ -230,9 +230,9 @@ void FeaturesRoadGraph::GetJunctionTypes(Junction const & junction, feature::Typ
   m_index.ForEachInRect(f, rect, GetStreetReadScale());
 }
 
-bool FeaturesRoadGraph::ConsiderOnewayFeaturesAsBidirectional() const
+IRoadGraph::Mode FeaturesRoadGraph::ConsiderOnewayFeaturesAsBidirectional() const
 {
-  return m_onewayAsBidirectional;
+  return m_mode;
 };
 
 void FeaturesRoadGraph::ClearState()
diff --git a/routing/features_road_graph.hpp b/routing/features_road_graph.hpp
index 016358e1db..28ed0c54f8 100644
--- a/routing/features_road_graph.hpp
+++ b/routing/features_road_graph.hpp
@@ -56,7 +56,7 @@ private:
   };
 
 public:
-  FeaturesRoadGraph(Index const & index, bool onewayAsBidirectional,
+  FeaturesRoadGraph(Index const & index, IRoadGraph::Mode mode,
                     unique_ptr<IVehicleModelFactory> && vehicleModelFactory);
 
   static uint32_t GetStreetReadScale();
@@ -71,7 +71,7 @@ public:
                         vector<pair<Edge, m2::PointD>> & vicinities) const override;
   void GetFeatureTypes(FeatureID const & featureId, feature::TypesHolder & types) const override;
   void GetJunctionTypes(Junction const & junction, feature::TypesHolder & types) const override;
-  bool ConsiderOnewayFeaturesAsBidirectional() const override;
+  IRoadGraph::Mode ConsiderOnewayFeaturesAsBidirectional() const override;
   void ClearState() override;
 
 private:
@@ -92,7 +92,7 @@ private:
   void LockFeatureMwm(FeatureID const & featureId) const;
 
   Index const & m_index;
-  bool const m_onewayAsBidirectional;
+  IRoadGraph::Mode const m_mode;
   mutable RoadInfoCache m_cache;
   mutable CrossCountryVehicleModel m_vehicleModel;
   mutable map<MwmSet::MwmId, MwmSet::MwmHandle> m_mwmLocks;
diff --git a/routing/road_graph.cpp b/routing/road_graph.cpp
index 73dbf8953a..9ba1d9a99a 100644
--- a/routing/road_graph.cpp
+++ b/routing/road_graph.cpp
@@ -179,7 +179,7 @@ void IRoadGraph::CrossOutgoingLoader::LoadEdge(FeatureID const & featureId,
     if (!PointsAlmostEqualAbs(m_cross, p))
       continue;
 
-    if (i > 0 && (roadInfo.m_bidirectional || m_onewayAsBidirectional))
+    if (i > 0 && (roadInfo.m_bidirectional || m_mode == IRoadGraph::Mode::IgnoreOnewayTag))
     {
       //               p
       // o------------>o
@@ -218,7 +218,7 @@ void IRoadGraph::CrossIngoingLoader::LoadEdge(FeatureID const & featureId,
       m_edges.emplace_back(featureId, true /* forward */, i - 1, roadInfo.m_points[i - 1], p);
     }
 
-    if (i < numPoints - 1 && (roadInfo.m_bidirectional || m_onewayAsBidirectional))
+    if (i < numPoints - 1 && (roadInfo.m_bidirectional || m_mode == IRoadGraph::Mode::IgnoreOnewayTag))
     {
       // p
       // o------------>o
diff --git a/routing/road_graph.hpp b/routing/road_graph.hpp
index 916706fba2..143c7a75e3 100644
--- a/routing/road_graph.hpp
+++ b/routing/road_graph.hpp
@@ -83,6 +83,12 @@ public:
   typedef vector<Junction> TJunctionVector;
   typedef vector<Edge> TEdgeVector;
 
+  enum class Mode
+  {
+    ObeyOnewayTag,
+    IgnoreOnewayTag,
+  };
+
   /// This struct contains the part of a feature's metadata that is
   /// relevant for routing.
   struct RoadInfo
@@ -102,8 +108,8 @@ public:
   class ICrossEdgesLoader
   {
   public:
-    ICrossEdgesLoader(m2::PointD const & cross, bool onewayAsBidirectional, TEdgeVector & edges)
-      : m_cross(cross), m_onewayAsBidirectional(onewayAsBidirectional), m_edges(edges)
+    ICrossEdgesLoader(m2::PointD const & cross, IRoadGraph::Mode mode, TEdgeVector & edges)
+      : m_cross(cross), m_mode(mode), m_edges(edges)
     {
     }
     virtual ~ICrossEdgesLoader() = default;
@@ -118,15 +124,15 @@ public:
 
   protected:
     m2::PointD const m_cross;
-    bool const m_onewayAsBidirectional;
+    IRoadGraph::Mode const m_mode;
     TEdgeVector & m_edges;
   };
 
   class CrossOutgoingLoader : public ICrossEdgesLoader
   {
   public:
-    CrossOutgoingLoader(m2::PointD const & cross, bool onewayAsBidirectional, TEdgeVector & edges)
-      : ICrossEdgesLoader(cross, onewayAsBidirectional, edges)
+    CrossOutgoingLoader(m2::PointD const & cross, IRoadGraph::Mode mode, TEdgeVector & edges)
+      : ICrossEdgesLoader(cross, mode, edges)
     {
     }
 
@@ -137,8 +143,8 @@ public:
   class CrossIngoingLoader : public ICrossEdgesLoader
   {
   public:
-    CrossIngoingLoader(m2::PointD const & cross, bool onewayAsBidirectional, TEdgeVector & edges)
-      : ICrossEdgesLoader(cross, onewayAsBidirectional, edges)
+    CrossIngoingLoader(m2::PointD const & cross, IRoadGraph::Mode mode, TEdgeVector & edges)
+      : ICrossEdgesLoader(cross, mode, edges)
     {
     }
     // ICrossEdgesLoader overrides:
@@ -191,7 +197,7 @@ public:
   /// @return Types for specified junction
   virtual void GetJunctionTypes(Junction const & junction, feature::TypesHolder & types) const = 0;
 
-  virtual bool ConsiderOnewayFeaturesAsBidirectional() const = 0;
+  virtual IRoadGraph::Mode ConsiderOnewayFeaturesAsBidirectional() const = 0;
 
   /// Clear all temporary buffers.
   virtual void ClearState() {}
diff --git a/routing/road_graph_router.cpp b/routing/road_graph_router.cpp
index 7e75f58396..83934557e8 100644
--- a/routing/road_graph_router.cpp
+++ b/routing/road_graph_router.cpp
@@ -131,7 +131,7 @@ void FindClosestEdges(IRoadGraph const & graph, m2::PointD const & point,
 RoadGraphRouter::~RoadGraphRouter() {}
 
 RoadGraphRouter::RoadGraphRouter(string const & name, Index const & index,
-                                 TCountryFileFn const & countryFileFn, bool onewayAsBidirectional,
+                                 TCountryFileFn const & countryFileFn, IRoadGraph::Mode mode,
                                  unique_ptr<IVehicleModelFactory> && vehicleModelFactory,
                                  unique_ptr<IRoutingAlgorithm> && algorithm,
                                  unique_ptr<IDirectionsEngine> && directionsEngine)
@@ -139,8 +139,7 @@ RoadGraphRouter::RoadGraphRouter(string const & name, Index const & index,
   , m_countryFileFn(countryFileFn)
   , m_index(index)
   , m_algorithm(move(algorithm))
-  , m_roadGraph(
-        make_unique<FeaturesRoadGraph>(index, onewayAsBidirectional, move(vehicleModelFactory)))
+  , m_roadGraph(make_unique<FeaturesRoadGraph>(index, mode, move(vehicleModelFactory)))
   , m_directionsEngine(move(directionsEngine))
 {
 }
@@ -260,7 +259,7 @@ unique_ptr<IRouter> CreatePedestrianAStarRouter(Index & index, TCountryFileFn co
   unique_ptr<IRoutingAlgorithm> algorithm(new AStarRoutingAlgorithm());
   unique_ptr<IDirectionsEngine> directionsEngine(new PedestrianDirectionsEngine());
   unique_ptr<IRouter> router(new RoadGraphRouter(
-      "astar-pedestrian", index, countryFileFn, true /* onewayAsBidirectional */,
+      "astar-pedestrian", index, countryFileFn, IRoadGraph::Mode::IgnoreOnewayTag,
       move(vehicleModelFactory), move(algorithm), move(directionsEngine)));
   return router;
 }
@@ -271,7 +270,7 @@ unique_ptr<IRouter> CreatePedestrianAStarBidirectionalRouter(Index & index, TCou
   unique_ptr<IRoutingAlgorithm> algorithm(new AStarBidirectionalRoutingAlgorithm());
   unique_ptr<IDirectionsEngine> directionsEngine(new PedestrianDirectionsEngine());
   unique_ptr<IRouter> router(new RoadGraphRouter(
-      "astar-bidirectional-pedestrian", index, countryFileFn, true /* onewayAsBidirectional */,
+      "astar-bidirectional-pedestrian", index, countryFileFn, IRoadGraph::Mode::IgnoreOnewayTag,
       move(vehicleModelFactory), move(algorithm), move(directionsEngine)));
   return router;
 }
@@ -282,7 +281,7 @@ unique_ptr<IRouter> CreateBicycleAStarBidirectionalRouter(Index & index, TCountr
   unique_ptr<IRoutingAlgorithm> algorithm(new AStarBidirectionalRoutingAlgorithm());
   unique_ptr<IDirectionsEngine> directionsEngine(new BicycleDirectionsEngine(index));
   unique_ptr<IRouter> router(new RoadGraphRouter(
-      "astar-bidirectional-bicycle", index, countryFileFn, false /* onewayAsBidirectional */,
+      "astar-bidirectional-bicycle", index, countryFileFn, IRoadGraph::Mode::ObeyOnewayTag,
       move(vehicleModelFactory), move(algorithm), move(directionsEngine)));
   return router;
 }
diff --git a/routing/road_graph_router.hpp b/routing/road_graph_router.hpp
index c9894d3107..17701bdc7a 100644
--- a/routing/road_graph_router.hpp
+++ b/routing/road_graph_router.hpp
@@ -24,7 +24,7 @@ class RoadGraphRouter : public IRouter
 {
 public:
   RoadGraphRouter(string const & name, Index const & index, TCountryFileFn const & countryFileFn,
-                  bool onewayAsBidirectional,
+                  IRoadGraph::Mode mode,
                   unique_ptr<IVehicleModelFactory> && vehicleModelFactory,
                   unique_ptr<IRoutingAlgorithm> && algorithm,
                   unique_ptr<IDirectionsEngine> && directionsEngine);
diff --git a/routing/routing_tests/road_graph_builder.cpp b/routing/routing_tests/road_graph_builder.cpp
index 2de44978ca..b7308da201 100644
--- a/routing/routing_tests/road_graph_builder.cpp
+++ b/routing/routing_tests/road_graph_builder.cpp
@@ -110,7 +110,10 @@ void RoadGraphMockSource::GetJunctionTypes(Junction const & junction, feature::T
   UNUSED_VALUE(types);
 }
 
-bool RoadGraphMockSource::ConsiderOnewayFeaturesAsBidirectional() const { return true; }
+IRoadGraph::Mode RoadGraphMockSource::ConsiderOnewayFeaturesAsBidirectional() const
+{
+  return IRoadGraph::Mode::IgnoreOnewayTag;
+}
 
 FeatureID MakeTestFeatureID(uint32_t offset)
 {
diff --git a/routing/routing_tests/road_graph_builder.hpp b/routing/routing_tests/road_graph_builder.hpp
index 4fbad32f70..de68330a33 100644
--- a/routing/routing_tests/road_graph_builder.hpp
+++ b/routing/routing_tests/road_graph_builder.hpp
@@ -22,7 +22,7 @@ public:
                         vector<pair<routing::Edge, m2::PointD>> & vicinities) const override;
   void GetFeatureTypes(FeatureID const & featureId, feature::TypesHolder & types) const override;
   void GetJunctionTypes(routing::Junction const & junction, feature::TypesHolder & types) const override;
-  bool ConsiderOnewayFeaturesAsBidirectional() const override;
+  routing::IRoadGraph::Mode ConsiderOnewayFeaturesAsBidirectional() const override;
 
 private:
   vector<RoadInfo> m_roads;