map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #5551 from igrechuhin/cp

Browse source 
[cp] [ios] Fixed cancelling of searching on map.
This commit is contained in:
Yuri Gorshenin 2017-03-10 11:51:46 +03:00 • committed by GitHub
commit a9178081bb
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,12 +83,14 @@ 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.everywhereSearchCompleted = YES;
if (IPAD || self.searchOnMap)
{
auto & f = GetFramework();
f.ShowSearchResults(m_everywhereResults);
f.SearchInViewport(m_viewportParams);
}
}
[self onSearchCompleted];
}
@ -217,8 +219,9 @@ using TObservers = NSHashTable<__kindof TObserver>;
+ (void)reset
{
GetFramework().CancelAllSearches();
MWMSearch * manager = [MWMSearch manager];
manager.lastSearchTimestamp = 0;
GetFramework().CancelAllSearches();
manager.everywhereSearchCompleted = NO;
manager.viewportSearchCompleted = NO;
if (manager->m_filterQuery != manager->m_everywhereParams.m_query)