From ab3ce40f290401d1a53664583da5282f5fa784f8 Mon Sep 17 00:00:00 2001
From: Daria Volvenkova <d.volvenkova@corp.mail.ru>
Date: Tue, 10 Apr 2018 18:42:47 +0300
Subject: [PATCH] Fixed showing a bookmark with invalid scale.

---
 map/bookmark_manager.hpp | 1 -
 map/framework.cpp        | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/map/bookmark_manager.hpp b/map/bookmark_manager.hpp
index c40b1569db..88e450ad08 100644
--- a/map/bookmark_manager.hpp
+++ b/map/bookmark_manager.hpp
@@ -444,7 +444,6 @@ private:
   df::DrapeEngineSafePtr m_drapeEngine;
   AsyncLoadingCallbacks m_asyncLoadingCallbacks;
   std::atomic<bool> m_needTeardown;
-  kml::MarkGroupId m_lastGroupID;
   size_t m_openedEditSessionsCount = 0;
   bool m_loadBookmarksFinished = false;
   bool m_firstDrapeNotification = false;
diff --git a/map/framework.cpp b/map/framework.cpp
index e3a77810a6..e3655e7efb 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -955,12 +955,12 @@ void Framework::ShowBookmark(Bookmark const * mark)
 
   StopLocationFollow();
 
-  double scale = mark->GetScale();
-  if (scale == -1.0)
+  auto scale = static_cast<int>(mark->GetScale());
+  if (scale == 0)
     scale = scales::GetUpperComfortScale();
 
   if (m_drapeEngine != nullptr)
-    m_drapeEngine->SetModelViewCenter(mark->GetPivot(), static_cast<int>(scale), true /* isAnim */,
+    m_drapeEngine->SetModelViewCenter(mark->GetPivot(), scale, true /* isAnim */,
                                       true /* trackVisibleViewport */);
 
   place_page::Info info;