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

[indexer] Leave the most important types in FeatureParams::FinishAddingTypes()

Browse source
This commit is contained in:
tatiana-yan 2019-04-16 20:53:43 +03:00 • committed by mpimenov
parent 216a9961e6
commit ed11084e28
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
indexer/feature_data.cpp
View file

@ -177,7 +177,7 @@ void TypesHolder::SortBySpec()
// Put "very common" types to the end of possible PP-description types.
static UselessTypesChecker checker;
UNUSED_VALUE(base::RemoveIfKeepValid(begin(), end(), [](uint32_t t) { return checker(t); }));
UNUSED_VALUE(base::RemoveIfKeepValid(begin(), end(), checker));
}
vector<string> TypesHolder::ToObjectNames() const
@ -496,15 +496,19 @@ bool FeatureParams::FinishAddingTypes()
newTypes.push_back(candidate);
}
// Remove duplicated types.
sort(newTypes.begin(), newTypes.end());
newTypes.erase(unique(newTypes.begin(), newTypes.end()), newTypes.end());
base::SortUnique(newTypes);
if (newTypes.size() > kMaxTypesCount)
{
// Put common types to the end to leave the most important types.
static UselessTypesChecker checker;
UNUSED_VALUE(base::RemoveIfKeepValid(newTypes.begin(), newTypes.end(), checker));
newTypes.resize(kMaxTypesCount);
sort(newTypes.begin(), newTypes.end());
}
m_types.swap(newTypes);
if (m_types.size() > kMaxTypesCount)
m_types.resize(kMaxTypesCount);
// Patch fix that removes house number from localities.
if (!house.IsEmpty() && ftypes::IsLocalityChecker::Instance()(m_types))
{