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

[search] Fixed categorial rank.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2024-01-18 12:44:48 -03:00
parent 33b2542fcd
commit 28b42affe3
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
search/features_layer_matcher.hpp
View file

@ -91,8 +91,7 @@ public:
MatchPOIsWithParent(child, parent, fn);
break;
case Model::TYPE_STREET:
ASSERT(Model::IsPoi(child.m_type) || child.m_type == Model::TYPE_BUILDING,
("Invalid child layer type:", child.m_type));
ASSERT(Model::IsPoiOrBuilding(child.m_type), ("Invalid child layer type:", child.m_type));
if (Model::IsPoi(child.m_type))
MatchPOIsWithStreets(child, parent, fn);
else

2
search/geocoder.cpp
View file

@ -1783,7 +1783,7 @@ void Geocoder::TraceResult(Tracer & tracer, BaseContext const & ctx, MwmSet::Mwm
{
SCOPE_GUARD(emitParse, [&]() { tracer.EmitParse(ctx.m_tokens); });
if (!Model::IsPoi(type) && type != Model::TYPE_BUILDING)
if (!Model::IsPoiOrBuilding(type))
return;
if (mwmId != m_context->GetId())

1
search/model.hpp
View file

@ -56,6 +56,7 @@ public:
}
static bool IsPoi(Type const type) { return type == TYPE_SUBPOI || type == TYPE_COMPLEX_POI; }
static bool IsPoiOrBuilding(Type const type) { return IsPoi(type) || type == TYPE_BUILDING; }
Type GetType(FeatureType & feature) const;
};

2
search/ranker.cpp
View file

@ -363,7 +363,7 @@ public:
info.m_nameScore = NameScore::SUBSTRING;
}
}
else if (m_params.IsCategorialRequest() && Model::IsPoi(info.m_type))
else if (m_params.IsCategorialRequest() && Model::IsPoiOrBuilding(info.m_type))
{
// Update info.m_classifType.poi with the _best preferred_ type. Important for categorial request,
// when the Feature maybe a restaurant and a toilet simultaneously.