From d3a8ecf19df3ec20d61bdce99ecf456e997e17d9 Mon Sep 17 00:00:00 2001 From: Kiryl Kaveryn Date: Tue, 12 Mar 2024 12:42:35 +0400 Subject: [PATCH] [bookmarks] rename bmGroupsIdList into unsortedBmGroupsIdList Signed-off-by: Kiryl Kaveryn --- map/bookmark_manager.cpp | 14 +++++----- map/bookmark_manager.hpp | 6 ++--- map/map_tests/bookmarks_test.cpp | 46 ++++++++++++++++---------------- qt/bookmark_dialog.cpp | 2 +- qt/screenshoter.cpp | 4 +-- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp index 5c7534b6e0..8c0c77d55f 100644 --- a/map/bookmark_manager.cpp +++ b/map/bookmark_manager.cpp @@ -1842,7 +1842,7 @@ void BookmarkManager::LoadMetadata() void BookmarkManager::ClearCategories() { CHECK_THREAD_CHECKER(m_threadChecker, ()); - for (auto groupId : m_bmGroupsIdList) + for (auto groupId : m_unsortedBmGroupsIdList) { ClearGroup(groupId); m_changesTracker.OnDeleteGroup(groupId); @@ -1850,7 +1850,7 @@ void BookmarkManager::ClearCategories() m_compilations.clear(); m_categories.clear(); - m_bmGroupsIdList.clear(); + m_unsortedBmGroupsIdList.clear(); m_bookmarks.clear(); m_tracks.clear(); @@ -2213,10 +2213,10 @@ void BookmarkManager::UpdateBmGroupIdList() for (auto const & [markGroupId, categoryPtr] : m_categories) vec.emplace_back(markGroupId, categoryPtr.get()); - m_bmGroupsIdList.clear(); - m_bmGroupsIdList.resize(count); + m_unsortedBmGroupsIdList.clear(); + m_unsortedBmGroupsIdList.resize(count); for (size_t i = 0; i < count; ++i) - m_bmGroupsIdList[i] = vec[i].first; + m_unsortedBmGroupsIdList[i] = vec[i].first; } std::vector BookmarkManager::GetSortedBmGroupIdList() const @@ -2734,7 +2734,7 @@ void BookmarkManager::PrepareAllFilesForSharing(SharingHandler && handler) { CHECK_THREAD_CHECKER(m_threadChecker, ()); ASSERT(handler, ()); - PrepareFileForSharing(decltype(m_bmGroupsIdList){m_bmGroupsIdList}, std::move(handler)); + PrepareFileForSharing(decltype(m_unsortedBmGroupsIdList){m_unsortedBmGroupsIdList}, std::move(handler)); } bool BookmarkManager::IsCategoryEmpty(kml::MarkGroupId categoryId) const @@ -2877,7 +2877,7 @@ void BookmarkManager::FilterInvalidTracks(kml::TrackIdCollection & tracks) const kml::GroupIdSet BookmarkManager::MarksChangesTracker::GetAllGroupIds() const { - auto const & groupIds = m_bmManager->GetBmGroupsIdList(); + auto const & groupIds = m_bmManager->GetUnsortedBmGroupsIdList(); kml::GroupIdSet resultingSet(groupIds.begin(), groupIds.end()); static_assert(UserMark::BOOKMARK == 0); diff --git a/map/bookmark_manager.hpp b/map/bookmark_manager.hpp index 8055797f5f..17e4aeaefa 100644 --- a/map/bookmark_manager.hpp +++ b/map/bookmark_manager.hpp @@ -276,9 +276,9 @@ public: kml::MarkGroupId GetCategoryId(std::string const & name) const; - kml::GroupIdCollection const & GetBmGroupsIdList() const { return m_bmGroupsIdList; } + kml::GroupIdCollection const & GetUnsortedBmGroupsIdList() const { return m_unsortedBmGroupsIdList; } kml::GroupIdCollection GetSortedBmGroupIdList() const; - uint16_t GetBmGroupsCount() const { return m_bmGroupsIdList.size(); }; + size_t GetBmGroupsCount() const { return m_unsortedBmGroupsIdList.size(); }; bool HasBmCategory(kml::MarkGroupId groupId) const; kml::MarkGroupId LastEditedBMCategory(); kml::PredefinedColor LastEditedBMColor() const; @@ -726,7 +726,7 @@ private: ScreenBase m_viewport; CategoriesCollection m_categories; - kml::GroupIdCollection m_bmGroupsIdList; + kml::GroupIdCollection m_unsortedBmGroupsIdList; std::string m_lastCategoryUrl; kml::MarkGroupId m_lastEditedGroupId = kml::kInvalidMarkGroupId; diff --git a/map/map_tests/bookmarks_test.cpp b/map/map_tests/bookmarks_test.cpp index 5ca5535c0a..300e7c5293 100644 --- a/map/map_tests/bookmarks_test.cpp +++ b/map/map_tests/bookmarks_test.cpp @@ -202,9 +202,9 @@ UNIT_CLASS_TEST(Runner, Bookmarks_ImportKML) LoadKmlData(MemReader(kmlString, strlen(kmlString)), KmlFileType::Text)); TEST(kmlDataCollection.back().second, ()); bmManager.CreateCategories(std::move(kmlDataCollection)); - TEST_EQUAL(bmManager.GetBmGroupsIdList().size(), 1, ()); + TEST_EQUAL(bmManager.GetUnsortedBmGroupsIdList().size(), 1, ()); - auto const groupId = bmManager.GetBmGroupsIdList().front(); + auto const groupId = bmManager.GetUnsortedBmGroupsIdList().front(); CheckBookmarks(bmManager, groupId); // Name should be overridden from the KML @@ -228,9 +228,9 @@ UNIT_CLASS_TEST(Runner, Bookmarks_ExportKML) kmlDataCollection1.emplace_back("", LoadKmlData(MemReader(kmlString, strlen(kmlString)), KmlFileType::Text)); bmManager.CreateCategories(std::move(kmlDataCollection1)); - TEST_EQUAL(bmManager.GetBmGroupsIdList().size(), 1, ()); + TEST_EQUAL(bmManager.GetUnsortedBmGroupsIdList().size(), 1, ()); - auto const groupId1 = bmManager.GetBmGroupsIdList().front(); + auto const groupId1 = bmManager.GetUnsortedBmGroupsIdList().front(); CheckBookmarks(bmManager, groupId1); TEST_EQUAL(bmManager.IsVisible(groupId1), false, ()); @@ -249,16 +249,16 @@ UNIT_CLASS_TEST(Runner, Bookmarks_ExportKML) bmManager.GetEditSession().DeleteBmCategory(groupId1); TEST_EQUAL(bmManager.HasBmCategory(groupId1), false, ()); - TEST_EQUAL(bmManager.GetBmGroupsIdList().size(), 0, ()); + TEST_EQUAL(bmManager.GetUnsortedBmGroupsIdList().size(), 0, ()); BookmarkManager::KMLDataCollection kmlDataCollection2; kmlDataCollection2.emplace_back("", LoadKmlData(FileReader(fileName), GetActiveKmlFileType())); TEST(kmlDataCollection2.back().second, ()); bmManager.CreateCategories(std::move(kmlDataCollection2)); - TEST_EQUAL(bmManager.GetBmGroupsIdList().size(), 1, ()); + TEST_EQUAL(bmManager.GetUnsortedBmGroupsIdList().size(), 1, ()); - auto const groupId2 = bmManager.GetBmGroupsIdList().front(); + auto const groupId2 = bmManager.GetUnsortedBmGroupsIdList().front(); CheckBookmarks(bmManager, groupId2); TEST_EQUAL(bmManager.IsVisible(groupId2), true, ()); @@ -270,9 +270,9 @@ UNIT_CLASS_TEST(Runner, Bookmarks_ExportKML) TEST(kmlDataCollection3.back().second, ()); bmManager.CreateCategories(std::move(kmlDataCollection3), true /* autoSave */); - TEST_EQUAL(bmManager.GetBmGroupsIdList().size(), 1, ()); + TEST_EQUAL(bmManager.GetUnsortedBmGroupsIdList().size(), 1, ()); - auto const groupId3 = bmManager.GetBmGroupsIdList().front(); + auto const groupId3 = bmManager.GetUnsortedBmGroupsIdList().front(); CheckBookmarks(bmManager, groupId3); TEST(bmManager.SaveBookmarkCategory(groupId3), ()); @@ -407,7 +407,7 @@ UNIT_TEST(Bookmarks_Getting) TEST_NOT_EQUAL(pBm1->GetGroupId(), pBm3->GetGroupId(), ()); TEST_NOT_EQUAL(pBm1->GetGroupId(), pBm3->GetGroupId(), ()); - TEST_EQUAL(bmManager.GetBmGroupsIdList().size(), 3, ()); + TEST_EQUAL(bmManager.GetUnsortedBmGroupsIdList().size(), 3, ()); TEST(IsValidBookmark(fm, m2::PointD(40, 20)), ()); Bookmark const * mark = GetBookmark(fm, m2::PointD(40, 20)); @@ -564,7 +564,7 @@ UNIT_TEST(Bookmarks_AddingMoving) bm3.m_color.m_predefinedColor = kml::PredefinedColor::Green; auto const * pBm2 = bmManager.GetEditSession().CreateBookmark(std::move(bm3), cat2); TEST_NOT_EQUAL(pBm1->GetGroupId(), pBm2->GetGroupId(), ()); - TEST_EQUAL(bmManager.GetBmGroupsIdList().size(), 2, ()); + TEST_EQUAL(bmManager.GetUnsortedBmGroupsIdList().size(), 2, ()); mark = GetBookmarkPxPoint(fm, pixelPoint); TEST_EQUAL(bmManager.GetCategoryName(mark->GetGroupId()), "cat1", ()); TEST_EQUAL(bmManager.GetUserMarkIds(cat1).size(), 2, @@ -963,7 +963,7 @@ UNIT_CLASS_TEST(Runner, Bookmarks_InnerFolder) kmlDataCollection.emplace_back("" /* filePath */, LoadKmlData(MemReader(kmlString2, strlen(kmlString2)), KmlFileType::Text)); bmManager.CreateCategories(std::move(kmlDataCollection)); - auto const & groupIds = bmManager.GetBmGroupsIdList(); + auto const & groupIds = bmManager.GetUnsortedBmGroupsIdList(); TEST_EQUAL(groupIds.size(), 1, ()); TEST_EQUAL(bmManager.GetUserMarkIds(groupIds.front()).size(), 1, ()); } @@ -1034,7 +1034,7 @@ UNIT_CLASS_TEST(Runner, Bookmarks_SpecialXMLNames) LoadKmlData(MemReader(kmlString3, strlen(kmlString3)), KmlFileType::Text)); bmManager.CreateCategories(std::move(kmlDataCollection1)); - auto const & groupIds = bmManager.GetBmGroupsIdList(); + auto const & groupIds = bmManager.GetUnsortedBmGroupsIdList(); TEST_EQUAL(groupIds.size(), 1, ()); auto const catId = groupIds.front(); @@ -1066,9 +1066,9 @@ UNIT_CLASS_TEST(Runner, Bookmarks_SpecialXMLNames) bmManager.UpdateLastModifiedTime(kmlDataCollection3); bmManager.CreateCategories(std::move(kmlDataCollection3)); - TEST_EQUAL(bmManager.GetBmGroupsIdList().size(), 2, ()); - auto const catId2 = bmManager.GetBmGroupsIdList().back(); - auto const catId3 = bmManager.GetBmGroupsIdList().front(); + TEST_EQUAL(bmManager.GetUnsortedBmGroupsIdList().size(), 2, ()); + auto const catId2 = bmManager.GetUnsortedBmGroupsIdList().back(); + auto const catId3 = bmManager.GetUnsortedBmGroupsIdList().front(); TEST_EQUAL(bmManager.GetUserMarkIds(catId2).size(), 1, ()); TEST_EQUAL(bmManager.GetCategoryName(catId2), expectedName, ()); @@ -1095,9 +1095,9 @@ UNIT_CLASS_TEST(Runner, TrackParsingTest_1) TEST(kmlDataCollection.back().second, ("KML can't be loaded")); bmManager.CreateCategories(std::move(kmlDataCollection)); - TEST_EQUAL(bmManager.GetBmGroupsIdList().size(), 1, ()); + TEST_EQUAL(bmManager.GetUnsortedBmGroupsIdList().size(), 1, ()); - auto catId = bmManager.GetBmGroupsIdList().front(); + auto catId = bmManager.GetUnsortedBmGroupsIdList().front(); TEST_EQUAL(bmManager.GetTrackIds(catId).size(), 4, ()); array const names = {{"Option1", "Pakkred1", "Pakkred2", "Pakkred3"}}; @@ -1150,9 +1150,9 @@ UNIT_CLASS_TEST(Runner, TrackParsingTest_2) TEST(kmlDataCollection.back().second, ("KML can't be loaded")); bmManager.CreateCategories(std::move(kmlDataCollection)); - TEST_EQUAL(bmManager.GetBmGroupsIdList().size(), 1, ()); + TEST_EQUAL(bmManager.GetUnsortedBmGroupsIdList().size(), 1, ()); - auto catId = bmManager.GetBmGroupsIdList().front(); + auto catId = bmManager.GetUnsortedBmGroupsIdList().front(); TEST_EQUAL(bmManager.GetTrackIds(catId).size(), 1, ()); auto const trackId = *bmManager.GetTrackIds(catId).begin(); auto const * track = bmManager.GetTrack(trackId); @@ -1403,9 +1403,9 @@ UNIT_CLASS_TEST(Runner, ExportAll) kmlDataCollection.emplace_back(file, LoadKmlFile(file, KmlFileType::Gpx)); bmManager.CreateCategories(std::move(kmlDataCollection)); - TEST_EQUAL(bmManager.GetBmGroupsIdList().size(), 4, ()); + TEST_EQUAL(bmManager.GetUnsortedBmGroupsIdList().size(), 4, ()); - auto categories = bmManager.GetBmGroupsIdList(); + auto categories = bmManager.GetUnsortedBmGroupsIdList(); auto checker = [](BookmarkManager::SharingResult const & result) { auto kmz = result.m_sharingPath; @@ -1446,7 +1446,7 @@ UNIT_CLASS_TEST(Runner, ExportSingleUnicode) BookmarkManager::KMLDataCollection kmlDataCollection; kmlDataCollection.emplace_back(file, LoadKmlFile(file, KmlFileType::Gpx)); bmManager.CreateCategories(std::move(kmlDataCollection)); - auto categories = bmManager.GetBmGroupsIdList(); + auto categories = bmManager.GetUnsortedBmGroupsIdList(); auto checker = [](BookmarkManager::SharingResult const & result) { auto kmz = result.m_sharingPath; diff --git a/qt/bookmark_dialog.cpp b/qt/bookmark_dialog.cpp index fd10f5d722..bac9edda5f 100644 --- a/qt/bookmark_dialog.cpp +++ b/qt/bookmark_dialog.cpp @@ -268,7 +268,7 @@ void BookmarkDialog::FillTree() if (!bm.IsAsyncLoadingInProgress()) { - for (auto catId : bm.GetBmGroupsIdList()) + for (auto catId : bm.GetUnsortedBmGroupsIdList()) { auto categoryItem = CreateTreeItem(bm.GetCategoryName(catId), categoriesItem); m_categories[categoryItem] = catId; diff --git a/qt/screenshoter.cpp b/qt/screenshoter.cpp index 8951cb6736..aa26b2d803 100644 --- a/qt/screenshoter.cpp +++ b/qt/screenshoter.cpp @@ -201,14 +201,14 @@ void Screenshoter::ProcessNextKml() auto & bookmarkManager = m_framework.GetBookmarkManager(); auto es = bookmarkManager.GetEditSession(); - auto const idList = bookmarkManager.GetBmGroupsIdList(); + auto const idList = bookmarkManager.GetUnsortedBmGroupsIdList(); for (auto catId : idList) es.DeleteBmCategory(catId); bookmarkManager.CreateCategories(std::move(collection)); ChangeState(State::WaitPosition); - auto const newCatId = bookmarkManager.GetBmGroupsIdList().front(); + auto const newCatId = bookmarkManager.GetUnsortedBmGroupsIdList().front(); m_framework.ShowBookmarkCategory(newCatId, false); WaitPosition(); }