diff options
Diffstat (limited to 'openlr/openlr_decoder.cpp')
| -rw-r--r-- | openlr/openlr_decoder.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openlr/openlr_decoder.cpp b/openlr/openlr_decoder.cpp index 42adfb9689..8c6c12ddd2 100644 --- a/openlr/openlr_decoder.cpp +++ b/openlr/openlr_decoder.cpp @@ -81,7 +81,7 @@ struct alignas(kCacheLineSize) Stats bool IsRealVertex(m2::PointD const & p, FeatureID const & fid, DataSource const & dataSource) { - DataSource::FeaturesLoaderGuard g(dataSource, fid.m_mwmId); + DataSource::FeaturesLoaderGuard g(dataSource, fid.m_mwmId, FeatureSourceFactory()); auto const ft = g.GetOriginalFeatureByIndex(fid.m_index); bool matched = false; ft->ForEachPoint( @@ -189,7 +189,7 @@ void CopyWithoutOffsets(InputIterator const start, InputIterator const stop, Out class SegmentsDecoderV1 { public: - SegmentsDecoderV1(DataSourceBase const & dataSource, unique_ptr<CarModelFactory> cmf) + SegmentsDecoderV1(DataSource const & dataSource, unique_ptr<CarModelFactory> cmf) : m_roadGraph(dataSource, IRoadGraph::Mode::ObeyOnewayTag, move(cmf)) , m_infoGetter(dataSource) , m_router(m_roadGraph, m_infoGetter) @@ -378,7 +378,7 @@ bool OpenLRDecoder::SegmentsFilter::Matches(LinearSegment const & segment) const } // OpenLRDecoder ----------------------------------------------------------------------------- -OpenLRDecoder::OpenLRDecoder(vector<DataSource> const & dataSources, +OpenLRDecoder::OpenLRDecoder(vector<unique_ptr<DataSource>> const & dataSources, CountryParentNameGetter const & countryParentNameGetter) : m_dataSources(dataSources), m_countryParentNameGetter(countryParentNameGetter) { @@ -430,9 +430,9 @@ void OpenLRDecoder::Decode(vector<LinearSegment> const & segments, vector<Stats> stats(numThreads); vector<thread> workers; for (size_t i = 1; i < numThreads; ++i) - workers.emplace_back(worker, i, ref(m_dataSources[i]), ref(stats[i])); + workers.emplace_back(worker, i, ref(*m_dataSources[i]), ref(stats[i])); - worker(0 /* threadNum */, m_dataSources[0], stats[0]); + worker(0 /* threadNum */, *m_dataSources[0], stats[0]); for (auto & worker : workers) worker.join(); |