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

Merge pull request #5398 from igrechuhin/search

Browse source 
[search] [ios] Updated search requests logic.
This commit is contained in:
ygorshenin 2017-02-10 16:56:36 +03:00 • committed by GitHub
commit 5adc66214d
3 changed files with 18 additions and 18 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

2
iphone/Maps/UI/Search/MWMSearchChangeModeView.mm
View file

@ -44,7 +44,7 @@ extern NSString * const kSearchStateKey;
{
case MWMSearchManagerStateTableSearch:
self.backgroundColor = [UIColor pressBackground];
[changeModeButton setTitle:L(@"search_on_map") forState:UIControlStateNormal];
[changeModeButton setTitle:L(@"search_show_on_map") forState:UIControlStateNormal];
break;
case MWMSearchManagerStateMapSearch:
self.backgroundColor = [UIColor white];

4
iphone/Maps/UI/Search/MWMSearchView.xib
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
@ -195,7 +195,7 @@
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold17"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="search_on_map"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="search_show_on_map"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="changeMode" destination="-1" eventType="touchUpInside" id="nbm-wH-tyA"/>