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

Don't load metadata for searchresults without FeatureID

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-03-09 19:07:02 +03:00 • committed by Sergey Yershov
parent 1dc4ead3e1
commit 83f878ea95
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
map/framework.cpp
View file

@ -1132,12 +1132,13 @@ bool Framework::QueryMayBeSkipped(search::SearchParams const & params,
void Framework::LoadSearchResultMetadata(search::Result & res) const
{
if (res.m_metadata.m_isInitialized)
if (res.m_metadata.m_isInitialized || res.GetResultType() != search::Result::RESULT_FEATURE)
return;
FeatureID const & id = res.GetFeatureID();
if (id.IsValid())
search::ProcessMetadata(*GetFeatureByID(id), res.m_metadata);
ASSERT(id.IsValid(), ("Search result doesn't contain valid FeatureID."));
// TODO @yunikkk refactor to format search result metadata accordingly with place_page::Info
search::ProcessMetadata(*GetFeatureByID(id), res.m_metadata);
// res.m_metadata.m_isInitialized is set to true in ProcessMetadata.
}