pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed showing a bookmark with invalid scale.

Browse source
This commit is contained in:
Daria Volvenkova 2018-04-10 18:42:47 +03:00 • committed by Roman Kuznetsov
parent d13da3aee6
commit ab3ce40f29
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
map/bookmark_manager.hpp
View file

@ -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;

6
map/framework.cpp
View file

@ -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;