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

[search] [ios] Updated search requests logic.

Browse source
This commit is contained in:
Ilya Grechuhin 2017-02-10 13:36:31 +03:00
parent 5562457ce8
commit 3f6d2efc5b
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,6 +84,12 @@ using TObservers = NSHashTable<__kindof TObserver>;
[self checkIsHotelResults:results];
if (results.IsEndedNormal())
self.everywhereSearchCompleted = YES;
if (IPAD || self.searchOnMap)
{
auto & f = GetFramework();
f.ShowSearchResults(m_everywhereResults);
f.SearchInViewport(m_viewportParams);
}
[self onSearchCompleted];
}
else
@ -145,24 +151,13 @@ using TObservers = NSHashTable<__kindof TObserver>;
- (void)update
{
[MWMSearch clear];
[MWMSearch reset];
if (m_everywhereParams.m_query.empty())
return;
[self updateCallbacks];
[self updateFilters];
auto & f = GetFramework();
if (IPAD)
{
f.SearchEverywhere(m_everywhereParams);
f.SearchInViewport(m_viewportParams);
}
else
{
if (self.searchOnMap)
f.SearchInViewport(m_viewportParams);
else
f.SearchEverywhere(m_everywhereParams);
}
f.SearchEverywhere(m_everywhereParams);
[self onSearchStarted];
}
@ -220,11 +215,10 @@ using TObservers = NSHashTable<__kindof TObserver>;
+ (void)update { [[MWMSearch manager] update]; }
+ (void)clear
+ (void)reset
{
GetFramework().CancelAllSearches();
MWMSearch * manager = [MWMSearch manager];
manager->m_everywhereResults.Clear();
manager.everywhereSearchCompleted = NO;
manager.viewportSearchCompleted = NO;
if (manager->m_filterQuery != manager->m_everywhereParams.m_query)
@ -233,6 +227,12 @@ using TObservers = NSHashTable<__kindof TObserver>;
[manager onSearchResultsUpdated];
}
+ (void)clear
{
[MWMSearch manager]->m_everywhereResults.Clear();
[self reset];
}
+ (BOOL)isSearchOnMap { return [MWMSearch manager].searchOnMap; }
+ (void)setSearchOnMap:(BOOL)searchOnMap