diff --git a/routing/transit_world_graph.cpp b/routing/transit_world_graph.cpp index 22eaa18cf7..de5577e070 100644 --- a/routing/transit_world_graph.cpp +++ b/routing/transit_world_graph.cpp @@ -164,11 +164,6 @@ double TransitWorldGraph::CalcSegmentETA(routing::Segment const & segment) return m_estimator->CalcSegmentETA(segment, GetRealRoadGeometry(segment.GetMwmId(), segment.GetFeatureId())); } -vector const & TransitWorldGraph::GetTransitions(NumMwmId numMwmId, bool isEnter) -{ - return kEmptyTransitions; -} - unique_ptr TransitWorldGraph::GetTransitInfo(Segment const & segment) { if (!TransitGraph::IsTransitSegment(segment)) @@ -185,8 +180,6 @@ unique_ptr TransitWorldGraph::GetTransitInfo(Segment const & segmen return {}; } -std::vector TransitWorldGraph::GetSpeedCamInfo(Segment const & segment) { return {}; } - void TransitWorldGraph::GetTwinsInner(Segment const & segment, bool isOutgoing, vector & twins) { diff --git a/routing/transit_world_graph.hpp b/routing/transit_world_graph.hpp index d3105aff96..97860b8e71 100644 --- a/routing/transit_world_graph.hpp +++ b/routing/transit_world_graph.hpp @@ -59,9 +59,7 @@ public: RouteWeight CalcLeapWeight(m2::PointD const & from, m2::PointD const & to) const override; RouteWeight CalcOffroadWeight(m2::PointD const & from, m2::PointD const & to) const override; double CalcSegmentETA(Segment const & segment) override; - std::vector const & GetTransitions(NumMwmId numMwmId, bool isEnter) override; std::unique_ptr GetTransitInfo(Segment const & segment) override; - std::vector GetSpeedCamInfo(Segment const & segment) override; void GetEdgeList(Segment const & segment, bool isOutgoing, std::vector & edges, @@ -92,6 +90,5 @@ private: std::unique_ptr m_transitLoader; std::shared_ptr m_estimator; WorldGraphMode m_mode = WorldGraphMode::NoLeaps; - std::vector const kEmptyTransitions = {}; }; } // namespace routing diff --git a/routing/world_graph.cpp b/routing/world_graph.cpp index d0b3d5c60b..3c26ad05b1 100644 --- a/routing/world_graph.cpp +++ b/routing/world_graph.cpp @@ -46,8 +46,19 @@ bool WorldGraph::IsRoutingOptionsGood(Segment const & /* segment */) return true; } +std::vector WorldGraph::GetSpeedCamInfo(Segment const & segment) +{ + return {}; +} + void WorldGraph::SetRoutingOptions(RoutingOptions /* routingOption */) {} +std::vector const & WorldGraph::GetTransitions(NumMwmId numMwmId, bool isEnter) +{ + static std::vector const kEmpty; + return kEmpty; +} + std::string DebugPrint(WorldGraphMode mode) { switch (mode) diff --git a/routing/world_graph.hpp b/routing/world_graph.hpp index cec7ca985d..72090fbe2d 100644 --- a/routing/world_graph.hpp +++ b/routing/world_graph.hpp @@ -78,7 +78,7 @@ public: virtual double CalcSegmentETA(Segment const & segment) = 0; /// \returns transitions for mwm with id |numMwmId|. - virtual std::vector const & GetTransitions(NumMwmId numMwmId, bool isEnter) = 0; + virtual std::vector const & GetTransitions(NumMwmId numMwmId, bool isEnter); virtual bool IsRoutingOptionsGood(Segment const & /* segment */); virtual RoutingOptions GetRoutingOptions(Segment const & /* segment */); @@ -87,7 +87,7 @@ public: /// \returns transit-specific information for segment. For nontransit segments returns nullptr. virtual std::unique_ptr GetTransitInfo(Segment const & segment) = 0; - virtual std::vector GetSpeedCamInfo(Segment const & segment) = 0; + virtual std::vector GetSpeedCamInfo(Segment const & segment); virtual IndexGraph & GetIndexGraph(NumMwmId numMwmId) = 0;