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

Correctly pass feature from search results to PP.

Browse source
This commit is contained in:
Alex Zolotarev 2016-01-29 16:56:45 +03:00 • committed by Sergey Yershov
parent d4ec28e02c
commit 8035be121a
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
map/framework.cpp
View file

@ -1174,14 +1174,7 @@ void Framework::LoadSearchResultMetadata(search::Result & res) const
FeatureID const & id = res.GetFeatureID();
if (id.IsValid())
{
Index::FeaturesLoaderGuard loader(m_model.GetIndex(), id.m_mwmId);
FeatureType ft;
loader.GetFeatureByIndex(id.m_index, ft);
search::ProcessMetadata(ft, res.m_metadata);
}
search::ProcessMetadata(*GetFeatureByID(id), res.m_metadata);
res.m_metadata.m_isInitialized = true;
}
@ -1323,7 +1316,12 @@ void Framework::FillSearchResultsMarks(search::Results const & results)
Result const & r = results.GetResult(i);
if (r.HasPoint())
guard.m_controller.CreateUserMark(r.GetFeatureCenter());
{
UserMark * mark = guard.m_controller.CreateUserMark(r.GetFeatureCenter());
// Store feature from the search result.
// TODO(AlexZ): Refactor all usermarks code.
mark->SetFeature(GetFeatureByID(r.GetFeatureID()));
}
}
}
@ -1939,9 +1937,13 @@ UserMark const * Framework::OnTapEventImpl(m2::PointD pxPoint, bool isLong, bool
if (mark != nullptr)
{
// TODO(AlexZ): Refactor out together with UserMarks.
const_cast<UserMark *>(mark)->SetFeature(fid.IsValid() ?
GetFeatureByID(fid) :
GetFeatureAtMercatorPoint(mark->GetPivot()));
// Do not reset feature if it's already there (e.g. from Search results).
if (nullptr == mark->GetFeature())
{
const_cast<UserMark *>(mark)->SetFeature(fid.IsValid() ?
GetFeatureByID(fid) :
GetFeatureAtMercatorPoint(mark->GetPivot()));
}
return mark;
}