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

[search] feature::MinDrawableScaleForText() is slow, check it only if the feature matches.

Browse source
This commit is contained in:
Yury Melnichek 2011-06-03 18:19:47 +02:00 • committed by Alex Zolotarev
parent f4184429ec
commit 12d4c40232
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
search/query.cpp
View file

@ -64,10 +64,6 @@ struct FeatureProcessor
void operator () (FeatureType const & feature) const
{
int const minVisibleScale = feature::MinDrawableScaleForText(feature);
if (minVisibleScale < 0)
return;
KeywordMatcher matcher(MakeMatcher(m_query.m_keywords, m_query.m_prefix));
feature.ForEachNameRef(matcher);
if (matcher.GetPrefixMatchScore() <= GetMaxKeywordMatchScore())
@ -75,6 +71,10 @@ struct FeatureProcessor
uint32_t const matchScore = matcher.GetMatchScore();
if (matchScore <= GetMaxKeywordMatchScore())
{
int const minVisibleScale = feature::MinDrawableScaleForText(feature);
if (minVisibleScale < 0)
return;
m_query.AddResult(IntermediateResult(feature, matcher.GetBestPrefixMatch(),
matchScore, minVisibleScale));
}