kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[bookmarks] implement recently deleted bookmarks and recovery support

Browse source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2024-05-28 20:08:12 +04:00 • committed by Alexander Borsuk
parent 01896ff638
commit 450db38aec
4 changed files with 48 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
map/bookmark.cpp
View file

@ -284,7 +284,8 @@ bool Bookmark::CanFillPlacePageMetadata() const
void Bookmark::Attach(kml::MarkGroupId groupId)
{
ASSERT(m_groupId == kml::kInvalidMarkGroupId, ());
ASSERT_NOT_EQUAL(groupId, kml::kInvalidMarkGroupId, ());
ASSERT_EQUAL(m_groupId, kml::kInvalidMarkGroupId, ());
m_groupId = groupId;
}

49
map/bookmark_manager.cpp
View file

@ -304,25 +304,36 @@ Bookmark * BookmarkManager::CreateBookmark(kml::BookmarkData && bmData)
return AddBookmark(std::make_unique<Bookmark>(std::move(bmData)));
}
Bookmark * BookmarkManager::CreateBookmark(kml::BookmarkData && bm, kml::MarkGroupId groupId)
Bookmark * BookmarkManager::CreateBookmark(kml::BookmarkData && bmData, kml::MarkGroupId groupId)
{
CHECK_THREAD_CHECKER(m_threadChecker, ());
auto const & c = classif();
CHECK(c.HasTypesMapping(), ());
std::stringstream ss;
for (size_t i = 0; i < bm.m_featureTypes.size(); ++i)
Bookmark * bookmark;
// Recover the bookmark from the recently deleted.
// The recently deleted bookmark exists only when it was deleted from the Place Page screen.
if (m_recentlyDeletedBookmark)
{
ss << c.GetReadableObjectName(c.GetTypeForIndex(bm.m_featureTypes[i]));
if (i + 1 < bm.m_featureTypes.size())
ss << ",";
bookmark = AddBookmark(std::move(m_recentlyDeletedBookmark));
ResetRecentlyDeletedBookmark();
// Sets a "dirty" flag checked in one of the containers.
bookmark->SetIsVisible(true);
if (HasBmCategory(bookmark->GetGroupId()))
groupId = bookmark->GetGroupId();
// The bookmark should be detached from the previous group before attaching to the new one.
bookmark->Detach();
}
else
{
bmData.m_timestamp = kml::TimestampClock::now();
bmData.m_viewportScale = static_cast<uint8_t>(df::GetZoomLevel(m_viewport.GetScale()));
bm.m_timestamp = kml::TimestampClock::now();
bm.m_viewportScale = static_cast<uint8_t>(df::GetZoomLevel(m_viewport.GetScale()));
auto * bookmark = CreateBookmark(std::move(bm));
bookmark = CreateBookmark(std::move(bmData));
}
bookmark->Attach(groupId);
auto * group = GetBmCategory(groupId);
group->AttachUserMark(bookmark->GetId());
m_changesTracker.OnAttachBookmark(bookmark->GetId(), groupId);
@ -374,17 +385,25 @@ void BookmarkManager::DeleteBookmark(kml::MarkId bmId)
{
CHECK_THREAD_CHECKER(m_threadChecker, ());
ASSERT(IsBookmark(bmId), ());
auto const it = m_bookmarks.find(bmId);
CHECK(it != m_bookmarks.end(), ());
auto const groupId = it->second->GetGroupId();
CHECK_NOT_EQUAL(groupId, kml::kInvalidMarkGroupId, ());
if (groupId != kml::kInvalidMarkGroupId)
DetachUserMark(bmId, groupId);
DetachUserMark(bmId, groupId);
m_changesTracker.OnDeleteMark(bmId);
m_recentlyDeletedBookmark = std::move(it->second);
m_bookmarks.erase(it);
}
void BookmarkManager::ResetRecentlyDeletedBookmark()
{
m_recentlyDeletedBookmark.reset();
}
void BookmarkManager::DetachUserMark(kml::MarkId bmId, kml::MarkGroupId catId)
{
GetGroup(catId)->DetachUserMark(bmId);

5
map/bookmark_manager.hpp
View file

@ -375,6 +375,9 @@ public:
bool SaveBookmarkCategory(kml::MarkGroupId groupId);
bool SaveBookmarkCategory(kml::MarkGroupId groupId, Writer & writer, KmlFileType fileType) const;
bool HasRecentlyDeletedBookmark() const { return m_recentlyDeletedBookmark.operator bool(); };
void ResetRecentlyDeletedBookmark();
// Used for LoadBookmarks() and unit tests only. Does *not* update last modified time.
void CreateCategories(KMLDataCollection && dataCollection, bool autoSave = false);
@ -762,6 +765,8 @@ private:
kml::TrackId m_selectedTrackId = kml::kInvalidTrackId;
m2::PointF m_maxBookmarkSymbolSize;
std::unique_ptr<Bookmark> m_recentlyDeletedBookmark;
bool m_asyncLoadingInProgress = false;
struct BookmarkLoaderInfo
{

8
map/framework.cpp
View file

@ -1880,6 +1880,8 @@ void Framework::ActivateMapSelection()
auto & bm = GetBookmarkManager();
bm.ResetRecentlyDeletedBookmark();
if (m_currentPlacePageInfo->GetSelectedObject() == df::SelectionShape::OBJECT_TRACK)
bm.OnTrackSelected(m_currentPlacePageInfo->GetTrackId());
else
@ -1911,10 +1913,14 @@ void Framework::DeactivateMapSelection(bool notifyUI)
if (notifyUI && m_onPlacePageClose)
m_onPlacePageClose(!somethingWasAlreadySelected);
if (somethingWasAlreadySelected)
{
DeactivateHotelSearchMark();
GetBookmarkManager().OnTrackDeselected();
auto & bm = GetBookmarkManager();
bm.OnTrackDeselected();
bm.ResetRecentlyDeletedBookmark();
m_currentPlacePageInfo = {};