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

[search] Fix duplicating of different feature types.

Browse source
This commit is contained in:
vng 2012-01-24 18:20:19 +03:00 • committed by Alex Zolotarev
parent 0547890361
commit 928e5ca8bd
2 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
search/intermediate_result.cpp
View file

@ -225,11 +225,8 @@ bool IntermediateResult::LessLinearTypesF::operator()
if (r1.m_str != r2.m_str)
return (r1.m_str < r2.m_str);
uint8_t const i1 = FirstLevelIndex(r1.m_type);
uint8_t const i2 = FirstLevelIndex(r2.m_type);
if (i1 != i2)
return (i1 < i2);
if (r1.m_type != r2.m_type)
return (r1.m_type < r2.m_type);
// Should stay the best feature, after unique, so add this criteria:
@ -245,9 +242,7 @@ bool IntermediateResult::EqualLinearTypesF::operator()
{
// filter equal linear features
static IsLinearChecker checker;
uint8_t const ind = FirstLevelIndex(r1.m_type);
return (ind == FirstLevelIndex(r2.m_type) && checker.IsMy(ind));
return (r1.m_type == r2.m_type && checker.IsMy(FirstLevelIndex(r1.m_type)));
}
return false;

35
search/search_query.cpp
View file

@ -224,6 +224,10 @@ void Query::AddResult(ValueT const & result)
{
m_results[i].push(result);
}
//else
//{
// LOG(LINFO, ("Skipped feature:", result));
//}
}
}
@ -395,13 +399,31 @@ void Query::GetBestMatchName(FeatureType const & f, uint32_t & penalty, string &
namespace impl
{
struct FeatureLoader
class FeatureLoader
{
uint32_t m_count;
size_t m_count;
FeaturesVector & m_featuresVector;
Query & m_query;
string m_fName;
/*
class DoFindByName
{
string m_name;
public:
DoFindByName(char const * s) : m_name(s) {}
bool operator() (uint8_t, string const & s)
{
if (m_name.find_first_of(s) != string::npos)
LOG(LINFO, ("Found name: ", s));
return true;
}
};
*/
public:
FeatureLoader(FeaturesVector & featuresVector, Query & query, string const & fName)
: m_count(0), m_featuresVector(featuresVector), m_query(query), m_fName(fName)
{
@ -412,9 +434,16 @@ struct FeatureLoader
++m_count;
FeatureType feature;
m_featuresVector.Get(offset, feature);
//#ifdef DEBUG
// DoFindByName doFind("ул. Карбышева");
// feature.ForEachNameRef(doFind);
//#endif
m_query.AddFeatureResult(feature, m_fName);
}
size_t GetCount() const { return m_count; }
void Reset() { m_count = 0; }
};
@ -519,7 +548,7 @@ void Query::SearchFeatures(vector<vector<strings::UniString> > const & tokens,
LOG(LDEBUG, ("Lang:",
StringUtf8Multilang::GetLangByCode(static_cast<int8_t>(edge[0])),
"Matched: ",
emitter.m_count));
emitter.GetCount()));
emitter.Reset();
}