From 98b7a126cff40aa63dfcfa6ca193e0103e509e94 Mon Sep 17 00:00:00 2001
From: "r.kuznetsov" <r.kuznetsov@corp.mail.ru>
Date: Wed, 2 Aug 2017 11:43:20 +0300
Subject: [PATCH] Fixed PixelRectIn3d usage

---
 drape/debug_rect_renderer.cpp             | 6 ++----
 drape/overlay_tree.cpp                    | 6 ++----
 drape_frontend/my_position_controller.cpp | 2 +-
 map/framework.cpp                         | 3 +--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/drape/debug_rect_renderer.cpp b/drape/debug_rect_renderer.cpp
index a121963794..38ab953198 100644
--- a/drape/debug_rect_renderer.cpp
+++ b/drape/debug_rect_renderer.cpp
@@ -10,10 +10,8 @@ namespace
 {
 m2::PointF PixelPointToScreenSpace(ScreenBase const & screen, m2::PointF const & pt)
 {
-  float const szX = static_cast<float>(screen.isPerspective() ? screen.PixelRectIn3d().SizeX() :
-                                                                screen.PixelRect().SizeX());
-  float const szY = static_cast<float>(screen.isPerspective() ? screen.PixelRectIn3d().SizeY() :
-                                                                screen.PixelRect().SizeY());
+  float const szX = static_cast<float>(screen.PixelRectIn3d().SizeX());
+  float const szY = static_cast<float>(screen.PixelRectIn3d().SizeY());
   return m2::PointF(pt.x / szX - 0.5f, -pt.y / szY + 0.5f) * 2.0f;
 }
 }  // namespace
diff --git a/drape/overlay_tree.cpp b/drape/overlay_tree.cpp
index 9ee348469d..c14e91b19e 100644
--- a/drape/overlay_tree.cpp
+++ b/drape/overlay_tree.cpp
@@ -454,12 +454,10 @@ void detail::OverlayTraits::SetModelView(ScreenBase const & modelView)
 
   double const extension = m_visualScale * kScreenPixelRectExtension;
   double const doubleExtension = 2.0 * extension;
-  m2::RectD screenRect = modelView.isPerspective() ? modelView.PixelRectIn3d()
-                                                   : modelView.PixelRect();
-  m_extendedScreenRect = screenRect;
+  m_extendedScreenRect = modelView.PixelRectIn3d();
   m_extendedScreenRect.Inflate(extension, extension);
 
-  m_displacersFreeRect = screenRect;
+  m_displacersFreeRect = modelView.PixelRectIn3d();
   if (m_displacersFreeRect.SizeX() > doubleExtension && m_displacersFreeRect.SizeY() > doubleExtension)
     m_displacersFreeRect.Inflate(-extension, -extension);
   else
diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp
index cf4d12abec..01002d166f 100644
--- a/drape_frontend/my_position_controller.cpp
+++ b/drape_frontend/my_position_controller.cpp
@@ -184,7 +184,7 @@ void MyPositionController::UpdatePosition()
 
 void MyPositionController::OnUpdateScreen(ScreenBase const & screen)
 {
-  m_pixelRect = screen.isPerspective() ? screen.PixelRectIn3d() : screen.PixelRect();
+  m_pixelRect = screen.PixelRectIn3d();
   m_positionYOffset = screen.isPerspective() ? kPositionOffsetYIn3D : kPositionOffsetY;
   if (m_visiblePixelRect.IsEmptyInterior())
     m_visiblePixelRect = m_pixelRect;
diff --git a/map/framework.cpp b/map/framework.cpp
index 7a6cbfde1d..b61215d3cf 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1178,8 +1178,7 @@ void Framework::ShowAll()
 
 m2::PointD Framework::GetPixelCenter() const
 {
-  return m_currentModelView.isPerspective() ? m_currentModelView.PixelRectIn3d().Center()
-                                            : m_currentModelView.PixelRect().Center();
+  return m_currentModelView.PixelRectIn3d().Center();
 }
 
 m2::PointD Framework::GetVisiblePixelCenter() const