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

[ios] QuickFix for missing feature when user sets/removes a bookmark on a POI.

Browse source 
@TODO: Refactor whole UserMark architecture.
This commit is contained in:
Alex Zolotarev 2016-01-16 15:51:53 +03:00 • committed by Sergey Yershov
parent cfc5349a9a
commit 199189a68b
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
iphone/Maps/Classes/MWMPlacePageViewManager.mm
View file

@ -301,13 +301,17 @@ typedef NS_ENUM(NSUInteger, MWMPlacePageManagerState)
Framework & f = GetFramework();
BookmarkData data = BookmarkData(self.entity.title.UTF8String, f.LastEditedBMType());
size_t const categoryIndex = f.LastEditedBMCategory();
size_t const bookmarkIndex = f.GetBookmarkManager().AddBookmark(categoryIndex, m_userMark->GetUserMark()->GetPivot(), data);
m2::PointD const mercator = m_userMark->GetUserMark()->GetPivot();
size_t const bookmarkIndex = f.GetBookmarkManager().AddBookmark(categoryIndex, mercator, data);
self.entity.bac = make_pair(categoryIndex, bookmarkIndex);
self.entity.type = MWMPlacePageEntityTypeBookmark;
BookmarkCategory::Guard guard(*f.GetBmCategory(categoryIndex));
UserMark const * bookmark = guard.m_controller.GetUserMark(bookmarkIndex);
// TODO(AlexZ): Refactor bookmarks code together to hide this code in the Framework/Drape.
// UI code should never know about any guards, pointers to UserMark etc.
const_cast<UserMark *>(bookmark)->SetFeature(f.GetFeatureAtMercatorPoint(mercator));
m_userMark.reset(new UserMarkCopy(bookmark, false));
[NSNotificationCenter.defaultCenter postNotificationName:kBookmarksChangedNotification
object:nil
@ -330,6 +334,8 @@ typedef NS_ENUM(NSUInteger, MWMPlacePageManagerState)
self.entity.type = MWMPlacePageEntityTypeRegular;
// TODO(AlexZ): SetFeature is called in GetAddressMark here.
// UI code should never know about any guards, pointers to UserMark etc.
PoiMarkPoint const * poi = f.GetAddressMark(bookmark->GetPivot());
m_userMark.reset(new UserMarkCopy(poi, false));
if (bookmarkCategory)