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

[search] [map] Removed indirect calls to SearchAPI by Framework's clients.

Browse source
This commit is contained in:
Maxim Pimenov 2019-12-25 19:39:32 +03:00 • committed by Tatiana Yan
parent d3c8c13caa
commit ed96ff5f97
10 changed files with 22 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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

18
android/jni/com/mapswithme/maps/SearchEngine.cpp
View file

@ -395,7 +395,7 @@ void OnResults(Results const & results, vector<search::ProductInfo> const & prod
{
env->CallVoidMethod(g_javaListener, g_endResultsId, static_cast<jlong>(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

2
iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm
View file

@ -169,7 +169,7 @@
}
completion([resultsArray copy], results.m_endMarker);
};
GetFramework().SearchInDownloader(searchParams);
GetFramework().GetSearchAPI().SearchInDownloader(searchParams);
}
@end

4
iphone/Maps/Bookmarks/BookmarksVC.mm
View file

@ -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

6
iphone/Maps/Core/Search/MWMSearch.mm
View file

@ -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();

2
iphone/Maps/UI/Editor/MWMEditorViewController.mm
View file

@ -975,7 +975,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellType> 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];
};

39
map/framework.cpp
View file

@ -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())},

21
map/framework.hpp
View file

@ -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);

2
qt/search_panel.cpp
View file

@ -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()

2
qt/update_dialog.cpp
View file

@ -277,7 +277,7 @@ namespace qt
FillTree(filter, timestamp);
};
m_framework.SearchInDownloader(params);
m_framework.GetSearchAPI().SearchInDownloader(params);
}
void UpdateDialog::FillTree(optional<Filter> const & filter, uint64_t timestamp)