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

Remove unused strings from search::Query.

Browse source
This commit is contained in:
vng 2012-07-24 12:54:00 -07:00 • committed by Alex Zolotarev
parent b323f50246
commit bf5fcdfa60
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
search/search_query.cpp
View file

@ -193,8 +193,6 @@ void Query::UpdateViewportOffsets(MWMVectorT const & mwmInfo, m2::RectD const &
void Query::InitSearch(string const & query)
{
m_cancel = false;
m_rawQuery = query;
m_uniQuery = NormalizeAndSimplifyString(m_rawQuery);
m_tokens.clear();
m_prefix.clear();
}
@ -217,16 +215,17 @@ void Query::ClearQueues()
m_results[i].clear();
}
void Query::Search(string const & query, Results & res, unsigned int resultsNeeded)
void Query::Search(string const & query, Results & res)
{
// Initialize.
InitSearch(query);
search::Delimiters delims;
SplitUniString(m_uniQuery, MakeBackInsertFunctor(m_tokens), delims);
SplitUniString(NormalizeAndSimplifyString(query),
MakeBackInsertFunctor(m_tokens), delims);
if (!m_tokens.empty() && !delims(strings::LastUniChar(m_rawQuery)))
if (!m_tokens.empty() && !delims(strings::LastUniChar(query)))
{
m_prefix.swap(m_tokens.back());
m_tokens.pop_back();
@ -241,7 +240,7 @@ void Query::Search(string const & query, Results & res, unsigned int resultsNeed
// Match (lat, lon).
{
double lat, lon, latPrec, lonPrec;
if (search::MatchLatLon(m_rawQuery, lat, lon, latPrec, lonPrec))
if (search::MatchLatLon(query, lat, lon, latPrec, lonPrec))
{
//double const precision = 5.0 * max(0.0001, min(latPrec, lonPrec)); // Min 55 meters
res.AddResult(MakeResult(impl::PreResult2(GetViewport(), m_position, lat, lon)));

4
search/search_query.hpp
View file

@ -74,7 +74,7 @@ public:
void SetPreferredLanguage(string const & lang);
inline void SetInputLanguage(int8_t lang) { m_inputLang = lang; }
void Search(string const & query, Results & res, unsigned int resultsNeeded = 10);
void Search(string const & query, Results & res);
void SearchAllInViewport(m2::RectD const & viewport, Results & res, unsigned int resultsNeeded = 30);
void SearchAdditional(Results & res);
@ -144,8 +144,6 @@ private:
volatile bool m_cancel;
string m_rawQuery;
strings::UniString m_uniQuery;
buffer_vector<strings::UniString, 32> m_tokens;
strings::UniString m_prefix;