drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-21 22:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format all C++ and Java code via clang-format

Browse Source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin
2025-08-17 14:32:37 +07:00
parent 9f0290c0ec
commit bfffa1fff4
2169 changed files with 56441 additions and 64188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
libs/search/retrieval.cpp
View File

@@ -46,8 +46,7 @@ public:
, m_features(features)
, m_exactlyMatchedFeatures(exactlyMatchedFeatures)
, m_counter(0)
{
}
{}
template <typename Value>
void operator()(Value const & value, bool exactMatch)
@@ -189,8 +188,7 @@ pair<bool, bool> MatchesByType(feature::TypesHolder const & types, vector<DFA> c
}
template <typename DFA>
pair<bool, bool> MatchFeatureByNameAndType(EditableMapObject const & emo,
SearchTrieRequest<DFA> const & request)
pair<bool, bool> MatchFeatureByNameAndType(EditableMapObject const & emo, SearchTrieRequest<DFA> const & request)
{
auto const & th = emo.GetTypes();
@@ -249,14 +247,11 @@ Retrieval::ExtendedFeatures RetrieveAddressFeaturesImpl(Retrieval::TrieRoot<Valu
vector<uint64_t> exactlyMatchedFeatures;
FeaturesCollector collector(cancellable, features, exactlyMatchedFeatures);
MatchFeaturesInTrie(
request, root,
[&holder](Value const & value) {
return !holder.ModifiedOrDeleted(base::asserted_cast<uint32_t>(value.m_featureId));
} /* filter */,
collector);
MatchFeaturesInTrie(request, root, [&holder](Value const & value)
{ return !holder.ModifiedOrDeleted(base::asserted_cast<uint32_t>(value.m_featureId)); } /* filter */, collector);
holder.ForEachModifiedOrCreated([&](EditableMapObject const & emo, uint64_t index) {
holder.ForEachModifiedOrCreated([&](EditableMapObject const & emo, uint64_t index)
{
auto const matched = MatchFeatureByNameAndType(emo, request);
if (matched.first)
{
@@ -280,14 +275,11 @@ Retrieval::ExtendedFeatures RetrievePostcodeFeaturesImpl(Retrieval::TrieRoot<Val
vector<uint64_t> exactlyMatchedFeatures;
FeaturesCollector collector(cancellable, features, exactlyMatchedFeatures);
MatchPostcodesInTrie(
slice, root,
[&holder](Value const & value) {
return !holder.ModifiedOrDeleted(base::asserted_cast<uint32_t>(value.m_featureId));
} /* filter */,
collector);
MatchPostcodesInTrie(slice, root, [&holder](Value const & value)
{ return !holder.ModifiedOrDeleted(base::asserted_cast<uint32_t>(value.m_featureId)); } /* filter */, collector);
holder.ForEachModifiedOrCreated([&](EditableMapObject const & emo, uint64_t index) {
holder.ForEachModifiedOrCreated([&](EditableMapObject const & emo, uint64_t index)
{
if (MatchFeatureByPostcode(emo, slice))
features.push_back(index);
});
@@ -296,8 +288,8 @@ Retrieval::ExtendedFeatures RetrievePostcodeFeaturesImpl(Retrieval::TrieRoot<Val
}
Retrieval::ExtendedFeatures RetrieveGeometryFeaturesImpl(MwmContext const & context,
base::Cancellable const & cancellable,
m2::RectD const & rect, int scale)
base::Cancellable const & cancellable, m2::RectD const & rect,
int scale)
{
EditedFeaturesHolder holder(context.GetId());
@@ -311,7 +303,8 @@ Retrieval::ExtendedFeatures RetrieveGeometryFeaturesImpl(MwmContext const & cont
context.ForEachIndex(coverage, scale, collector);
holder.ForEachModifiedOrCreated([&](EditableMapObject const & emo, uint64_t index) {
holder.ForEachModifiedOrCreated([&](EditableMapObject const & emo, uint64_t index)
{
auto const center = emo.GetMercator();
if (rect.IsPointInside(center))
features.push_back(index);
@@ -342,13 +335,15 @@ struct RetrievePostcodeFeaturesAdaptor
template <typename Value>
unique_ptr<Retrieval::TrieRoot<Value>> ReadTrie(ModelReaderPtr & reader)
{
return trie::ReadTrie<SubReaderWrapper<Reader>, ValueList<Value>>(
SubReaderWrapper<Reader>(reader.GetPtr()), SingleValueSerializer<Value>());
return trie::ReadTrie<SubReaderWrapper<Reader>, ValueList<Value>>(SubReaderWrapper<Reader>(reader.GetPtr()),
SingleValueSerializer<Value>());
}
} // namespace
Retrieval::Retrieval(MwmContext const & context, base::Cancellable const & cancellable)
: m_context(context), m_cancellable(cancellable), m_reader(unique_ptr<ModelReader>())
: m_context(context)
, m_cancellable(cancellable)
, m_reader(unique_ptr<ModelReader>())
{
auto const & value = context.m_value;
@@ -375,8 +370,7 @@ Retrieval::Retrieval(MwmContext const & context, base::Cancellable const & cance
m_root = ReadTrie<Uint64IndexValue>(m_reader);
}
Retrieval::ExtendedFeatures Retrieval::RetrieveAddressFeatures(
SearchTrieRequest<UniStringDFA> const & request) const
Retrieval::ExtendedFeatures Retrieval::RetrieveAddressFeatures(SearchTrieRequest<UniStringDFA> const & request) const
{
return Retrieve<RetrieveAddressFeaturesAdaptor>(request);
}
@@ -387,8 +381,7 @@ Retrieval::ExtendedFeatures Retrieval::RetrieveAddressFeatures(
return Retrieve<RetrieveAddressFeaturesAdaptor>(request);
}
Retrieval::ExtendedFeatures Retrieval::RetrieveAddressFeatures(
SearchTrieRequest<LevenshteinDFA> const & request) const
Retrieval::ExtendedFeatures Retrieval::RetrieveAddressFeatures(SearchTrieRequest<LevenshteinDFA> const & request) const
{
return Retrieve<RetrieveAddressFeaturesAdaptor>(request);
}