Fixed house numbers selection in perspective mode.

2 files changed, 8 insertions, 2 deletions

diff --git a/geometry/screenbase.cpp b/geometry/screenbase.cpp
index 89455ae424..32ba27b523 100644
--- a/geometry/screenbase.cpp
+++ b/geometry/screenbase.cpp
@@ -440,14 +440,19 @@ m2::PointD ScreenBase::PtoP3d(m2::PointD const & pt) const
   return PtoP3d(pt, 0.0);
 }
 
+double ScreenBase::GetZScale() const
+{
+  double const averageScale3d = m_isPerspective ? 2.7 : 1.0;
+  return 2.0 / (m_Scale * m_ViewportRect.SizeY() * averageScale3d);
+}
+
 m2::PointD ScreenBase::PtoP3d(m2::PointD const & pt, double ptZ) const
 {
   if (!m_isPerspective)
     return pt;
-
   Vector3dT const normalizedPoint{float(2.0 * pt.x / m_PixelRect.SizeX() - 1.0),
                                   -float(2.0 * pt.y / m_PixelRect.SizeY() - 1.0),
-                                  float(2.0 * ptZ / m_PixelRect.SizeY()), 1.0};
+                                  float(ptZ * GetZScale()), 1.0};
 
   Vector3dT const perspectivePoint = normalizedPoint * m_Pto3d;
 
diff --git a/geometry/screenbase.hpp b/geometry/screenbase.hpp
index 9ac6650bd6..2346f1dd0b 100644
--- a/geometry/screenbase.hpp
+++ b/geometry/screenbase.hpp
@@ -140,6 +140,7 @@ public:
   double GetMaxRotationAngle() const { return m_3dMaxAngleX; }
   double GetAngleFOV() const { return m_3dFOV; }
   double GetScale3d() const { return m_3dScale; }
+  double GetZScale() const;
 
   double GetDepth3d() const { return m_3dFarZ - m_3dNearZ; }