RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[indexer] Change parameters order

Browse source
This commit is contained in:
Sergey Yershov 2018-06-14 19:41:52 +03:00 • committed by mpimenov
parent d3a9093765
commit bcf02040d4
4 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
indexer/index.hpp
View file

@ -91,7 +91,7 @@ private:
for (auto const & i : intervals)
{
index.ForEachInIntervalAndScale(
index.ForEachInIntervalAndScale(i.first, i.second, scale,
[&](uint32_t index)
{
if (!checkUnique(index))
@ -115,8 +115,7 @@ private:
fv.GetByIndex(index, feature);
feature.SetID(FeatureID(mwmID, index));
m_f(feature);
},
i.first, i.second, scale);
});
}
}
}
@ -159,15 +158,14 @@ private:
for (auto const & i : intervals)
{
index.ForEachInIntervalAndScale(
index.ForEachInIntervalAndScale(i.first, i.second, scale,
[&](uint32_t index)
{
if (datasource::FeatureStatus::Deleted !=
m_editor.GetFeatureStatus(mwmID, index) &&
checkUnique(index))
m_f(FeatureID(mwmID, index));
},
i.first, i.second, scale);
});
}
}
}

4
indexer/indexer_tests/scale_index_reading_tests.cpp
View file

@ -52,8 +52,8 @@ public:
vector<uint32_t> indices;
for (auto const & interval : covering.Get<RectId::DEPTH_LEVELS>(scale))
{
index.ForEachInIntervalAndScale([&](uint32_t index) { indices.push_back(index); },
interval.first, interval.second, scale);
index.ForEachInIntervalAndScale(interval.first, interval.second, scale,
[&](uint32_t index) { indices.push_back(index); });
}
Index::FeaturesLoaderGuard loader(m_index, id);

5
indexer/scale_index.hpp
View file

@ -52,14 +52,13 @@ public:
m_IndexForScale.push_back(factory.CreateIndex(treesReader.SubReader(i)));
}
template <typename F>
void ForEachInIntervalAndScale(F const & f, uint64_t beg, uint64_t end, int scale) const
void ForEachInIntervalAndScale(uint64_t beg, uint64_t end, int scale, std::function<void(uint32_t)> const & fn) const
{
auto const scaleBucket = BucketByScale(scale);
if (scaleBucket < m_IndexForScale.size())
{
for (size_t i = 0; i <= scaleBucket; ++i)
m_IndexForScale[i]->ForEach(f, beg, end);
m_IndexForScale[i]->ForEach(fn, beg, end);
}
}

5
search/mwm_context.hpp
View file

@ -92,13 +92,12 @@ private:
{
CheckUniqueIndexes checkUnique(m_value.GetHeader().GetFormat() >= version::Format::v5);
for (auto const & i : intervals)
m_index.ForEachInIntervalAndScale(
m_index.ForEachInIntervalAndScale(i.first, i.second, scale,
[&](uint32_t index)
{
if (checkUnique(index))
fn(index);
},
i.first, i.second, scale);
});
}
FeaturesVector m_vector;