Removing unnecessary methods.

5 files changed, 1 insertions, 29 deletions

diff --git a/routing/index_road_graph.cpp b/routing/index_road_graph.cpp
index df5b9ccf92..937dbbf3f8 100644
--- a/routing/index_road_graph.cpp
+++ b/routing/index_road_graph.cpp
@@ -75,13 +75,6 @@ void IndexRoadGraph::GetJunctionTypes(Junction const & junction, feature::TypesH
   types = feature::TypesHolder();
 }
 
-bool IndexRoadGraph::IsRouteEdgesImplemented() const
-{
-  return true;
-}
-
-bool IndexRoadGraph::IsRouteSegmentsImplemented() const { return true; }
-
 void IndexRoadGraph::GetRouteEdges(TEdgeVector & edges) const
 {
   edges.clear();
diff --git a/routing/index_road_graph.hpp b/routing/index_road_graph.hpp
index 555367bb15..a15ac30a59 100644
--- a/routing/index_road_graph.hpp
+++ b/routing/index_road_graph.hpp
@@ -28,8 +28,6 @@ public:
   virtual void GetEdgeTypes(Edge const & edge, feature::TypesHolder & types) const override;
   virtual void GetJunctionTypes(Junction const & junction,
                                 feature::TypesHolder & types) const override;
-  virtual bool IsRouteEdgesImplemented() const override;
-  virtual bool IsRouteSegmentsImplemented() const override;
   virtual void GetRouteEdges(TEdgeVector & edges) const override;
   virtual void GetRouteSegments(std::vector<Segment> & segments) const override;
 
diff --git a/routing/pedestrian_directions.cpp b/routing/pedestrian_directions.cpp
index 2631be0a30..593f2953d5 100644
--- a/routing/pedestrian_directions.cpp
+++ b/routing/pedestrian_directions.cpp
@@ -60,17 +60,7 @@ bool PedestrianDirectionsEngine::Generate(IndexRoadGraph const & graph,
 
   CalculateTurns(graph, routeEdges, turns, cancellable);
 
-  if (graph.IsRouteSegmentsImplemented())
-  {
-    graph.GetRouteSegments(segments);
-  }
-  else
-  {
-    segments.reserve(routeEdges.size());
-    for (Edge const & e : routeEdges)
-      segments.push_back(ConvertEdgeToSegment(*m_numMwmIds, e));
-  }
-
+  graph.GetRouteSegments(segments);
   return true;
 }
 
diff --git a/routing/road_graph.cpp b/routing/road_graph.cpp
index 061205a327..adabf38ac1 100644
--- a/routing/road_graph.cpp
+++ b/routing/road_graph.cpp
@@ -315,10 +315,6 @@ IRoadGraph::RoadInfo MakeRoadInfoForTesting(bool bidirectional, double speedKMPH
   return ri;
 }
 // RoadGraphBase ------------------------------------------------------------------
-bool RoadGraphBase::IsRouteEdgesImplemented() const { return false; }
-
-bool RoadGraphBase::IsRouteSegmentsImplemented() const { return false; }
-
 void RoadGraphBase::GetRouteEdges(TEdgeVector & routeEdges) const
 {
   NOTIMPLEMENTED()
diff --git a/routing/road_graph.hpp b/routing/road_graph.hpp
index 4c414a2875..9b6d635d74 100644
--- a/routing/road_graph.hpp
+++ b/routing/road_graph.hpp
@@ -143,11 +143,6 @@ public:
   /// @return Types for specified junction
   virtual void GetJunctionTypes(Junction const & junction, feature::TypesHolder & types) const = 0;
 
-  // TODO: remove IsRouteEdgesImplemented and IsRouteSegmentsImplemented as soon as we get rid of
-  // IRoadGraph and RoadGraphRouter
-  virtual bool IsRouteEdgesImplemented() const;
-  virtual bool IsRouteSegmentsImplemented() const;
-
   virtual void GetRouteEdges(TEdgeVector & routeEdges) const;
   virtual void GetRouteSegments(std::vector<Segment> & segments) const;
 };