diff options
author | Добрый Ээх <bukharaev@gmail.com> | 2017-01-30 13:11:54 +0300 |
---|---|---|
committer | Добрый Ээх <bukharaev@gmail.com> | 2017-02-16 14:30:59 +0300 |
commit | 801a8745fe8085e5d91a48bbb31e6d2e3a4b08fe (patch) | |
tree | 2aca0f8fde7495a3eae9b00b8228fd13da11a8f6 /routing/index_road_graph.hpp | |
parent | bf062697463b58c71d9669b74905bba94298e221 (diff) |
[routing] Cross mwm index routing
Diffstat (limited to 'routing/index_road_graph.hpp')
-rw-r--r-- | routing/index_road_graph.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/routing/index_road_graph.hpp b/routing/index_road_graph.hpp index c6f4ba7ca6..383ca5ff50 100644 --- a/routing/index_road_graph.hpp +++ b/routing/index_road_graph.hpp @@ -1,6 +1,7 @@ #pragma once #include "routing/index_graph_starter.hpp" +#include "routing/num_mwm_id.hpp" #include "routing/road_graph.hpp" #include "routing/segment.hpp" @@ -14,9 +15,9 @@ namespace routing class IndexRoadGraph : public RoadGraphBase { public: - IndexRoadGraph(MwmSet::MwmId const & mwmId, Index const & index, double maxSpeedKMPH, - IndexGraphStarter & starter, vector<Segment> const & segments, - vector<Junction> const & junctions); + IndexRoadGraph(shared_ptr<NumMwmIds> numMwmIds, IndexGraphStarter & starter, + vector<Segment> const & segments, vector<Junction> const & junctions, + Index & index); // IRoadGraphBase overrides: virtual void GetOutgoingEdges(Junction const & junction, TEdgeVector & edges) const override; @@ -31,9 +32,8 @@ private: Junction GetJunction(Segment const & segment, bool front) const; vector<Segment> const & GetSegments(Junction const & junction, bool isOutgoing) const; - MwmSet::MwmId const & m_mwmId; - Index const & m_index; - double const m_maxSpeedKMPH; + Index & m_index; + shared_ptr<NumMwmIds> m_numMwmIds; IndexGraphStarter & m_starter; map<Junction, vector<Segment>> m_beginToSegment; map<Junction, vector<Segment>> m_endToSegment; |