From 31122280480a0909bc84c259eb3f6fdc6b938d7b Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Sat, 29 Jan 2011 23:56:33 +0200
Subject: [PATCH] More convenient max scale rect check.

---
 map/navigator.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/map/navigator.cpp b/map/navigator.cpp
index 38a0a490d4..98b2953d76 100644
--- a/map/navigator.cpp
+++ b/map/navigator.cpp
@@ -157,8 +157,10 @@ namespace
   bool CheckMaxScale(ScreenBase const & screen)
   {
     m2::RectD const r = screen.GlobalRect();
-    return ((r.SizeX() <= (MercatorBounds::maxX - MercatorBounds::minX)) ||
-            (r.SizeY() <= (MercatorBounds::maxY - MercatorBounds::minY)));
+
+    // multiple by 2 to allow scale on zero level
+    double const maxSize = 2.0 * (MercatorBounds::maxX - MercatorBounds::minX);
+    return (r.SizeX() <= maxSize || r.SizeY() <= maxSize);
   }
 }