diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2017-09-14 16:49:35 +0300 |
|---|---|---|
| committer | Ilya Zverev <ilya@zverev.info> | 2017-09-14 17:12:55 +0300 |
| commit | 666bf71c29afd56ad285f8d0fd882fc1ea79224a (patch) | |
| tree | 480acf0fce677f92476837c0e2352a69e60d33db | |
| parent | ef5be5c52a4d13cc12c87c817c75b487171d4552 (diff) | |
| -rw-r--r-- | routing/index_router.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/routing/index_router.cpp b/routing/index_router.cpp index b65691c984..cf23fd57bf 100644 --- a/routing/index_router.cpp +++ b/routing/index_router.cpp @@ -283,10 +283,10 @@ double IndexRouter::BestEdgeComparator::GetSquaredDist(Edge const & edge) const } // IndexRouter ------------------------------------------------------------------------------------ -IndexRouter::IndexRouter(VehicleType vehicleType, bool loadAltitudes, TCountryFileFn const & countryFileFn, - CourntryRectFn const & countryRectFn, shared_ptr<NumMwmIds> numMwmIds, - unique_ptr<m4::Tree<NumMwmId>> numMwmTree, traffic::TrafficCache const & trafficCache, - Index & index) +IndexRouter::IndexRouter(VehicleType vehicleType, bool loadAltitudes, + TCountryFileFn const & countryFileFn, CourntryRectFn const & countryRectFn, + shared_ptr<NumMwmIds> numMwmIds, unique_ptr<m4::Tree<NumMwmId>> numMwmTree, + traffic::TrafficCache const & trafficCache, Index & index) : m_vehicleType(vehicleType) , m_loadAltitudes(loadAltitudes) , m_name("astar-bidirectional-" + ToString(m_vehicleType)) @@ -298,10 +298,12 @@ IndexRouter::IndexRouter(VehicleType vehicleType, bool loadAltitudes, TCountryFi , m_numMwmTree(move(numMwmTree)) , m_trafficStash(CreateTrafficStash(m_vehicleType, m_numMwmIds, trafficCache)) , m_indexManager(countryFileFn, m_index) - , m_roadGraph(m_index, vehicleType == VehicleType::Pedestrian ? IRoadGraph::Mode::IgnoreOnewayTag - : IRoadGraph::Mode::ObeyOnewayTag, + , m_roadGraph(m_index, + vehicleType == VehicleType::Pedestrian ? IRoadGraph::Mode::IgnoreOnewayTag + : IRoadGraph::Mode::ObeyOnewayTag, m_vehicleModelFactory) - , m_estimator(EdgeEstimator::Create(m_vehicleType, CalcMaxSpeed(*m_numMwmIds, *m_vehicleModelFactory), m_trafficStash)) + , m_estimator(EdgeEstimator::Create( + m_vehicleType, CalcMaxSpeed(*m_numMwmIds, *m_vehicleModelFactory), m_trafficStash)) , m_directionsEngine(CreateDirectionsEngine(m_vehicleType, m_numMwmIds, m_index)) { CHECK(!m_name.empty(), ()); |