From 23f1d5e9f9960a27b081c31e1450ecfa6f46915e Mon Sep 17 00:00:00 2001
From: Daria Volvenkova <d.volvenkova@corp.mail.ru>
Date: Fri, 18 Mar 2016 17:32:47 +0300
Subject: [PATCH] Assert in setting rect fixed.

---
 drape_frontend/navigator.cpp | 19 -------------------
 drape_frontend/navigator.hpp |  4 ----
 map/framework.cpp            |  3 +--
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/drape_frontend/navigator.cpp b/drape_frontend/navigator.cpp
index fcbd7e3cb5..3afdfb487d 100644
--- a/drape_frontend/navigator.cpp
+++ b/drape_frontend/navigator.cpp
@@ -86,25 +86,6 @@ void Navigator::CenterViewport(m2::PointD const & p)
     m_StartScreen.SetOrg(pt);
 }
 
-void Navigator::SaveState()
-{
-  settings::Set("ScreenClipRect", m_Screen.GlobalRect());
-}
-
-bool Navigator::LoadState()
-{
-  m2::AnyRectD rect;
-  if (!settings::Get("ScreenClipRect", rect))
-    return false;
-
-  // additional check for valid rect
-  if (!df::GetWorldRect().IsRectInside(rect.GetGlobalRect()))
-    return false;
-
-  SetFromRect(rect);
-  return true;
-}
-
 void Navigator::OnSize(int w, int h)
 {
   m2::RectD const & worldR = df::GetWorldRect();
diff --git a/drape_frontend/navigator.hpp b/drape_frontend/navigator.hpp
index d0092b5725..0a39c02bc6 100644
--- a/drape_frontend/navigator.hpp
+++ b/drape_frontend/navigator.hpp
@@ -21,10 +21,6 @@ public:
   void SetFromRects(m2::AnyRectD const & glbRect, m2::RectD const & pxRect);
   void SetFromRect(m2::AnyRectD const & r, uint32_t tileSize, double visualScale);
 
-  void SaveState();
-  /// @return false if can't load previously saved values
-  bool LoadState();
-
   void OnSize(int w, int h);
 
   ScreenBase const & Screen() const { return m_Screen; }
diff --git a/map/framework.cpp b/map/framework.cpp
index 51b611ef7f..dcc3d410ea 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1404,6 +1404,7 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
 #endif
 
   Allow3dMode(allow3d, allow3dBuildings);
+  LoadViewport();
 
   // In case of the engine reinitialization recover route.
   if (m_routingSession.IsActive())
@@ -1416,8 +1417,6 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
   if (m_connectToGpsTrack)
     GpsTracker::Instance().Connect(bind(&Framework::OnUpdateGpsTrackPointsCallback, this, _1, _2));
 
-  LoadViewport();
-
   // In case of the engine reinitialization simulate the last tap to show selection mark.
   if (m_lastTapEvent)
   {