From fde252347f6a548464fab9f3a2d179e976a12203 Mon Sep 17 00:00:00 2001 From: Harry Bond Date: Sat, 4 May 2024 14:21:21 +0100 Subject: [PATCH 1/3] [tools] fail with warning when OMIM_PATH doesn't exist otherwise it fails later when trying to access `{OMIM_PATH}/data`, with the unhelpful message "AssertError: USER_RESOURCE_PATH is not None" Signed-off-by: Harry Bond --- tools/python/maps_generator/generator/settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/python/maps_generator/generator/settings.py b/tools/python/maps_generator/generator/settings.py index 391a2c9430..1d5bb0f633 100644 --- a/tools/python/maps_generator/generator/settings.py +++ b/tools/python/maps_generator/generator/settings.py @@ -212,6 +212,8 @@ def init(default_settings_path: AnyStr): ) NODE_STORAGE = cfg.get_opt("Generator tool", "NODE_STORAGE", NODE_STORAGE) + assert os.path.exists(OMIM_PATH) is True, f"Can't find OMIM_PATH (set to {OMIM_PATH})" + if not os.path.exists(USER_RESOURCE_PATH): from data_files import find_data_files -- 2.45.3 From 73a564e930a0bafe2119d60f245564a9b8187069 Mon Sep 17 00:00:00 2001 From: Kiryl Kaveryn Date: Mon, 6 May 2024 15:16:44 +0400 Subject: [PATCH 2/3] [ios] [bookmarks] add the `areAllCategoriesEmpty` method to the bookmarks manager Signed-off-by: Kiryl Kaveryn --- .../CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h | 1 + .../CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm | 5 +++++ map/bookmark_manager.cpp | 11 +++++++++++ map/bookmark_manager.hpp | 1 + 4 files changed, 18 insertions(+) diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h index 63de1655da..43d0ed991b 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h @@ -37,6 +37,7 @@ NS_SWIFT_NAME(BookmarksManager) - (BOOL)areBookmarksLoaded; - (void)loadBookmarks; +- (BOOL)areAllCategoriesEmpty; - (BOOL)isCategoryNotEmpty:(MWMMarkGroupID)groupId; - (void)prepareForSearch:(MWMMarkGroupID)groupId; - (NSString *)getCategoryName:(MWMMarkGroupID)groupId; diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm index b8e0c801ec..084a1c3541 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm @@ -194,6 +194,11 @@ static BookmarkManager::SortingType convertSortingTypeToCore(MWMBookmarksSorting #pragma mark - Categories +- (BOOL)areAllCategoriesEmpty +{ + return self.bm.AreAllCategoriesEmpty(); +} + - (BOOL)isCategoryNotEmpty:(MWMMarkGroupID)groupId { return self.bm.HasBmCategory(groupId) && (self.bm.GetUserMarkIds(groupId).size() + self.bm.GetTrackIds(groupId).size()); diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp index 0b811b598d..9a0a49ec8b 100644 --- a/map/bookmark_manager.cpp +++ b/map/bookmark_manager.cpp @@ -2790,6 +2790,17 @@ void BookmarkManager::PrepareAllFilesForSharing(SharingHandler && handler) PrepareFileForSharing(decltype(m_unsortedBmGroupsIdList){m_unsortedBmGroupsIdList}, std::move(handler)); } +bool BookmarkManager::AreAllCategoriesEmpty() const +{ + CHECK_THREAD_CHECKER(m_threadChecker, ()); + for (auto const & c : m_categories) + { + if (!c.second->IsEmpty()) + return false; + } + return true; +} + bool BookmarkManager::IsCategoryEmpty(kml::MarkGroupId categoryId) const { CHECK_THREAD_CHECKER(m_threadChecker, ()); diff --git a/map/bookmark_manager.hpp b/map/bookmark_manager.hpp index 1328b81780..491cea6326 100644 --- a/map/bookmark_manager.hpp +++ b/map/bookmark_manager.hpp @@ -346,6 +346,7 @@ public: void PrepareFileForSharing(kml::GroupIdCollection && categoriesIds, SharingHandler && handler); void PrepareAllFilesForSharing(SharingHandler && handler); + bool AreAllCategoriesEmpty() const; bool IsCategoryEmpty(kml::MarkGroupId categoryId) const; bool IsUsedCategoryName(std::string const & name) const; -- 2.45.3 From ee4f7086e2936dab5fa879dc6ea962cad126b054 Mon Sep 17 00:00:00 2001 From: Kiryl Kaveryn Date: Mon, 6 May 2024 15:20:32 +0400 Subject: [PATCH 3/3] [ios] [bookmarks] refactor the isCategoryNotEmpty method `self.bm.IsCategoryEmpty` is used instead of `size()` Signed-off-by: Kiryl Kaveryn --- iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m | 2 +- iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h | 2 +- iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m index 7cfd57950b..8b5e303428 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m @@ -53,7 +53,7 @@ } - (BOOL)isEmpty { - return ![self.manager isCategoryNotEmpty:self.categoryId]; + return [self.manager isCategoryEmpty:self.categoryId]; } - (BOOL)hasDescription { diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h index 43d0ed991b..1dbfd5e0b0 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h @@ -38,7 +38,7 @@ NS_SWIFT_NAME(BookmarksManager) - (void)loadBookmarks; - (BOOL)areAllCategoriesEmpty; -- (BOOL)isCategoryNotEmpty:(MWMMarkGroupID)groupId; +- (BOOL)isCategoryEmpty:(MWMMarkGroupID)groupId; - (void)prepareForSearch:(MWMMarkGroupID)groupId; - (NSString *)getCategoryName:(MWMMarkGroupID)groupId; - (uint64_t)getCategoryMarksCount:(MWMMarkGroupID)groupId; diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm index 084a1c3541..56b269825e 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm @@ -199,9 +199,8 @@ static BookmarkManager::SortingType convertSortingTypeToCore(MWMBookmarksSorting return self.bm.AreAllCategoriesEmpty(); } -- (BOOL)isCategoryNotEmpty:(MWMMarkGroupID)groupId { - return self.bm.HasBmCategory(groupId) && - (self.bm.GetUserMarkIds(groupId).size() + self.bm.GetTrackIds(groupId).size()); +- (BOOL)isCategoryEmpty:(MWMMarkGroupID)groupId { + return self.bm.HasBmCategory(groupId) && self.bm.IsCategoryEmpty(groupId); } - (void)prepareForSearch:(MWMMarkGroupID)groupId { -- 2.45.3