From 92863f798378ee9bb7feadbc69e3926928decf3d Mon Sep 17 00:00:00 2001 From: Constantin Shalnev Date: Thu, 23 Jul 2015 17:04:30 +0300 Subject: [PATCH] iPhone uses set/get router functions --- iphone/Maps/Classes/MWMPlacePageActionBar.mm | 3 ++- iphone/Maps/Classes/MapsAppDelegate.h | 1 - iphone/Maps/Classes/SearchView.mm | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/iphone/Maps/Classes/MWMPlacePageActionBar.mm b/iphone/Maps/Classes/MWMPlacePageActionBar.mm index 888cb02a5f..ae9489e9d0 100644 --- a/iphone/Maps/Classes/MWMPlacePageActionBar.mm +++ b/iphone/Maps/Classes/MWMPlacePageActionBar.mm @@ -42,7 +42,8 @@ static NSString * const kPlacePageActionBarNibName = @"PlacePageActionBar"; BOOL const isMyPosition = placePage.manager.entity.type == MWMPlacePageEntityTypeMyPosition; bar.routeButton.hidden = isMyPosition; bar.autoresizingMask = UIViewAutoresizingNone; - NSString * routeImageName = [MapsAppDelegate theApp].isPedestrianRoutingMode ? @"ic_route_walk" : @"ic_route"; + BOOL const isPedestrian = GetFramework().GetRouter() == routing::RouterType::Pedestrian; + NSString * routeImageName = isPedestrian ? @"ic_route_walk" : @"ic_route"; [bar.routeButton setImage:[UIImage imageNamed:routeImageName] forState:UIControlStateNormal]; return bar; } diff --git a/iphone/Maps/Classes/MapsAppDelegate.h b/iphone/Maps/Classes/MapsAppDelegate.h index e5e7e3f5c4..5f3183dc3d 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.h +++ b/iphone/Maps/Classes/MapsAppDelegate.h @@ -20,7 +20,6 @@ @property (nonatomic, weak) IBOutlet MapViewController * m_mapViewController; @property (nonatomic, readonly) LocationManager * m_locationManager; -@property (nonatomic) BOOL isPedestrianRoutingMode; + (MapsAppDelegate *)theApp; diff --git a/iphone/Maps/Classes/SearchView.mm b/iphone/Maps/Classes/SearchView.mm index fca4fedca4..92353396eb 100644 --- a/iphone/Maps/Classes/SearchView.mm +++ b/iphone/Maps/Classes/SearchView.mm @@ -402,10 +402,10 @@ static BOOL keyboardLoaded = NO; if (!isPedestrian && !isVehicle) return NO; - MapsAppDelegate * delegate = [MapsAppDelegate theApp]; - delegate.isPedestrianRoutingMode = isPedestrian; - [self search:cmd]; + GetFramework().SetRouter(isPedestrian ? routing::RouterType::Pedestrian : routing::RouterType::Vehicle); + [self searchBarDidPressCancelButton:nil]; + return YES; }