From ed96ff5f9765096d111314314be112883d464ca8 Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Wed, 25 Dec 2019 19:39:32 +0300 Subject: [PATCH] [search] [map] Removed indirect calls to SearchAPI by Framework's clients. --- android/jni/com/mapswithme/maps/Framework.cpp | 4 +- .../jni/com/mapswithme/maps/SearchEngine.cpp | 18 ++++----- .../CoreApi/Framework/MWMFrameworkHelper.mm | 2 +- iphone/Maps/Bookmarks/BookmarksVC.mm | 4 +- iphone/Maps/Core/Search/MWMSearch.mm | 6 +-- .../Maps/UI/Editor/MWMEditorViewController.mm | 2 +- map/framework.cpp | 39 +------------------ map/framework.hpp | 21 ---------- qt/search_panel.cpp | 2 +- qt/update_dialog.cpp | 2 +- 10 files changed, 22 insertions(+), 78 deletions(-) diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index eefac82fd0..544d0b381b 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -550,7 +550,7 @@ void Framework::Scale(m2::PointD const & centerPt, int targetZoom, bool animate) bool Framework::Search(search::EverywhereSearchParams const & params) { m_searchQuery = params.m_query; - return m_work.SearchEverywhere(params); + return m_work.GetSearchAPI().SearchEverywhere(params); } void Framework::AddLocalMaps() @@ -1157,7 +1157,7 @@ Java_com_mapswithme_maps_Framework_nativeGetDrawScale(JNIEnv * env, jclass) JNIEXPORT void JNICALL Java_com_mapswithme_maps_Framework_nativePokeSearchInViewport(JNIEnv * env, jclass) { - frm()->PokeSearchInViewport(); + frm()->GetSearchAPI().PokeSearchInViewport(); } JNIEXPORT jdoubleArray JNICALL diff --git a/android/jni/com/mapswithme/maps/SearchEngine.cpp b/android/jni/com/mapswithme/maps/SearchEngine.cpp index c00cf0ffb4..60e6f2673c 100644 --- a/android/jni/com/mapswithme/maps/SearchEngine.cpp +++ b/android/jni/com/mapswithme/maps/SearchEngine.cpp @@ -395,7 +395,7 @@ void OnResults(Results const & results, vector const & prod { env->CallVoidMethod(g_javaListener, g_endResultsId, static_cast(timestamp)); if (isMapAndTable && results.IsEndedNormal()) - g_framework->NativeFramework()->PokeSearchInViewport(); + g_framework->NativeFramework()->GetSearchAPI().PokeSearchInViewport(); } } @@ -690,7 +690,7 @@ extern "C" params.m_bookingFilterTasks = g_bookingBuilder.BuildTasks(env, bookingFilterParams); g_lastBookingFilterTasks = params.m_bookingFilterTasks; - bool const searchStarted = g_framework->NativeFramework()->SearchEverywhere(params); + bool const searchStarted = g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(params); if (searchStarted) g_queryTimestamp = timestamp; return searchStarted; @@ -710,7 +710,7 @@ extern "C" // TODO (@alexzatsepin): set up vparams.m_onCompleted here and use // HotelsClassifier for hotel queries detection. - g_framework->NativeFramework()->SearchInViewport(vparams); + g_framework->NativeFramework()->GetSearchAPI().SearchInViewport(vparams); if (isMapAndTable) { @@ -722,7 +722,7 @@ extern "C" eparams.m_hotelsFilter = vparams.m_hotelsFilter; eparams.m_bookingFilterTasks = g_lastBookingFilterTasks; - if (g_framework->NativeFramework()->SearchEverywhere(eparams)) + if (g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(eparams)) g_queryTimestamp = timestamp; } } @@ -735,7 +735,7 @@ extern "C" params.m_inputLocale = jni::ToNativeString(env, lang); params.m_onResults = bind(&OnMapSearchResults, _1, timestamp); - if (g_framework->NativeFramework()->SearchInDownloader(params)) + if (g_framework->NativeFramework()->GetSearchAPI().SearchInDownloader(params)) g_queryTimestamp = timestamp; } @@ -748,7 +748,7 @@ extern "C" params.m_onStarted = bind(&OnBookmarksSearchStarted); params.m_onResults = bind(&OnBookmarksSearchResults, _1, _2, timestamp); - bool const searchStarted = g_framework->NativeFramework()->SearchInBookmarks(params); + bool const searchStarted = g_framework->NativeFramework()->GetSearchAPI().SearchInBookmarks(params); if (searchStarted) g_queryTimestamp = timestamp; return searchStarted; @@ -763,19 +763,19 @@ extern "C" JNIEXPORT void JNICALL Java_com_mapswithme_maps_search_SearchEngine_nativeCancelInteractiveSearch(JNIEnv * env, jclass clazz) { - g_framework->NativeFramework()->CancelSearch(search::Mode::Viewport); + g_framework->NativeFramework()->GetSearchAPI().CancelSearch(search::Mode::Viewport); } JNIEXPORT void JNICALL Java_com_mapswithme_maps_search_SearchEngine_nativeCancelEverywhereSearch(JNIEnv * env, jclass clazz) { - g_framework->NativeFramework()->CancelSearch(search::Mode::Everywhere); + g_framework->NativeFramework()->GetSearchAPI().CancelSearch(search::Mode::Everywhere); } JNIEXPORT void JNICALL Java_com_mapswithme_maps_search_SearchEngine_nativeCancelAllSearches(JNIEnv * env, jclass clazz) { - g_framework->NativeFramework()->CancelAllSearches(); + g_framework->NativeFramework()->GetSearchAPI().CancelAllSearches(); } JNIEXPORT jobjectArray JNICALL diff --git a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm index b9dee5d2e9..40e4bdec3e 100644 --- a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm +++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm @@ -169,7 +169,7 @@ } completion([resultsArray copy], results.m_endMarker); }; - GetFramework().SearchInDownloader(searchParams); + GetFramework().GetSearchAPI().SearchInDownloader(searchParams); } @end diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm index d26d5015e8..719435ff8b 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksVC.mm @@ -498,7 +498,7 @@ using namespace std; } - (void)cancelSearch { - GetFramework().CancelSearch(search::Mode::Bookmarks); + GetFramework().GetSearchAPI().CancelSearch(search::Mode::Bookmarks); [self showNoResultsView:NO]; self.searchSections = nil; @@ -663,7 +663,7 @@ using namespace std; [Statistics logEvent:kStatBookmarksSearch withParameters:@{kStatFrom : kStatBookmarksList}]; }; - GetFramework().SearchInBookmarks(searchParams); + GetFramework().GetSearchAPI().SearchInBookmarks(searchParams); } #pragma mark - UITableViewDataSource diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm index 1a08fccd21..5be29766c7 100644 --- a/iphone/Maps/Core/Search/MWMSearch.mm +++ b/iphone/Maps/Core/Search/MWMSearch.mm @@ -149,7 +149,7 @@ booking::filter::Tasks MakeBookingFilterTasks(booking::filter::Params && availab [self enableCallbackFor:booking::filter::Type::Availability]; [self enableCallbackFor:booking::filter::Type::Deals]; - GetFramework().SearchEverywhere(m_everywhereParams); + GetFramework().GetSearchAPI().SearchEverywhere(m_everywhereParams); self.searchCount += 1; } @@ -163,7 +163,7 @@ booking::filter::Tasks MakeBookingFilterTasks(booking::filter::Params && availab self.searchCount -= 1; }; - GetFramework().SearchInViewport(m_viewportParams); + GetFramework().GetSearchAPI().SearchInViewport(m_viewportParams); } - (void)updateFilters @@ -313,7 +313,7 @@ booking::filter::Tasks MakeBookingFilterTasks(booking::filter::Params && availab - (void)reset { self.lastSearchTimestamp += 1; - GetFramework().CancelAllSearches(); + GetFramework().GetSearchAPI().CancelAllSearches(); m_everywhereResults.Clear(); m_viewportResults.Clear(); diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm index 9855e09fe6..41da9ff622 100644 --- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm @@ -975,7 +975,7 @@ void registerCellsForTableView(std::vector const & cells, UIT if (!f.RollBackChanges(fid)) NSAssert(false, @"We shouldn't call this if we can't roll back!"); - f.PokeSearchInViewport(); + f.GetSearchAPI().PokeSearchInViewport(); [self goBack]; }; diff --git a/map/framework.cpp b/map/framework.cpp index 5609b7cf4a..fda9f0103c 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -638,7 +638,7 @@ bool Framework::OnCountryFileDelete(storage::CountryId const & countryId, if (countryId == m_lastReportedCountry) m_lastReportedCountry = kInvalidCountryId; - CancelAllSearches(); + GetSearchAPI().CancelAllSearches(); m2::RectD rect = mercator::Bounds::FullRect(); @@ -1389,41 +1389,6 @@ void Framework::SetCurrentCountryChangedListener(TCurrentCountryChanged const & m_lastReportedCountry = kInvalidCountryId; } -void Framework::PokeSearchInViewport(bool forceSearch) -{ - return GetSearchAPI().PokeSearchInViewport(forceSearch); -} - -bool Framework::SearchEverywhere(search::EverywhereSearchParams const & params) -{ - return GetSearchAPI().SearchEverywhere(params); -} - -bool Framework::SearchInViewport(search::ViewportSearchParams const & params) -{ - return GetSearchAPI().SearchInViewport(params); -} - -bool Framework::SearchInDownloader(DownloaderSearchParams const & params) -{ - return GetSearchAPI().SearchInDownloader(params); -} - -bool Framework::SearchInBookmarks(search::BookmarksSearchParams const & params) -{ - return GetSearchAPI().SearchInBookmarks(params); -} - -void Framework::CancelSearch(search::Mode mode) -{ - return GetSearchAPI().CancelSearch(mode); -} - -void Framework::CancelAllSearches() -{ - return GetSearchAPI().CancelAllSearches(); -} - void Framework::MemoryWarning() { LOG(LINFO, ("MemoryWarning")); @@ -1672,7 +1637,7 @@ void Framework::SelectSearchResult(search::Result const & result, bool animation void Framework::ShowSearchResult(search::Result const & res, bool animation) { - CancelAllSearches(); + GetSearchAPI().CancelAllSearches(); StopLocationFollow(); alohalytics::LogEvent("searchShowResult", {{"pos", strings::to_string(res.GetPositionInResults())}, diff --git a/map/framework.hpp b/map/framework.hpp index ff91a460df..314775b494 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -549,27 +549,6 @@ private: public: using SearchRequest = search::QuerySaver::SearchRequest; - // When search in viewport is active or delayed, restarts search in - // viewport. When |forceSearch| is false, request is skipped when it - // is similar to the previous request in the current - // search-in-viewport session. - void PokeSearchInViewport(bool forceSearch = true); - - // Search everywhere. - bool SearchEverywhere(search::EverywhereSearchParams const & params); - - // Search in the viewport. - bool SearchInViewport(search::ViewportSearchParams const & params); - - // Search for maps by countries or cities. - bool SearchInDownloader(storage::DownloaderSearchParams const & params); - - // Search for bookmarks by query string. - bool SearchInBookmarks(search::BookmarksSearchParams const & params); - - void CancelSearch(search::Mode mode); - void CancelAllSearches(); - // Moves viewport to the search result and taps on it. void SelectSearchResult(search::Result const & res, bool animation); diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp index fac89b861e..9833f515a3 100644 --- a/qt/search_panel.cpp +++ b/qt/search_panel.cpp @@ -342,7 +342,7 @@ void SearchPanel::OnSearchPanelItemClicked(int row, int) void SearchPanel::hideEvent(QHideEvent *) { - m_pDrawWidget->GetFramework().CancelSearch(search::Mode::Everywhere); + m_pDrawWidget->GetFramework().GetSearchAPI().CancelSearch(search::Mode::Everywhere); } void SearchPanel::OnAnimationTimer() diff --git a/qt/update_dialog.cpp b/qt/update_dialog.cpp index 7c784931d9..616cd5fc20 100644 --- a/qt/update_dialog.cpp +++ b/qt/update_dialog.cpp @@ -277,7 +277,7 @@ namespace qt FillTree(filter, timestamp); }; - m_framework.SearchInDownloader(params); + m_framework.GetSearchAPI().SearchInDownloader(params); } void UpdateDialog::FillTree(optional const & filter, uint64_t timestamp)