Fixed bookmarks order: least recently added bookmark is displayed first in the list.

1 files changed, 16 insertions, 19 deletions

diff --git a/map/user_mark_container.cpp b/map/user_mark_container.cpp
index 6ed109aba5..9a8c665c22 100644
--- a/map/user_mark_container.cpp
+++ b/map/user_mark_container.cpp
@@ -202,8 +202,9 @@ MyPositionMarkPoint * UserMarkContainer::UserMarkForMyPostion()
 
 UserMark * UserMarkContainer::CreateUserMark(m2::PointD const & ptOrg)
 {
-  m_userMarks.push_back(AllocateUserMark(ptOrg));
-  return m_userMarks.back();
+  unique_ptr<UserMark> mark(AllocateUserMark(ptOrg));
+  m_userMarks.push_front(mark.get());
+  return mark.release();
 }
 
 size_t UserMarkContainer::GetUserMarkCount() const
@@ -223,37 +224,33 @@ UserMark * UserMarkContainer::GetUserMark(size_t index)
   return m_userMarks[index];
 }
 
-namespace
-{
-
-template <class T> void DeleteItem(vector<T> & v, size_t i)
+void UserMarkContainer::DeleteUserMark(size_t index)
 {
-  if (i < v.size())
+  ASSERT_LESS(index, m_userMarks.size(), ());
+  if (index < m_userMarks.size())
   {
-    delete v[i];
-    v.erase(v.begin() + i);
+    delete m_userMarks[index];
+    m_userMarks.erase(m_userMarks.begin() + index);
   }
   else
   {
-    LOG(LWARNING, ("Trying to delete non-existing item at index", i));
+    LOG(LWARNING, ("Trying to delete non-existing item at index", index));
   }
 }
 
-}
-
-void UserMarkContainer::DeleteUserMark(size_t index)
-{
-  ASSERT_LESS(index, m_userMarks.size(), ());
-  DeleteItem(m_userMarks, index);
-}
-
 void UserMarkContainer::DeleteUserMark(UserMark const * mark)
 {
-  vector<UserMark *>::iterator it = find(m_userMarks.begin(), m_userMarks.end(), mark);
+  UserMarksListT::iterator it = find(m_userMarks.begin(), m_userMarks.end(), mark);
   if (it != m_userMarks.end())
     DeleteUserMark(distance(m_userMarks.begin(), it));
 }
 
+size_t UserMarkContainer::FindUserMark(UserMark const * mark)
+{
+  return distance(m_userMarks.begin(),
+                  find(m_userMarks.begin(), m_userMarks.end(), mark));
+}
+
 SearchUserMarkContainer::SearchUserMarkContainer(double layerDepth, Framework & framework)
   : UserMarkContainer(layerDepth, framework)
 {