From b28e16a20f3a932d2f43c941a106c7f0eb43283c Mon Sep 17 00:00:00 2001
From: Kirill Zhdanovich <kzhdanovich@gmail.com>
Date: Tue, 23 Apr 2013 18:39:42 +0300
Subject: [PATCH] GetBookmark returns pointer to non constant bookmark. Setter
 for bookmark's name and type.

---
 map/bookmark.cpp         | 5 +++++
 map/bookmark.hpp         | 3 +++
 map/bookmark_manager.cpp | 5 +++++
 map/bookmark_manager.hpp | 1 +
 map/framework.cpp        | 5 +++++
 map/framework.hpp        | 1 +
 6 files changed, 20 insertions(+)

diff --git a/map/bookmark.cpp b/map/bookmark.cpp
index 3ed8885e13..62ae997210 100644
--- a/map/bookmark.cpp
+++ b/map/bookmark.cpp
@@ -75,6 +75,11 @@ Bookmark const * BookmarkCategory::GetBookmark(size_t index) const
   return (index < m_bookmarks.size() ? m_bookmarks[index] : 0);
 }
 
+Bookmark * BookmarkCategory::GetBookmark(size_t index)
+{
+  return (index < m_bookmarks.size() ? m_bookmarks[index] : 0);
+}
+
 int BookmarkCategory::GetBookmark(m2::PointD const org, double const squareDistance) const
 {
   for (size_t i = 0; i < m_bookmarks.size(); ++i)
diff --git a/map/bookmark.hpp b/map/bookmark.hpp
index 6fca356784..7fc22b73a5 100644
--- a/map/bookmark.hpp
+++ b/map/bookmark.hpp
@@ -30,8 +30,10 @@ public:
 
   m2::PointD const & GetOrg() const { return m_org; }
   string const & GetName() const { return m_name; }
+  void SetName(string const & name) { m_name = name; }
   /// @return Now its a bookmark color - name of icon file
   string const & GetType() const { return m_type; }
+  void SetType(string const & type) { m_type = type; }
   m2::RectD GetViewport() const { return m2::RectD(m_org, m_org); }
 
   string const & GetDescription() const { return m_description; }
@@ -84,6 +86,7 @@ public:
   inline size_t GetBookmarksCount() const { return m_bookmarks.size(); }
 
   Bookmark const * GetBookmark(size_t index) const;
+  Bookmark * GetBookmark(size_t index);
   /// @param[in] distance in metres between orgs
   /// @returns -1 or index of found bookmark
   int GetBookmark(m2::PointD const org, double const squareDistance) const;
diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index 2d66ef54c1..6fc42ea30f 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -173,6 +173,11 @@ Bookmark const * BookmarkManager::AdditionalPoiLayerGetBookmark(size_t index) co
   return m_additionalPoiLayer->GetBookmark(index);
 }
 
+Bookmark * BookmarkManager::AdditionalPoiLayerGetBookmark(size_t index)
+{
+  return m_additionalPoiLayer->GetBookmark(index);
+}
+
 void BookmarkManager::AdditionalPoiLayerDeleteBookmark(int index)
 {
   m_additionalPoiLayer->DeleteBookmark(index);
diff --git a/map/bookmark_manager.hpp b/map/bookmark_manager.hpp
index 190feeab0d..caaef46958 100644
--- a/map/bookmark_manager.hpp
+++ b/map/bookmark_manager.hpp
@@ -50,6 +50,7 @@ public:
   void AdditionalPoiLayerSetVisible();
   void AdditionalPoiLayerAddPoi(Bookmark const & bm);
   Bookmark const * AdditionalPoiLayerGetBookmark(size_t index) const;
+  Bookmark * AdditionalPoiLayerGetBookmark(size_t index);
   void AdditionalPoiLayerDeleteBookmark(int index);
   void AdditionalPoiLayerClear();
   bool IsAdditionalLayerPoi(const BookmarkAndCategory & bm) const;
diff --git a/map/framework.cpp b/map/framework.cpp
index d3f7dc51d7..bba37bedf2 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -598,6 +598,11 @@ Bookmark const * Framework::AdditionalPoiLayerGetBookmark(size_t index) const
   return m_bmManager.AdditionalPoiLayerGetBookmark(index);
 }
 
+Bookmark * Framework::AdditionalPoiLayerGetBookmark(size_t index)
+{
+  return m_bmManager.AdditionalPoiLayerGetBookmark(index);
+}
+
 void Framework::AdditionalPoiLayerDeleteBookmark(int index)
 {
   m_bmManager.AdditionalPoiLayerDeleteBookmark(index);
diff --git a/map/framework.hpp b/map/framework.hpp
index 51546dfcc3..86c6e95e1c 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -207,6 +207,7 @@ public:
   void AdditionalPoiLayerSetVisible();
   void AdditionalPoiLayerAddPoi(Bookmark const & bm);
   Bookmark const * AdditionalPoiLayerGetBookmark(size_t index) const;
+  Bookmark * AdditionalPoiLayerGetBookmark(size_t index);
   void AdditionalPoiLayerDeleteBookmark(int index);
   void AdditionalPoiLayerClear();
   bool IsAdditionalLayerPoi(const BookmarkAndCategory & bm) const;