From 60a1086680c77668301195fcc9bff5f59b32a3bf Mon Sep 17 00:00:00 2001
From: Daria Volvenkova <d.volvenkova@corp.mail.ru>
Date: Tue, 3 Nov 2015 15:27:57 +0300
Subject: [PATCH] Fixed POI bounding rect calculation. Fixed index buffer
 updating. Fixed pivot calculation.

---
 drape/overlay_handle.cpp            | 8 ++++----
 drape/render_bucket.cpp             | 5 +++--
 drape_frontend/poi_symbol_shape.cpp | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/drape/overlay_handle.cpp b/drape/overlay_handle.cpp
index a517e21d4b..3acb3cb67c 100644
--- a/drape/overlay_handle.cpp
+++ b/drape/overlay_handle.cpp
@@ -46,14 +46,14 @@ m2::PointD OverlayHandle::GetPivot(ScreenBase const & screen) const
   m2::PointD result = r.Center();
 
   if (m_anchor & dp::Left)
-    result.x += size.x;
-  else if (m_anchor & dp::Right)
     result.x -= size.x;
+  else if (m_anchor & dp::Right)
+    result.x += size.x;
 
   if (m_anchor & dp::Top)
-    result.y += size.y;
-  else if (m_anchor & dp::Bottom)
     result.y -= size.y;
+  else if (m_anchor & dp::Bottom)
+    result.y += size.y;
 
   return result;
 }
diff --git a/drape/render_bucket.cpp b/drape/render_bucket.cpp
index b980a12cd5..5837094270 100644
--- a/drape/render_bucket.cpp
+++ b/drape/render_bucket.cpp
@@ -85,9 +85,10 @@ void RenderBucket::Render(ScreenBase const & screen)
     bool hasIndexMutation = false;
     for (drape_ptr<OverlayHandle> const & handle : m_overlay)
     {
-      if (handle->IndexesRequired() && handle->IsVisible())
+      if (handle->IndexesRequired())
       {
-        handle->GetElementIndexes(rfpIndex);
+        if (handle->IsVisible())
+          handle->GetElementIndexes(rfpIndex);
         hasIndexMutation = true;
       }
 
diff --git a/drape_frontend/poi_symbol_shape.cpp b/drape_frontend/poi_symbol_shape.cpp
index eaa743f411..721760e4bd 100644
--- a/drape_frontend/poi_symbol_shape.cpp
+++ b/drape_frontend/poi_symbol_shape.cpp
@@ -52,7 +52,7 @@ void PoiSymbolShape::Draw(ref_ptr<dp::Batcher> batcher, ref_ptr<dp::TextureManag
   provider.InitStream(0, gpu::SolidTexturingVertex::GetBindingInfo(), make_ref(vertexes));
 
   drape_ptr<dp::OverlayHandle> handle = make_unique_dp<dp::SquareHandle>(m_params.m_id,
-                                                                         dp::Bottom,
+                                                                         dp::Center,
                                                                          m_pt,
                                                                          pixelSize,
                                                                          m_params.m_depth);