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

[bookmarks][looonely] Do not force visibility to false for categories that does not have visible constituents. MAPSME-15349

Browse source
This commit is contained in:
Anatoliy Tomilov 2020-12-14 15:50:26 +05:00 • committed by Arsentiy Milchakov
parent 863ca990b5
commit bcabf11a31
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
map/bookmark_manager.cpp
View file

@ -4131,19 +4131,14 @@ void BookmarkManager::MarksChangesTracker::InferVisibility(BookmarkCategory * co
visibility.emplace(compilationId);
}
auto const groupId = group->GetID();
bool hasUserMarksOrDanglingBookmarks = false;
for (kml::MarkId const userMark : m_bmManager->GetUserMarkIds(groupId))
{
if (!m_bmManager->IsBookmark(userMark))
{
hasUserMarksOrDanglingBookmarks = true;
continue;
}
Bookmark * const bookmark = m_bmManager->GetBookmarkForEdit(userMark);
bool isVisible = false;
if (bookmark->GetCompilations().empty())
{
hasUserMarksOrDanglingBookmarks = true;
// Bookmarks that not belong to any compilation have to be visible.
// They can be hidden only by changing parental BookmarkCategory visibility to false.
isVisible = true;
@ -4161,11 +4156,6 @@ void BookmarkManager::MarksChangesTracker::InferVisibility(BookmarkCategory * co
}
bookmark->SetIsVisible(isVisible);
}
if (visibility.empty() && m_bmManager->GetTrackIds(groupId).empty() &&
!hasUserMarksOrDanglingBookmarks)
{
group->SetIsVisible(false);
}
}
void BookmarkManager::MarksChangesTracker::OnAttachBookmark(kml::MarkId markId,