diff options
| author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2019-12-20 20:54:11 +0300 |
|---|---|---|
| committer | Aleksandr Zatsepin <alexzatsepin@users.noreply.github.com> | 2019-12-23 14:08:15 +0300 |
| commit | 766818f2a464629501ce7b7a6800b56efa382743 (patch) | |
| tree | 8631a545e682bdff582594d1a6375b392e910acc | |
| parent | 7265571793b6b41bc99690420b38b1f1de8eab9f (diff) | |
[bookmarks][android] Fixed finding nearest bookmark.
| -rw-r--r-- | android/jni/com/mapswithme/maps/Framework.cpp | 3 | ||||
| -rw-r--r-- | android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp | 6 | ||||
| -rw-r--r-- | map/framework.cpp | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index dd96e2f582..d31dbd04fe 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -1759,8 +1759,7 @@ Java_com_mapswithme_maps_Framework_nativeDeleteBookmarkFromMapObject(JNIEnv * en buildInfo.m_source = place_page::BuildInfo::Source::Other; frm()->UpdatePlacePageInfoForCurrentSelection(buildInfo); - place_page::Info const & updatedInfo = g_framework->GetPlacePageInfo(); - return usermark_helper::CreateMapObject(env, updatedInfo); + return usermark_helper::CreateMapObject(env, g_framework->GetPlacePageInfo()); } JNIEXPORT void JNICALL diff --git a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp index 84fd9f6c0a..45bb90e74a 100644 --- a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp +++ b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp @@ -624,7 +624,7 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeAddBookmarkToLastE { BookmarkManager & bmMng = frm()->GetBookmarkManager(); - place_page::Info & info = g_framework->GetPlacePageInfo(); + place_page::Info const & info = g_framework->GetPlacePageInfo(); kml::BookmarkData bmData; bmData.m_name = info.FormatNewBookmarkName(); @@ -643,7 +643,7 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeAddBookmarkToLastE buildInfo.m_userMarkId = createdBookmark->GetId(); frm()->UpdatePlacePageInfoForCurrentSelection(buildInfo); - return usermark_helper::CreateMapObject(env, info); + return usermark_helper::CreateMapObject(env, g_framework->GetPlacePageInfo()); } JNIEXPORT jlong JNICALL @@ -780,7 +780,7 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeUpdateBookmarkPlac buildInfo.m_userMarkId = static_cast<kml::MarkId>(bmkId); frm()->UpdatePlacePageInfoForCurrentSelection(buildInfo); - return usermark_helper::CreateMapObject(env, info); + return usermark_helper::CreateMapObject(env, g_framework->GetPlacePageInfo()); } JNIEXPORT jobject JNICALL diff --git a/map/framework.cpp b/map/framework.cpp index 11c91f885d..11a31bbfe4 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -2655,7 +2655,9 @@ UserMark const * Framework::FindUserMarkInTapPosition(place_page::BuildInfo cons { if (buildInfo.m_userMarkId != kml::kInvalidMarkId) { - auto mark = GetBookmarkManager().GetUserMark(buildInfo.m_userMarkId); + auto const & bm = GetBookmarkManager(); + auto mark = bm.IsBookmark(buildInfo.m_userMarkId) ? bm.GetBookmark(buildInfo.m_userMarkId) + : bm.GetUserMark(buildInfo.m_userMarkId); if (mark != nullptr) return mark; } |