From bc3bee8676add4109717bc9d82fad19e09dbca17 Mon Sep 17 00:00:00 2001
From: rachytski <siarhei.rachytski@gmail.com>
Date: Tue, 7 Aug 2012 11:30:56 +0300
Subject: [PATCH] using OverlayElement::depth as a visualPriority for elements
 filtering in Overlay.

---
 yg/overlay_element.cpp       | 5 +++++
 yg/overlay_element.hpp       | 2 +-
 yg/path_text_element.cpp     | 5 -----
 yg/path_text_element.hpp     | 2 --
 yg/straight_text_element.cpp | 5 -----
 yg/straight_text_element.hpp | 2 --
 yg/symbol_element.cpp        | 5 -----
 yg/symbol_element.hpp        | 2 --
 8 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/yg/overlay_element.cpp b/yg/overlay_element.cpp
index 1584a8debf..fdb0fffab6 100644
--- a/yg/overlay_element.cpp
+++ b/yg/overlay_element.cpp
@@ -162,6 +162,11 @@ namespace yg
     return false;
   }
 
+  int OverlayElement::visualRank() const
+  {
+    return depth();
+  }
+
   bool OverlayElement::isValid() const
   {
     return m_isValid;
diff --git a/yg/overlay_element.hpp b/yg/overlay_element.hpp
index 4f1ea2845b..ab8086df89 100644
--- a/yg/overlay_element.hpp
+++ b/yg/overlay_element.hpp
@@ -51,7 +51,7 @@ namespace yg
     /// PLEASE, REMEMBER THE REFERENCE!!!
     virtual vector<m2::AnyRectD> const & boundRects() const = 0;
     virtual void draw(gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const = 0;
-    virtual int visualRank() const = 0;
+    virtual int visualRank() const;
 
     m2::PointD const & pivot() const;
     virtual void setPivot(m2::PointD const & pv);
diff --git a/yg/path_text_element.cpp b/yg/path_text_element.cpp
index 46033aec1c..e4cb4e61f8 100644
--- a/yg/path_text_element.cpp
+++ b/yg/path_text_element.cpp
@@ -83,11 +83,6 @@ namespace yg
     m_glyphLayout.setPivot(pivot);
   }
 
-  int PathTextElement::visualRank() const
-  {
-    return 2000 + m_fontDesc.m_size;
-  }
-
   OverlayElement * PathTextElement::clone(math::Matrix<double, 3, 3> const & m) const
   {
     return new PathTextElement(*this, m);
diff --git a/yg/path_text_element.hpp b/yg/path_text_element.hpp
index 32361d6d22..d9e7d91896 100644
--- a/yg/path_text_element.hpp
+++ b/yg/path_text_element.hpp
@@ -27,8 +27,6 @@ namespace yg
 
     void draw(gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
 
-    int visualRank() const;
-
     void setPivot(m2::PointD const & pivot);
 
     OverlayElement * clone(math::Matrix<double, 3, 3> const & m) const;
diff --git a/yg/straight_text_element.cpp b/yg/straight_text_element.cpp
index 43e501baa5..ecaa20cd5b 100644
--- a/yg/straight_text_element.cpp
+++ b/yg/straight_text_element.cpp
@@ -293,11 +293,6 @@ namespace yg
       m_glyphLayouts[i].setPivot(m_glyphLayouts[i].pivot() + offs);
   }
 
-  int StraightTextElement::visualRank() const
-  {
-    return 1000 + m_fontDesc.m_size;
-  }
-
   OverlayElement * StraightTextElement::clone(math::Matrix<double, 3, 3> const & m) const
   {
     return new StraightTextElement(*this, m);
diff --git a/yg/straight_text_element.hpp b/yg/straight_text_element.hpp
index 09e96c993a..84210c5803 100644
--- a/yg/straight_text_element.hpp
+++ b/yg/straight_text_element.hpp
@@ -33,8 +33,6 @@ namespace yg
 
     void draw(gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
 
-    int visualRank() const;
-
     void setPivot(m2::PointD const & pv);
 
     OverlayElement * clone(math::Matrix<double, 3, 3> const & m) const;
diff --git a/yg/symbol_element.cpp b/yg/symbol_element.cpp
index 11baa895ac..5dd1b88c67 100644
--- a/yg/symbol_element.cpp
+++ b/yg/symbol_element.cpp
@@ -85,11 +85,6 @@ namespace yg
                           style->m_pipelineID);
   }
 
-  int SymbolElement::visualRank() const
-  {
-    return 0000;
-  }
-
   OverlayElement * SymbolElement::clone(math::Matrix<double, 3, 3> const & m) const
   {
     return new SymbolElement(*this, m);
diff --git a/yg/symbol_element.hpp b/yg/symbol_element.hpp
index ae7fef7bd2..3a1541b62c 100644
--- a/yg/symbol_element.hpp
+++ b/yg/symbol_element.hpp
@@ -37,8 +37,6 @@ namespace yg
 
     uint32_t styleID() const;
 
-    int visualRank() const;
-
     OverlayElement * clone(math::Matrix<double, 3, 3> const & m) const;
   };
 }