From 09fa86558dcc54339ca756dbae23f4a384aa75f4 Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Tue, 21 Jan 2020 19:07:09 +0300 Subject: [PATCH] [search] [map] Moved QuerySaver from Framework to SearchAPI. --- android/jni/com/mapswithme/maps/SearchRecents.cpp | 6 +++--- iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm | 2 +- iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.mm | 6 +++--- iphone/Maps/Core/Search/MWMSearch.mm | 2 +- map/framework.hpp | 6 ------ map/search_api.hpp | 7 +++++++ 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/android/jni/com/mapswithme/maps/SearchRecents.cpp b/android/jni/com/mapswithme/maps/SearchRecents.cpp index 62c601928b..65086c56fc 100644 --- a/android/jni/com/mapswithme/maps/SearchRecents.cpp +++ b/android/jni/com/mapswithme/maps/SearchRecents.cpp @@ -11,7 +11,7 @@ extern "C" JNIEXPORT void JNICALL Java_com_mapswithme_maps_search_SearchRecents_nativeGetList(JNIEnv * env, jclass thiz, jobject result) { - auto const & items = g_framework->NativeFramework()->GetLastSearchQueries(); + auto const & items = g_framework->NativeFramework()->GetSearchAPI().GetLastSearchQueries(); if (items.empty()) return; @@ -34,12 +34,12 @@ extern "C" Java_com_mapswithme_maps_search_SearchRecents_nativeAdd(JNIEnv * env, jclass thiz, jstring locale, jstring query) { SearchRequest const sr(jni::ToNativeString(env, locale), jni::ToNativeString(env, query)); - g_framework->NativeFramework()->SaveSearchQuery(sr); + g_framework->NativeFramework()->GetSearchAPI().SaveSearchQuery(sr); } JNIEXPORT void JNICALL Java_com_mapswithme_maps_search_SearchRecents_nativeClear(JNIEnv * env, jclass thiz) { - g_framework->NativeFramework()->ClearSearchHistory(); + g_framework->NativeFramework()->GetSearchAPI().ClearSearchHistory(); } } diff --git a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm index 5c5b25b55b..583486e217 100644 --- a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm +++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm @@ -87,7 +87,7 @@ + (NSArray *)obtainLastSearchQueries { NSMutableArray *result = [NSMutableArray array]; - auto const &queries = GetFramework().GetLastSearchQueries(); + auto const & queries = GetFramework().GetSearchAPI().GetLastSearchQueries(); for (auto const &item : queries) { [result addObject:@(item.second.c_str())]; } diff --git a/iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.mm b/iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.mm index e4bb508c94..9b0d711d67 100644 --- a/iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.mm +++ b/iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.mm @@ -46,13 +46,13 @@ - (BOOL)isSearchHistoryEmpty { - return GetFramework().GetLastSearchQueries().empty(); + return GetFramework().GetSearchAPI().GetLastSearchQueries().empty(); } - (NSArray *)lastSearchQueries { NSMutableArray * result = [NSMutableArray array]; - auto const & queries = GetFramework().GetLastSearchQueries(); + auto const & queries = GetFramework().GetSearchAPI().GetLastSearchQueries(); for (auto const & item : queries) { [result addObject:@(item.second.c_str())]; @@ -62,7 +62,7 @@ - (void)clearSearchHistory { - GetFramework().ClearSearchHistory(); + GetFramework().GetSearchAPI().ClearSearchHistory(); } @end diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm index c58eab9281..2d856e6011 100644 --- a/iphone/Maps/Core/Search/MWMSearch.mm +++ b/iphone/Maps/Core/Search/MWMSearch.mm @@ -226,7 +226,7 @@ booking::filter::Tasks MakeBookingFilterTasks(booking::filter::Params && availab ? [MWMSearch manager]->m_everywhereParams.m_inputLocale : inputLocale.UTF8String; std::string const text = query.precomposedStringWithCompatibilityMapping.UTF8String; - GetFramework().SaveSearchQuery(make_pair(locale, text)); + GetFramework().GetSearchAPI().SaveSearchQuery(make_pair(locale, text)); } + (void)searchQuery:(NSString *)query forInputLocale:(NSString *)inputLocale diff --git a/map/framework.hpp b/map/framework.hpp index 58828197ef..c86c8a7852 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -52,7 +52,6 @@ #include "search/city_finder.hpp" #include "search/displayed_categories.hpp" #include "search/mode.hpp" -#include "search/query_saver.hpp" #include "search/region_address_getter.hpp" #include "search/result.hpp" #include "search/reverse_geocoder.hpp" @@ -206,8 +205,6 @@ protected: std::unique_ptr m_searchAPI; - search::QuerySaver m_searchQuerySaver; - ScreenBase m_currentModelView; m2::RectD m_visibleViewport; @@ -563,9 +560,6 @@ public: void FillSearchResultsMarks(bool clear, search::Results const & results); void FillSearchResultsMarks(search::Results::ConstIter begin, search::Results::ConstIter end, bool clear, SearchMarkPostProcessing fn = nullptr); - std::list const & GetLastSearchQueries() const { return m_searchQuerySaver.Get(); } - void SaveSearchQuery(SearchRequest const & query) { m_searchQuerySaver.Add(query); } - void ClearSearchHistory() { m_searchQuerySaver.Clear(); } /// Calculate distance and direction to POI for the given position. /// @param[in] point POI's position; diff --git a/map/search_api.hpp b/map/search_api.hpp index e0618515b5..11cb44196c 100644 --- a/map/search_api.hpp +++ b/map/search_api.hpp @@ -11,6 +11,7 @@ #include "search/downloader_search_callback.hpp" #include "search/engine.hpp" #include "search/mode.hpp" +#include "search/query_saver.hpp" #include "search/result.hpp" #include "search/search_params.hpp" @@ -144,6 +145,10 @@ public: void FilterAllHotelsInViewport(m2::RectD const & viewport, booking::filter::Tasks const & filterTasks) override; + std::list const & GetLastSearchQueries() const { return m_searchQuerySaver.Get(); } + void SaveSearchQuery(search::QuerySaver::SearchRequest const & query) { m_searchQuerySaver.Add(query); } + void ClearSearchHistory() { m_searchQuerySaver.Clear(); } + void EnableIndexingOfBookmarksDescriptions(bool enable); // A hint on the maximum number of bookmarks that can be stored in the @@ -196,6 +201,8 @@ private: search::Engine m_engine; + search::QuerySaver m_searchQuerySaver; + // Descriptions of last search queries for different modes. May be // used for search requests skipping. This field is not guarded // because it must be used from the UI thread only.