diff --git a/map/framework.cpp b/map/framework.cpp index 627f59bb6e..fe8dfe9818 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -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. }