From 06b38b7853bd03b6d8ef85e5cb3b46bca42515e0 Mon Sep 17 00:00:00 2001
From: Daria Volvenkova <d.volvenkova@corp.mail.ru>
Date: Tue, 25 Jul 2017 14:48:16 +0300
Subject: [PATCH] Fixed bookmark color updating. Fixed cmake compilation.

---
 map/bookmark.cpp                               |  3 +++
 .../assessment_tool/sample_view.cpp            | 18 +++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/map/bookmark.cpp b/map/bookmark.cpp
index 2c41e44275..01f284690b 100644
--- a/map/bookmark.cpp
+++ b/map/bookmark.cpp
@@ -43,6 +43,7 @@ Bookmark::Bookmark(BookmarkData const & data, m2::PointD const & ptOrg, UserMark
 
 void Bookmark::SetData(BookmarkData const & data)
 {
+  SetDirty();
   m_data = data;
 }
 
@@ -85,6 +86,7 @@ std::string const & Bookmark::GetName() const
 
 void Bookmark::SetName(std::string const & name)
 {
+  SetDirty();
   m_data.SetName(name);
 }
 
@@ -95,6 +97,7 @@ std::string const & Bookmark::GetType() const
 
 void Bookmark::SetType(std::string const & type)
 {
+  SetDirty();
   m_data.SetType(type);
 }
 
diff --git a/search/search_quality/assessment_tool/sample_view.cpp b/search/search_quality/assessment_tool/sample_view.cpp
index 3a41d4f25d..59166c1d9c 100644
--- a/search/search_quality/assessment_tool/sample_view.cpp
+++ b/search/search_quality/assessment_tool/sample_view.cpp
@@ -222,10 +222,10 @@ void SampleView::ShowNonFoundResults(std::vector<search::Sample::Result> const &
 {
   CHECK_EQUAL(results.size(), entries.size(), ());
 
-  auto & bookmarkManager = m_framework.GetBookmarkManager();
-  UserMarkControllerGuard guard(bookmarkManager, UserMarkType::SEARCH_MARK);
-  guard.m_controller.SetIsVisible(true);
-  guard.m_controller.SetIsDrawable(true);
+  auto & controller = m_framework.GetBookmarkManager().GetUserMarksController(UserMarkType::SEARCH_MARK);
+  controller.SetIsVisible(true);
+  controller.SetIsDrawable(true);
+  controller.NotifyChanges();
 
   m_nonFoundResults->Clear();
 
@@ -251,10 +251,9 @@ void SampleView::ShowNonFoundResultsMarks(std::vector<search::Sample::Result> co
 {
   CHECK_EQUAL(results.size(), entries.size(), ());
 
-  auto & bookmarkManager = m_framework.GetBookmarkManager();
-  UserMarkControllerGuard guard(bookmarkManager, UserMarkType::SEARCH_MARK);
-  guard.m_controller.SetIsVisible(true);
-  guard.m_controller.SetIsDrawable(true);
+  auto & controller = m_framework.GetBookmarkManager().GetUserMarksController(UserMarkType::SEARCH_MARK);
+  controller.SetIsVisible(true);
+  controller.SetIsDrawable(true);
 
   for (size_t i = 0; i < results.size(); ++i)
   {
@@ -264,9 +263,10 @@ void SampleView::ShowNonFoundResultsMarks(std::vector<search::Sample::Result> co
       continue;
 
     SearchMarkPoint * mark =
-        static_cast<SearchMarkPoint *>(guard.m_controller.CreateUserMark(result.m_pos));
+        static_cast<SearchMarkPoint *>(controller.CreateUserMark(result.m_pos));
     mark->SetCustomSymbol("non-found-search-result");
   }
+  controller.NotifyChanges();
 }
 
 void SampleView::ClearSearchResultMarks() { m_framework.ClearSearchResultsMarks(); }