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

[and] Show balloon above bmk when clicked in list.

Browse source
This commit is contained in:
Dmitry Kunin 2013-07-18 15:28:44 +03:00 • committed by Alex Zolotarev
parent 5b3661b640
commit 9a369a44d3
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
View file

@ -16,7 +16,8 @@ extern "C"
Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_showBookmarkOnMap(
JNIEnv * env, jobject thiz, jint c, jint b)
{
frm()->ShowBookmark(*(frm()->GetBmCategory(c)->GetBookmark(b)));
BookmarkAndCategory bnc = BookmarkAndCategory(c,b);
frm()->ShowBookmark(*(frm()->GetBmCategory(c)->GetBookmark(b)), bnc);
frm()->SaveState();
}

5
map/framework.cpp
View file

@ -480,10 +480,13 @@ BookmarkAndCategory Framework::GetBookmark(m2::PointD const & pxPoint, double vi
return make_pair(retBookmarkCategory, retBookmark);
}
void Framework::ShowBookmark(Bookmark const & bm)
void Framework::ShowBookmark(Bookmark const & bm, BookmarkAndCategory bnc)
{
StopLocationFollow();
// show ballon above
GetBalloonManager().ShowBookmark(bnc);
double scale = bm.GetScale();
if (scale == -1.0)
scale = scales::GetUpperComfortScale();

2
map/framework.hpp
View file

@ -199,7 +199,7 @@ public:
BookmarkAndCategory GetBookmark(m2::PointD const & pxPoint, double visualScale) const;
//@}
void ShowBookmark(Bookmark const & bm);
void ShowBookmark(Bookmark const & bm, BookmarkAndCategory bnc);
void ClearBookmarks();