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

Stop location follow when showing search result or bookmark. Do it in common Framework code.

Browse source
This commit is contained in:
vng 2012-10-15 17:59:19 +03:00 • committed by Alex Zolotarev
parent 9af9076daf
commit 566b6b74ff
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -407,12 +407,6 @@ namespace android
{
m_doLoadState = false;
shared_ptr<location::State> ls = m_work.GetInformationDisplay().locationState();
ls->StopCompassFollowing();
ls->SetLocationProcessMode(location::ELocationDoNothing);
ls->SetIsCentered(false);
m_work.ShowSearchResult(r);
}

13
map/framework.cpp
View file

@ -116,6 +116,15 @@ void Framework::OnCompassUpdate(location::CompassInfo const & info)
m_informationDisplay.locationState()->OnCompassUpdate(rInfo);
}
void Framework::StopLocationFollow()
{
shared_ptr<location::State> ls = m_informationDisplay.locationState();
ls->StopCompassFollowing();
ls->SetLocationProcessMode(location::ELocationDoNothing);
ls->SetIsCentered(false);
}
InformationDisplay & Framework::GetInformationDisplay()
{
return m_informationDisplay;
@ -477,6 +486,8 @@ BookmarkAndCategory Framework::GetBookmark(m2::PointD const & pxPoint, double vi
void Framework::ShowBookmark(Bookmark const & bm)
{
StopLocationFollow();
double scale = bm.GetScale();
if (scale == -1.0) scale = 16.0;
@ -1169,6 +1180,8 @@ bool Framework::GetCurrentPosition(double & lat, double & lon) const
void Framework::ShowSearchResult(search::Result const & res)
{
StopLocationFollow();
m2::RectD const rect = res.GetFeatureRect();
ShowRectExVisibleScale(rect);

2
map/framework.hpp
View file

@ -110,6 +110,8 @@ protected:
location::ECompassProcessMode m_dragCompassProcessMode;
location::ELocationProcessMode m_dragLocationProcessMode;
void StopLocationFollow();
//mutable threads::Mutex m_modelSyn;
storage::Storage m_storage;