From 9b5edccf4ae3a446935ab1497ef5e78c6013e799 Mon Sep 17 00:00:00 2001
From: ExMix <rahuba.youri@mapswithme.com>
Date: Fri, 30 May 2014 17:48:25 +0300
Subject: [PATCH] review fix

---
 map/user_mark_container.cpp | 32 +++++++++-----------------------
 map/user_mark_container.hpp |  4 +---
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/map/user_mark_container.cpp b/map/user_mark_container.cpp
index 59b80e33da..35b92c7e30 100644
--- a/map/user_mark_container.cpp
+++ b/map/user_mark_container.cpp
@@ -79,7 +79,7 @@ namespace
                            graphics::DisplayList * dl,
                            m2::PointD const & ptOrg)
   {
-    ScreenBase modelView = event.GetModelView();
+    ScreenBase const & modelView = event.GetModelView();
     graphics::Screen * screen = event.GetDrawer()->screen();
     m2::PointD pxPoint = modelView.GtoP(ptOrg);
     pxPoint += (pixelOfsset * visualScale);
@@ -114,16 +114,6 @@ namespace
     else
       DrawUserMarkImpl(scale, visualScale, m2::PointD(0.0, 0.0), event, cache->FindUserMark(defaultKey), mark);
   }
-
-  void DefaultDrawUserMark(double scale,
-                           double visualScale,
-                           PaintOverlayEvent const & event,
-                           UserMarkDLCache * cache,
-                           UserMarkDLCache::Key const & defaultKey,
-                           UserMark const * mark)
-  {
-    DrawUserMarkImpl(scale, visualScale, m2::PointD(0.0, 0.0), event, cache->FindUserMark(defaultKey), mark);
-  }
 }
 
 UserMarkContainer::UserMarkContainer(double layerDepth, Framework & fm)
@@ -277,8 +267,7 @@ UserMark * ApiUserMarkContainer::AllocateUserMark(const m2::PointD & ptOrg)
 
 
 SelectionContainer::SelectionContainer(Framework & fm)
-  : m_hasActiveMark(false)
-  , m_depth(graphics::minDepth - 100)
+  : m_container(NULL)
   , m_fm(fm)
 {
 }
@@ -288,25 +277,22 @@ void SelectionContainer::ActivateMark(UserMark const * userMark)
   KillActivationAnim();
   if (userMark != NULL)
   {
-    m_hasActiveMark = true;
     m_ptOrg = userMark->GetOrg();
-    UserMarkContainer const * container = userMark->GetContainer();
-    m_pinImageName = container->GetActiveTypeName();
-    m_depth = container->GetDepth();
+    m_container = userMark->GetContainer();
     StartActivationAnim();
   }
   else
-  {
-    m_hasActiveMark = false;
-    m_depth = graphics::minDepth - 100;
-  }
+    m_container = NULL;
 }
 
 void SelectionContainer::Draw(const PaintOverlayEvent & e, UserMarkDLCache * cache) const
 {
-  if (m_hasActiveMark)
+  if (m_container != NULL)
   {
-    UserMarkDLCache::Key defaultKey(m_pinImageName, graphics::EPosCenter, m_depth);
+    UserMarkDLCache::Key defaultKey(m_container->GetActiveTypeName(),
+                                    graphics::EPosCenter,
+                                    m_container->GetDepth());
+
     DrawUserMarkByPoint(GetActiveMarkScale(),
                         m_fm.GetVisualScale(),
                         m2::PointD(0, 0),
diff --git a/map/user_mark_container.hpp b/map/user_mark_container.hpp
index ae68749274..59481a0023 100644
--- a/map/user_mark_container.hpp
+++ b/map/user_mark_container.hpp
@@ -145,9 +145,7 @@ private:
   shared_ptr<anim::Task> m_animTask;
 
 private:
-  bool m_hasActiveMark;
-  double m_depth;
-  string m_pinImageName;
+  UserMarkContainer const * m_container;
   m2::PointD m_ptOrg;
   Framework & m_fm;
 };