diff options
author | tatiana-yan <tatiana.kondakova@gmail.com> | 2018-06-26 10:51:37 +0300 |
---|---|---|
committer | Arsentiy Milchakov <milcars@mapswithme.com> | 2018-06-27 19:20:52 +0300 |
commit | 570b2b0b35df1fad001460eccf35da31e334b8b0 (patch) | |
tree | 2f805cf3122db499b794248f3f6c1bdd232b258c /routing/index_road_graph.cpp | |
parent | dd7186b48be4636c1e67d223817a47f3f3a026e9 (diff) |
[indexer] DataSource refactoring
Diffstat (limited to 'routing/index_road_graph.cpp')
-rw-r--r-- | routing/index_road_graph.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/routing/index_road_graph.cpp b/routing/index_road_graph.cpp index 5d50fd2f38..21bad0a23e 100644 --- a/routing/index_road_graph.cpp +++ b/routing/index_road_graph.cpp @@ -3,7 +3,7 @@ #include "routing/routing_exceptions.hpp" #include "routing/transit_graph.hpp" -#include "editor/editable_data_source.hpp" +#include "editor/editable_feature_source.hpp" #include <cstdint> @@ -13,7 +13,7 @@ namespace routing { IndexRoadGraph::IndexRoadGraph(shared_ptr<NumMwmIds> numMwmIds, IndexGraphStarter & starter, vector<Segment> const & segments, vector<Junction> const & junctions, - DataSourceBase & dataSource) + DataSource & dataSource) : m_dataSource(dataSource), m_numMwmIds(numMwmIds), m_starter(starter), m_segments(segments) { // j0 j1 j2 j3 @@ -60,7 +60,8 @@ void IndexRoadGraph::GetEdgeTypes(Edge const & edge, feature::TypesHolder & type FeatureID const featureId = edge.GetFeatureId(); FeatureType ft; - EditableDataSource::FeaturesLoaderGuard loader(m_dataSource, featureId.m_mwmId); + DataSource::FeaturesLoaderGuard loader(m_dataSource, featureId.m_mwmId, + EditableFeatureSourceFactory()); if (!loader.GetFeatureByIndex(featureId.m_index, ft)) { LOG(LERROR, ("Can't load types for feature", featureId)); |