diff options
| author | Sergey Yershov <syershov@maps.me> | 2018-06-22 19:56:54 +0300 |
|---|---|---|
| committer | Tatiana Yan <tatiana.kondakova@gmail.com> | 2018-06-25 15:34:14 +0300 |
| commit | cce5c3a0ccd46b27aa5bf25fd2561dc781d7738b (patch) | |
| tree | dde51f79d59b937af66a23e66f5c4e3355d2c078 /routing/cross_mwm_graph.cpp | |
| parent | 885dcbed8914faf3f91aa38c2aa8664227ec254c (diff) | |
Rename variables and methods (index to DataSource)
Diffstat (limited to 'routing/cross_mwm_graph.cpp')
| -rw-r--r-- | routing/cross_mwm_graph.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/routing/cross_mwm_graph.cpp b/routing/cross_mwm_graph.cpp index 70051d025c..7351265c5e 100644 --- a/routing/cross_mwm_graph.cpp +++ b/routing/cross_mwm_graph.cpp @@ -50,14 +50,14 @@ CrossMwmGraph::CrossMwmGraph(shared_ptr<NumMwmIds> numMwmIds, shared_ptr<m4::Tree<NumMwmId>> numMwmTree, shared_ptr<VehicleModelFactoryInterface> vehicleModelFactory, VehicleType vehicleType, CourntryRectFn const & countryRectFn, - DataSourceBase & index) - : m_index(index) + DataSourceBase & dataSource) + : m_dataSource(dataSource) , m_numMwmIds(numMwmIds) , m_numMwmTree(numMwmTree) , m_vehicleModelFactory(vehicleModelFactory) , m_countryRectFn(countryRectFn) - , m_crossMwmIndexGraph(index, numMwmIds, vehicleType) - , m_crossMwmTransitGraph(index, numMwmIds, VehicleType::Transit) + , m_crossMwmIndexGraph(dataSource, numMwmIds, vehicleType) + , m_crossMwmTransitGraph(dataSource, numMwmIds, VehicleType::Transit) { CHECK(m_numMwmIds, ()); CHECK(m_vehicleModelFactory, ()); @@ -200,7 +200,7 @@ void CrossMwmGraph::GetTwins(Segment const & s, bool isOutgoing, vector<Segment> FindBestTwins(s.GetMwmId(), isOutgoing, ft, p, minDistSegs, twins); }; - m_index.ForEachInRect( + m_dataSource.ForEachInRect( findBestTwins, MercatorBounds::RectByCenterXYAndSizeInMeters(p, kTransitionEqualityDistM), scales::GetUpperScale()); @@ -258,7 +258,7 @@ TransitionPoints CrossMwmGraph::GetTransitionPoints(Segment const & s, bool isOu CrossMwmGraph::MwmStatus CrossMwmGraph::GetMwmStatus(NumMwmId numMwmId, string const & sectionName) const { - MwmSet::MwmHandle handle = m_index.GetMwmHandleByCountryFile(m_numMwmIds->GetFile(numMwmId)); + MwmSet::MwmHandle handle = m_dataSource.GetMwmHandleByCountryFile(m_numMwmIds->GetFile(numMwmId)); if (!handle.IsAlive()) return MwmStatus::NotLoaded; |