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

Bookmarks visibility fix.

Browse source 
If two bookmarks are close to each other and one of them invisible, then we have to return the visible bookmark.
This commit is contained in:
Kirill Zhdanovich 2013-01-11 16:28:19 +03:00 • committed by Alex Zolotarev
parent e2ebac9496
commit 08690761ad
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
map/framework.cpp
View file

@ -490,9 +490,12 @@ BookmarkAndCategory Framework::GetBookmark(m2::PointD const & pxPoint, double vi
int retBookmarkCategory = -1;
int retBookmark = -1;
double minD = numeric_limits<double>::max();
bool returnBookmarkIsVisible = false;
for (size_t i = 0; i < m_bookmarks.size(); ++i)
{
bool currentCategoryIsVisible = m_bookmarks[i]->IsVisible();
if (!currentCategoryIsVisible && returnBookmarkIsVisible)
continue;
size_t const count = m_bookmarks[i]->GetBookmarksCount();
for (size_t j = 0; j < count; ++j)
{
@ -502,11 +505,13 @@ BookmarkAndCategory Framework::GetBookmark(m2::PointD const & pxPoint, double vi
if (rect.IsPointInside(pt))
{
double const d = rect.Center().SquareLength(pt);
if (d < minD)
if ((currentCategoryIsVisible && !returnBookmarkIsVisible) ||
(d < minD))
{
retBookmarkCategory = static_cast<int>(i);
retBookmark = static_cast<int>(j);
minD = d;
returnBookmarkIsVisible = m_bookmarks[i]->IsVisible();
}
}
}