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

[bookmarks] review fixes for compilations

Browse source
This commit is contained in:
Arsentiy Milchakov 2020-10-09 18:19:20 +03:00 • committed by Anatoliy V. Tomilov
parent 03d78e979e
commit 26f616712d
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
map/bookmark_manager.cpp
View file

@ -2722,7 +2722,7 @@ kml::MarkGroupId BookmarkManager::CreateBookmarkCategory(std::string const & nam
return groupId;
}
kml::MarkGroupId BookmarkManager::CreateBookmarkCompilation(kml::CategoryData && data)
BookmarkCategory * BookmarkManager::CreateBookmarkCompilation(kml::CategoryData && data)
{
CHECK_THREAD_CHECKER(m_threadChecker, ());
if (data.m_id == kml::kInvalidMarkGroupId)
@ -2730,9 +2730,11 @@ kml::MarkGroupId BookmarkManager::CreateBookmarkCompilation(kml::CategoryData &&
auto groupId = data.m_id;
CHECK_EQUAL(m_categories.count(groupId), 0, ());
CHECK_EQUAL(m_compilations.count(groupId), 0, ());
m_compilations.emplace(groupId, std::make_unique<BookmarkCategory>(std::move(data), false));
auto compilation = std::make_unique<BookmarkCategory>(std::move(data), false);
auto result = compilation.get();
m_compilations.emplace(groupId, std::move(compilation));
return groupId;
return result;
}
kml::MarkGroupId BookmarkManager::CheckAndCreateDefaultCategory()
@ -2921,19 +2923,20 @@ void BookmarkManager::CreateCategories(KMLDataCollection && dataCollection, bool
}
std::unordered_map<kml::CompilationId, BookmarkCategory *> compilations;
std::unordered_set<std::string> compilationNames;
for (auto & compilation : fileData.m_compilationsData)
{
SetUniqueName(compilation, [&compilations](auto const & name) {
return std::all_of(compilations.cbegin(), compilations.cend(),
[&name](auto const & c) { return c.second->GetName() != name; });
SetUniqueName(compilation, [&compilationNames](auto const & name)
{
return compilationNames.count(name) == 0;
});
auto const compilationId = compilation.m_compilationId;
auto const compilationGroupId = CreateBookmarkCompilation(std::move(compilation));
categoryData.m_compilationIds.push_back(compilationGroupId);
auto childGroup = CreateBookmarkCompilation(std::move(compilation));
categoryData.m_compilationIds.push_back(childGroup->GetID());
auto * childGroup = GetBmCategory(compilationGroupId);
compilations.emplace(compilationId, childGroup);
compilationNames.emplace(childGroup->GetName());
childGroup->SetFileName(fileName);
childGroup->SetServerId(fileData.m_serverId);
}

2
map/bookmark_manager.hpp
View file

@ -275,7 +275,7 @@ public:
kml::MarkGroupId CreateBookmarkCategory(kml::CategoryData && data, bool autoSave = true);
kml::MarkGroupId CreateBookmarkCategory(std::string const & name, bool autoSave = true);
kml::MarkGroupId CreateBookmarkCompilation(kml::CategoryData && data);
BookmarkCategory * CreateBookmarkCompilation(kml::CategoryData && data);
std::string GetCategoryName(kml::MarkGroupId categoryId) const;
std::string GetCategoryFileName(kml::MarkGroupId categoryId) const;