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

Unique category names.

Browse source
This commit is contained in:
Daria Volvenkova 2018-04-09 18:43:58 +03:00 • committed by Roman Kuznetsov
parent 00c6bce777
commit 57362202e4
2 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
map/bookmark_manager.cpp
View file

@ -679,6 +679,17 @@ std::string BookmarkManager::GetCategoryFileName(kml::MarkGroupId categoryId) co
return GetBmCategory(categoryId)->GetFileName();
}
kml::MarkGroupId BookmarkManager::GetCategoryId(std::string const & name) const
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
for (auto const & category : m_categories)
{
if (category.second->GetName() == name)
return category.first;
}
return kml::kInvalidMarkGroupId;
}
UserMark const * BookmarkManager::FindMarkInRect(kml::MarkGroupId groupId, m2::AnyRectD const & rect, double & d) const
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
@ -1279,40 +1290,34 @@ void BookmarkManager::CreateCategories(KMLDataCollection && dataCollection, bool
ASSERT_THREAD_CHECKER(m_threadChecker, ());
kml::GroupIdSet loadedGroups;
std::vector<std::pair<kml::MarkGroupId, BookmarkCategory *>> categoriesForMerge;
categoriesForMerge.reserve(m_categories.size());
for (auto const & c : m_categories)
categoriesForMerge.emplace_back(c.first, c.second.get());
for (auto const & data : dataCollection)
{
kml::MarkGroupId groupId;
BookmarkCategory * group = nullptr;
auto const & fileName = data.first;
auto & fileData = *data.second.get();
auto & categoryData = fileData.m_categoryData;
auto const it = std::find_if(categoriesForMerge.cbegin(), categoriesForMerge.cend(),
[&categoryData](auto const & v)
{
return v.second->GetName() == kml::GetDefaultStr(categoryData.m_name);
});
bool const merge = it != categoriesForMerge.cend();
if (merge)
auto const originalName = kml::GetDefaultStr(categoryData.m_name);
auto uniqueName = originalName;
int counter = 0;
while (IsUsedCategoryName(uniqueName))
uniqueName = originalName + strings::to_string(++counter);
if (counter > 0)
{
groupId = it->first;
group = it->second;
}
else
{
bool const saveAfterCreation = autoSave && (categoryData.m_id == kml::kInvalidMarkGroupId);
groupId = CreateBookmarkCategory(std::move(categoryData), saveAfterCreation);
loadedGroups.insert(groupId);
group = GetBmCategory(groupId);
group->SetFileName(fileName);
auto const sameCategoryId = GetCategoryId(originalName);
if (categoryData.m_id != kml::kInvalidMarkGroupId && categoryData.m_id < sameCategoryId)
SetCategoryName(sameCategoryId, uniqueName);
else
kml::SetDefaultStr(categoryData.m_name, uniqueName);
}
bool const saveAfterCreation = autoSave && (categoryData.m_id == kml::kInvalidMarkGroupId);
auto const groupId = CreateBookmarkCategory(std::move(categoryData), saveAfterCreation);
loadedGroups.insert(groupId);
auto * group = GetBmCategory(groupId);
group->SetFileName(fileName);
for (auto & bmData : fileData.m_bookmarksData)
{
auto * bm = CreateBookmark(std::move(bmData));
@ -1326,12 +1331,6 @@ void BookmarkManager::CreateCategories(KMLDataCollection && dataCollection, bool
t->Attach(groupId);
group->AttachTrack(t->GetId());
}
if (merge)
{
// Delete file since it will be merged.
my::DeleteFileX(fileName);
SaveBookmarks({groupId});
}
}
NotifyChanges();

2
map/bookmark_manager.hpp
View file

@ -171,6 +171,8 @@ public:
std::string GetCategoryName(kml::MarkGroupId categoryId) const;
std::string GetCategoryFileName(kml::MarkGroupId categoryId) const;
kml::MarkGroupId GetCategoryId(std::string const & name) const;
kml::GroupIdCollection const & GetBmGroupsIdList() const { return m_bmGroupsIdList; }
bool HasBmCategory(kml::MarkGroupId groupId) const;
kml::MarkGroupId LastEditedBMCategory();