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

Merge pull request #2464 from deathbaba/fixes

Browse source 
[android][ios] Correctly reset bookmark/api/search result selection on PP close.
This commit is contained in:
Viktor Govako 2016-03-24 13:05:17 +03:00
commit 2b91ad0b90
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
map/framework.cpp
View file

@ -732,6 +732,7 @@ void Framework::ShowBookmark(BookmarkAndCategory const & bnc)
place_page::Info info;
FillBookmarkInfo(*mark, bnc, info);
ActivateMapSelection(true, df::SelectionShape::OBJECT_USER_MARK, info);
m_lastTapEvent.reset(new df::TapInfo { m_currentModelView.GtoP(info.GetMercator()), false, false, info.GetID() });
}
void Framework::ShowTrack(Track const & track)
@ -1289,6 +1290,7 @@ void Framework::ShowSearchResult(search::Result const & res)
UserMarkContainer::UserMarkForPoi()->SetPtOrg(center);
ActivateMapSelection(false, df::SelectionShape::OBJECT_POI, info);
m_lastTapEvent.reset(new df::TapInfo { m_currentModelView.GtoP(center), false, false, info.GetID() });
}
size_t Framework::ShowSearchResults(search::Results const & results)
@ -1701,6 +1703,7 @@ bool Framework::ShowMapForURL(string const & url)
FillPointInfo(point, name, info);
ActivateMapSelection(false, df::SelectionShape::OBJECT_POI, info);
}
m_lastTapEvent.reset(new df::TapInfo{ m_currentModelView.GtoP(info.GetMercator()), false, false, info.GetID() });
}
return true;

3
map/place_page_info.cpp
View file

@ -44,6 +44,9 @@ string Info::GetTitle() const
string Info::GetSubtitle() const
{
if (!IsFeature())
return {};
vector<string> values;
// Type.