diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm index 0fd95e9fac..749a915818 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm @@ -191,7 +191,6 @@ BOOL defaultOrientation(CGSize const &size) { - (IBAction)searchButtonTouchUpInside:(MWMButton *)sender { auto const body = ^(NavigationSearchState state) { - [MWMSearch setSearchOnMap:YES]; NSString *query = [kSearchButtonRequest.at(state) stringByAppendingString:@" "]; NSString *locale = [[AppInfo sharedInfo] languageId]; // Category request from navigation search wheel. diff --git a/iphone/Maps/Core/Search/MWMSearch.h b/iphone/Maps/Core/Search/MWMSearch.h index 130d0c4b24..86422f89ac 100644 --- a/iphone/Maps/Core/Search/MWMSearch.h +++ b/iphone/Maps/Core/Search/MWMSearch.h @@ -28,8 +28,6 @@ NS_SWIFT_NAME(Search) + (NSUInteger)containerIndexWithRow:(NSUInteger)row; + (SearchResult *)resultWithContainerIndex:(NSUInteger)index; -+ (void)setSearchOnMap:(BOOL)searchOnMap; - + (NSUInteger)suggestionsCount; + (NSUInteger)resultsCount; diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm index 88dca14f27..5b39f57d9a 100644 --- a/iphone/Maps/Core/Search/MWMSearch.mm +++ b/iphone/Maps/Core/Search/MWMSearch.mm @@ -17,7 +17,6 @@ using Observers = NSHashTable; @interface MWMSearch () @property(nonatomic) NSUInteger suggestionsCount; -@property(nonatomic) BOOL searchOnMap; @property(nonatomic) BOOL textChanged; @@ -111,16 +110,8 @@ using Observers = NSHashTable; [self reset]; if (m_query.empty()) return; - - if (IPAD) { - [self searchInViewport]; - [self searchEverywhere]; - } else { - if (self.searchOnMap) - [self searchInViewport]; - else - [self searchEverywhere]; - } + [self searchInViewport]; + [self searchEverywhere]; } #pragma mark - Add/Remove Observers @@ -223,18 +214,6 @@ using Observers = NSHashTable; [manager reset]; } -+ (void)setSearchOnMap:(BOOL)searchOnMap { - if (IPAD) - return; - MWMSearch *manager = [MWMSearch manager]; - if (manager.searchOnMap == searchOnMap) - return; - manager.searchOnMap = searchOnMap; - if (searchOnMap && ![MWMRouter isRoutingActive]) - GetFramework().ShowSearchResults(manager->m_everywhereResults); - [manager update]; -} - + (NSUInteger)suggestionsCount { return [MWMSearch manager].suggestionsCount; } @@ -280,8 +259,7 @@ using Observers = NSHashTable; - (void)processViewportChangedEvent { if (!GetFramework().GetSearchAPI().IsViewportSearchActive()) return; - if (IPAD) - [self searchEverywhere]; + [self searchEverywhere]; } #pragma mark - Properties