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

[search] For now, rank search results by distance only.

Browse source
This commit is contained in:
Yury Melnichek 2011-09-25 03:48:08 +02:00 • committed by Alex Zolotarev
parent 3a0cb52832
commit 23c43f9738
3 changed files with 10 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
search/intermediate_result.cpp
View file

@ -11,12 +11,9 @@ namespace impl
{
IntermediateResult::IntermediateResult(m2::RectD const & viewportRect,
FeatureType const & feature,
string const & displayName,
int matchPenalty,
int minVisibleScale)
: m_str(displayName), m_rect(feature::GetFeatureViewport(feature)), m_matchPenalty(matchPenalty),
m_minVisibleScale(minVisibleScale), m_resultType(RESULT_FEATURE)
FeatureType const & feature)
: m_str(feature.GetPreferredDrawableName()), m_rect(feature::GetFeatureViewport(feature)),
m_resultType(RESULT_FEATURE)
{
FeatureType::GetTypesFn types;
feature.ForEachTypeRef(types);
@ -31,7 +28,7 @@ IntermediateResult::IntermediateResult(m2::RectD const & viewportRect,
: m_str("(" + strings::to_string(lat) + ", " + strings::to_string(lon) + ")"),
m_rect(MercatorBounds::LonToX(lon - precision), MercatorBounds::LatToY(lat - precision),
MercatorBounds::LonToX(lon + precision), MercatorBounds::LatToY(lat + precision)),
m_type(0), m_matchPenalty(0), m_minVisibleScale(0), m_resultType(RESULT_LATLON)
m_type(0), m_resultType(RESULT_LATLON)
{
m_distance = ResultDistance(viewportRect.Center(), m_rect.Center());
m_direction = ResultDirection(viewportRect.Center(), m_rect.Center());
@ -39,7 +36,7 @@ IntermediateResult::IntermediateResult(m2::RectD const & viewportRect,
IntermediateResult::IntermediateResult(string name, string completionString, int penalty)
: m_str(name), m_completionString(completionString),
m_matchPenalty(0), m_minVisibleScale(penalty), m_distance(0), m_direction(0),
m_distance(0), m_direction(0),
m_resultType(RESULT_CATEGORY)
{
}
@ -48,27 +45,17 @@ bool IntermediateResult::operator < (IntermediateResult const & o) const
{
if (m_resultType != o.m_resultType)
return m_resultType < o.m_resultType;
if (m_matchPenalty != o.m_matchPenalty)
return m_matchPenalty < o.m_matchPenalty;
if (m_minVisibleScale != o.m_minVisibleScale)
return m_minVisibleScale < o.m_minVisibleScale;
if (m_distance != o.m_distance)
return m_distance < o.m_distance;
return false;
}
Result IntermediateResult::GenerateFinalResult() const
{
//#ifdef DEBUG
// return Result(m_str
// + ' ' + strings::to_string(m_distance * 0.001)
// + ' ' + strings::to_string(m_direction / math::pi * 180.0)
// + ' ' + strings::to_string(m_matchPenalty)
// + ' ' + strings::to_string(m_minVisibleScale),
//#else
switch (m_resultType)
{
case RESULT_FEATURE:
return Result(m_str + ' ' + strings::to_string(m_matchPenalty), m_type, m_rect,
m_distance, m_direction);
return Result(m_str, m_type, m_rect, m_distance, m_direction);
case RESULT_LATLON:
return Result(m_str, 0, m_rect, m_distance, m_direction);
case RESULT_CATEGORY:

7
search/intermediate_result.hpp
View file

@ -19,10 +19,7 @@ public:
// For RESULT_FEATURE.
IntermediateResult(m2::RectD const & viewportRect,
FeatureType const & feature,
string const & displayName,
int matchPenalty,
int minVisibleScale);
FeatureType const & feature);
// For RESULT_LATLON.
IntermediateResult(m2::RectD const & viewportRect, double lat, double lon, double precision);
@ -44,8 +41,6 @@ private:
string m_completionString;
m2::RectD m_rect;
uint32_t m_type;
int m_matchPenalty;
int m_minVisibleScale;
double m_distance;
double m_direction;
ResultType m_resultType;

3
search/search_query.cpp
View file

@ -95,8 +95,7 @@ struct FeatureLoader
++m_count;
FeatureType feature;
m_featuresVector.Get(offset, feature);
m_query.AddResult(impl::IntermediateResult(m_query.m_viewport, feature,
feature.GetPreferredDrawableName(), 0, 0));
m_query.AddResult(impl::IntermediateResult(m_query.m_viewport, feature));
}
};