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

Do not save bookmarks immediately after loading.

Browse source
This commit is contained in:
Daria Volvenkova 2018-03-06 12:50:00 +03:00 • committed by Roman Kuznetsov
parent 17ef511f8b
commit 2dfb7be1f6
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
map/bookmark.hpp
View file

@ -128,7 +128,8 @@ public:
std::string const & GetName() const { return m_name; }
std::string const & GetFileName() const { return m_file; }
bool IsAutoSave() const { return m_autoSave; }
void EnableAutoSave(bool enable) { m_autoSave = enable; }
bool IsAutoSaveEnabled() const { return m_autoSave; }
private:
df::MarkGroupID const m_groupId;

13
map/bookmark_manager.cpp
View file

@ -337,7 +337,7 @@ void BookmarkManager::NotifyChanges()
{
if (IsBookmarkCategory(groupId))
{
if (GetBmCategory(groupId)->IsAutoSave())
if (GetBmCategory(groupId)->IsAutoSaveEnabled())
SaveToKMLFile(groupId);
isBookmarks = true;
}
@ -913,6 +913,7 @@ UserMarkLayer * BookmarkManager::GetGroup(df::MarkGroupID groupId)
void BookmarkManager::CreateCategories(KMLDataCollection && dataCollection, bool autoSave)
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
df::GroupIDSet loadedGroups;
for (auto & data : dataCollection)
{
df::MarkGroupID groupId;
@ -931,7 +932,9 @@ void BookmarkManager::CreateCategories(KMLDataCollection && dataCollection, bool
}
else
{
groupId = CreateBookmarkCategory(data->m_name, autoSave);
groupId = CreateBookmarkCategory(data->m_name, false /* autoSave */);
loadedGroups.insert(groupId);
group = GetBmCategory(groupId);
group->SetFileName(data->m_file);
group->SetIsVisible(data->m_visible);
@ -957,6 +960,12 @@ void BookmarkManager::CreateCategories(KMLDataCollection && dataCollection, bool
}
NotifyChanges();
for (auto const & groupId : loadedGroups)
{
auto * group = GetBmCategory(groupId);
group->EnableAutoSave(autoSave);
}
}
namespace