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

[search] Put search mark on the correct point (not approximate from Result).

Browse source
This commit is contained in:
vng 2014-08-05 16:54:53 +03:00 • committed by Alex Zolotarev
parent 736bf05a67
commit 1f3b3f3d26
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
map/framework.cpp
View file

@ -1347,7 +1347,7 @@ bool Framework::GetCurrentPosition(double & lat, double & lon) const
void Framework::ShowSearchResult(search::Result const & res)
{
UserMarkContainer::Type type = UserMarkContainer::SEARCH_MARK;
UserMarkContainer::Type const type = UserMarkContainer::SEARCH_MARK;
m_bmManager.UserMarksSetVisible(type, true);
m_bmManager.UserMarksClear(type);
m_bmManager.UserMarksSetDrawable(type, false);
@ -1355,15 +1355,6 @@ void Framework::ShowSearchResult(search::Result const & res)
m_lastSearch.Clear();
m_fixedSearchResults = 0;
search::AddressInfo info;
info.MakeFrom(res);
m2::PointD const ptOrg = res.GetFeatureCenter();
SearchMarkPoint * mark = static_cast<SearchMarkPoint *>(m_bmManager.UserMarksAddMark(type, ptOrg));
mark->SetInfo(info);
m_balloonManager.OnShowMark(mark);
int scale;
m2::PointD center;
@ -1396,6 +1387,14 @@ void Framework::ShowSearchResult(search::Result const & res)
ShowRectExVisibleScale(m_scales.GetRectForDrawScale(scale, center));
StopLocationFollow();
search::AddressInfo info;
info.MakeFrom(res);
SearchMarkPoint * mark = static_cast<SearchMarkPoint *>(m_bmManager.UserMarksAddMark(type, center));
mark->SetInfo(info);
m_balloonManager.OnShowMark(mark);
}
size_t Framework::ShowAllSearchResults()