From de7ec3846691bb4468bb457bbfc1793f4eefb7d3 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Tue, 21 Dec 2021 00:17:28 +0100 Subject: [PATCH] Minor cleanup Signed-off-by: Alexander Borsuk --- .../com/mapswithme/maps/location/LocationHelper.java | 12 ++++-------- map/framework.cpp | 10 +++------- map/framework.hpp | 4 +--- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/android/src/com/mapswithme/maps/location/LocationHelper.java b/android/src/com/mapswithme/maps/location/LocationHelper.java index 9182e42299..059d1b4f9e 100644 --- a/android/src/com/mapswithme/maps/location/LocationHelper.java +++ b/android/src/com/mapswithme/maps/location/LocationHelper.java @@ -97,16 +97,12 @@ public enum LocationHelper implements Initializable, AppBackgroundTrack @Override public void onLocationError(int errorCode) { - mLogger.d(TAG, "onLocationError errorCode = " + errorCode, new Throwable()); + mLogger.d(TAG, "onLocationError errorCode = " + errorCode + + ", current state = " + LocationState.nameOf(getMyPositionMode())); mSavedLocation = null; nativeOnLocationError(errorCode); - mLogger.d(TAG, "nativeOnLocationError errorCode = " + errorCode + - ", current state = " + LocationState.nameOf(getMyPositionMode())); - - if (mUiCallback == null) - return; - - mUiCallback.onLocationError(); + if (mUiCallback != null) + mUiCallback.onLocationError(); } @Override diff --git a/map/framework.cpp b/map/framework.cpp index dac7ed8547..c9df98311e 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -210,7 +210,7 @@ void Framework::OnLocationUpdate(GpsInfo const & info) } #else - GpsInfo rInfo(info); + GpsInfo const & rInfo = info; #endif m_routingManager.OnLocationUpdate(rInfo); @@ -1395,15 +1395,14 @@ void Framework::FillSearchResultsMarks(bool clear, search::Results const & resul FillSearchResultsMarks(results.begin(), results.end(), clear); } -void Framework::FillSearchResultsMarks(SearchResultsIterT begin, SearchResultsIterT end, - bool clear, SearchMarkPostProcessing const & fn) +void Framework::FillSearchResultsMarks(SearchResultsIterT beg, SearchResultsIterT end, bool clear) { auto editSession = GetBookmarkManager().GetEditSession(); if (clear) editSession.ClearGroup(UserMark::Type::SEARCH); editSession.SetIsVisible(UserMark::Type::SEARCH, true); - for (auto it = begin; it != end; ++it) + for (auto it = beg; it != end; ++it) { auto const & r = *it; if (!r.HasPoint()) @@ -1425,9 +1424,6 @@ void Framework::FillSearchResultsMarks(SearchResultsIterT begin, SearchResultsIt mark->SetVisited(m_searchMarks.IsVisited(mark->GetFeatureID())); mark->SetSelected(m_searchMarks.IsSelected(mark->GetFeatureID())); } - - if (fn) - fn(*mark); } } diff --git a/map/framework.hpp b/map/framework.hpp index 1bd06728a2..d138c6ea40 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -490,9 +490,7 @@ public: size_t ShowSearchResults(search::Results const & results); void FillSearchResultsMarks(bool clear, search::Results const & results); - using SearchMarkPostProcessing = std::function; - void FillSearchResultsMarks(SearchResultsIterT begin, SearchResultsIterT end, - bool clear, SearchMarkPostProcessing const & fn = {}); + void FillSearchResultsMarks(SearchResultsIterT beg, SearchResultsIterT end, bool clear); /// Calculate distance and direction to POI for the given position. /// @param[in] point POI's position;