diff options
| author | Yuri Gorshenin <y@maps.me> | 2017-10-27 13:33:58 +0300 |
|---|---|---|
| committer | mpimenov <mpimenov@users.noreply.github.com> | 2017-10-27 16:13:24 +0300 |
| commit | 5738c64c9e7c79650227e7929cf46b742fb17a17 (patch) | |
| tree | 1067a858d58574fa2d0425fa9dbe4f8a90c999ce | |
| parent | f6f53abfb3889db924fa5eff06b54dc01a580545 (diff) | |
Review fixes.
| -rw-r--r-- | map/framework.cpp | 15 | ||||
| -rw-r--r-- | map/framework.hpp | 2 | ||||
| -rw-r--r-- | search/engine.hpp | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/map/framework.cpp b/map/framework.cpp index 5b2bd35123..e5ab2436f0 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -1342,8 +1342,7 @@ bool Framework::SearchEverywhere(search::EverywhereSearchParams const & params) p.m_query = params.m_query; p.m_inputLocale = params.m_inputLocale; p.m_mode = search::Mode::Everywhere; - if (m_isViewportInitialized) - p.m_viewport = GetCurrentViewport(); + SetViewportIfPossible(p); // Search request will be delayed if viewport is not available. p.m_forceSearch = true; p.m_suggestsEnabled = true; p.m_hotelsFilter = params.m_hotelsFilter; @@ -1369,8 +1368,7 @@ bool Framework::SearchInViewport(search::ViewportSearchParams const & params) search::SearchParams p; p.m_query = params.m_query; p.m_inputLocale = params.m_inputLocale; - if (m_isViewportInitialized) - p.m_viewport = GetCurrentViewport(); + SetViewportIfPossible(p); // Search request will be delayed if viewport is not available. p.m_mode = search::Mode::Viewport; p.m_forceSearch = false; p.m_suggestsEnabled = false; @@ -1398,8 +1396,7 @@ bool Framework::SearchInDownloader(DownloaderSearchParams const & params) search::SearchParams p; p.m_query = params.m_query; p.m_inputLocale = params.m_inputLocale; - if (m_isViewportInitialized) - p.m_viewport = GetCurrentViewport(); + SetViewportIfPossible(p); // Search request will be delayed if viewport is not available. p.m_mode = search::Mode::Downloader; p.m_forceSearch = true; p.m_suggestsEnabled = false; @@ -1409,6 +1406,12 @@ bool Framework::SearchInDownloader(DownloaderSearchParams const & params) return Search(p); } +void Framework::SetViewportIfPossible(search::SearchParams & params) +{ + if (m_isViewportInitialized) + params.m_viewport = GetCurrentViewport(); +} + void Framework::CancelSearch(search::Mode mode) { ASSERT_NOT_EQUAL(mode, search::Mode::Count, ()); diff --git a/map/framework.hpp b/map/framework.hpp index 5e532a63ee..ae7c052aea 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -566,6 +566,8 @@ public: /// Search for maps by countries or cities. bool SearchInDownloader(storage::DownloaderSearchParams const & params); + void SetViewportIfPossible(search::SearchParams & params); + void CancelSearch(search::Mode mode); void CancelAllSearches(); diff --git a/search/engine.hpp b/search/engine.hpp index 85dff3c714..09de8f37b9 100644 --- a/search/engine.hpp +++ b/search/engine.hpp @@ -13,11 +13,11 @@ #include "base/mutex.hpp" #include "base/thread.hpp" -#include "std/atomic.hpp" #include "std/condition_variable.hpp" #include "std/function.hpp" #include "std/mutex.hpp" #include "std/queue.hpp" +#include "std/shared_ptr.hpp" #include "std/string.hpp" #include "std/unique_ptr.hpp" #include "std/vector.hpp" |