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

Merge pull request #6425 from igrechuhin/MAPSME-4723

Browse source 
[MAPSME-4723] [ios] Fixed fast search query enter bug.
This commit is contained in:
Vlad Mihaylenko 2017-06-29 16:01:39 +03:00 • committed by GitHub
commit 473064e60d
5 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
View file

@ -21,7 +21,6 @@ using namespace routing::turns;
_targetDistance = @(info.m_distToTarget.c_str());
_targetUnits = @(info.m_targetUnitsSuffix.c_str());
_progress = info.m_completionPercent;
auto & f = GetFramework();
CLLocation * lastLocation = [MWMLocationManager lastLocation];
if (lastLocation && [MWMRouter type] == MWMRouterTypePedestrian)
{

1
iphone/Maps/Core/Location/MWMLocationManager.mm
View file

@ -332,7 +332,6 @@ void setPermissionRequested()
MWMLocationManager * manager = [self manager];
[manager.predictor setMyPositionMode:mode];
[manager processLocationStatus:manager.lastLocationStatus];
auto const & f = GetFramework();
if ([MWMRouter isRoutingActive])
{
switch ([MWMRouter type])

2
iphone/Maps/UI/Editor/MWMEditorViewController.mm
View file

@ -968,7 +968,7 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
kStatProblem : @(osm::Editor::kPlaceDoesNotExistMessage)
}
atLocation:location];
GetFramework().CreateNote(m_mapObject, osm::Editor::NoteProblemType::PlaceDoesNotExist,
GetFramework().CreateNote(self->m_mapObject, osm::Editor::NoteProblemType::PlaceDoesNotExist,
additional);
[self backTap];
[self showDropDown];

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

@ -412,6 +412,8 @@ typedef NS_ENUM(NSUInteger, MWMSearchManagerActionBarState) {
userInfo:@{
kSearchStateKey : @(state)
}];
if (_state == MWMSearchManagerStateHidden)
[self endSearch];
_state = state;
[self updateTopController];
switch (state)

1
iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewProtocol.h
View file

@ -3,7 +3,6 @@
@required
- (void)searchText:(NSString *)text forInputLocale:(NSString *)locale;
- (void)tapMyPositionFromHistory;
- (void)dismissKeyboard;
@end