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

[ios] Search reloading fix

Browse source
This commit is contained in:
Igor Khmurets 2014-06-06 11:30:00 -07:00 • committed by Alex Zolotarev
parent 349d9cd248
commit eef96f7b70
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
iphone/Maps/Classes/SearchView.mm
View file

@ -239,9 +239,9 @@ __weak SearchView * selfPointer;
- (void)onLocationUpdate:(location::GpsInfo const &)info
{
if ([self.searchBar.textField.text length])
if ([self.searchBar.textField.text length] && self.state == SearchViewStateFullscreen)
{
search::SearchParams params = [self searchParameters];
search::SearchParams params = [self searchParametersWithForce:NO];
params.SetPosition(info.m_latitude, info.m_longitude);
GetFramework().Search(params, false);
@ -273,14 +273,14 @@ __weak SearchView * selfPointer;
}
}
- (search::SearchParams)searchParameters
- (search::SearchParams)searchParametersWithForce:(BOOL)force
{
search::SearchParams params;
params.SetSearchMode(search::SearchParams::ALL);
params.m_query = [[self.searchBar.textField.text precomposedStringWithCompatibilityMapping] UTF8String];
params.m_callback = bind(&OnSearchResultCallback, _1);
params.SetInputLanguage([[UITextInputMode currentInputMode].primaryLanguage UTF8String]);
params.SetForceSearch(true);
params.SetForceSearch(force);
return params;
}
@ -289,7 +289,7 @@ __weak SearchView * selfPointer;
{
self.emptyResultLabel.hidden = YES;
[self.searchBar setSearching:YES];
search::SearchParams params = [self searchParameters];
search::SearchParams params = [self searchParametersWithForce:YES];
double lat, lon;
if ([[MapsAppDelegate theApp].m_locationManager getLat:lat Lon:lon])
params.SetPosition(lat, lon);

1
map/framework.cpp
View file

@ -808,6 +808,7 @@ void Framework::UpdateUserViewportChanged()
(void)GetCurrentPosition(m_lastSearch.m_lat, m_lastSearch.m_lon);
m_lastSearch.m_callback = bind(&Framework::OnSearchResultsCallback, this, _1);
m_lastSearch.SetSearchMode(search::SearchParams::IN_VIEWPORT);
m_lastSearch.SetForceSearch(false);
(void)GetSearchEngine()->Search(m_lastSearch, GetCurrentViewport());
}