diff options
| author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2017-07-04 13:58:32 +0300 |
|---|---|---|
| committer | Roman Kuznetsov <r.kuznetsow@gmail.com> | 2017-07-04 15:02:07 +0300 |
| commit | 07111c87a38f62508c8fc96e4f23d05140ed2ee1 (patch) | |
| tree | 5693753024683790d2f76db3a222b7d07a350bb6 | |
| parent | bf957b4b6cad8eb74fc06bdd47c4215f2722f463 (diff) | |
Increased priority of route marks selection by tap.beta-891
| -rw-r--r-- | map/bookmark_manager.cpp | 6 | ||||
| -rw-r--r-- | map/framework.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp index b9ef825d63..c186c7e379 100644 --- a/map/bookmark_manager.cpp +++ b/map/bookmark_manager.cpp @@ -230,10 +230,10 @@ UserMark const * BookmarkManager::FindNearestUserMark(m2::AnyRectD const & rect) UserMark const * BookmarkManager::FindNearestUserMark(TTouchRectHolder const & holder) const { BestUserMarkFinder finder(holder); - for_each(m_categories.begin(), m_categories.end(), ref(finder)); - finder(FindUserMarksContainer(UserMarkType::API_MARK)); - finder(FindUserMarksContainer(UserMarkType::SEARCH_MARK)); finder(FindUserMarksContainer(UserMarkType::ROUTING_MARK)); + finder(FindUserMarksContainer(UserMarkType::SEARCH_MARK)); + finder(FindUserMarksContainer(UserMarkType::API_MARK)); + for_each(m_categories.begin(), m_categories.end(), ref(finder)); return finder.GetFindedMark(); } diff --git a/map/framework.cpp b/map/framework.cpp index 0bc20b3c52..5ecbdc5cc2 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -2490,7 +2490,8 @@ UserMark const * Framework::FindUserMarkInTapPosition(m2::PointD const & pt) con UserMark const * mark = m_bmManager.FindNearestUserMark( [&rect, &bmSearchRect](UserMarkType type) -> m2::AnyRectD const & { - return (type == UserMarkType::BOOKMARK_MARK ? bmSearchRect : rect); + return (type == UserMarkType::BOOKMARK_MARK || + type == UserMarkType::ROUTING_MARK) ? bmSearchRect : rect; }); return mark; } |