diff options
| author | VladiMihaylenko <vxmihaylenko@gmail.com> | 2016-03-17 17:43:02 +0300 |
|---|---|---|
| committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:56:46 +0300 |
| commit | 1f5462c149c50ca102cf38fa3760b84be3baf4c0 (patch) | |
| tree | b957738eb8a9e9bd56eec42545131d027ff74eef | |
| parent | 2928862bac8b3a96816b53d32954e05580914582 (diff) | |
[ios] Fixed bug with routing progress and type changing.
| -rw-r--r-- | iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm | 10 | ||||
| -rw-r--r-- | iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm index 7f421e9446..f7820ec740 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm @@ -240,12 +240,12 @@ extern NSString * const kTTSStatusWasChangedNotification; self.activeRouteTypeButton = progress; auto & f = GetFramework(); routing::RouterType type; - if ([progress isEqual:self.routePreview.pedestrianProgressView]) + if ([progress isEqual:self.routePreview.pedestrianProgress]) { [[Statistics instance] logEvent:kStatPointToPoint withParameters:@{kStatAction : kStatChangeRoutingMode, kStatValue : kStatPedestrian}]; - self.routePreview.vehicleProgressView.state = MWMCircularProgressStateNormal; + self.routePreview.vehicleProgress.state = MWMCircularProgressStateNormal; type = routing::RouterType::Pedestrian; } else @@ -253,7 +253,7 @@ extern NSString * const kTTSStatusWasChangedNotification; [[Statistics instance] logEvent:kStatPointToPoint withParameters:@{kStatAction : kStatChangeRoutingMode, kStatValue : kStatVehicle}]; - self.routePreview.pedestrianProgressView.state = MWMCircularProgressStateNormal; + self.routePreview.pedestrianProgress.state = MWMCircularProgressStateNormal; type = routing::RouterType::Vehicle; } f.CloseRouting(); @@ -362,10 +362,10 @@ extern NSString * const kTTSStatusWasChangedNotification; switch (GetFramework().GetRouter()) { case routing::RouterType::Pedestrian: - self.activeRouteTypeButton = self.routePreview.pedestrianProgressView; + self.activeRouteTypeButton = self.routePreview.pedestrianProgress; break; case routing::RouterType::Vehicle: - self.activeRouteTypeButton = self.routePreview.vehicleProgressView; + self.activeRouteTypeButton = self.routePreview.vehicleProgress; break; } [self.routePreview selectProgress:self.activeRouteTypeButton]; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h index 73c6ffb557..3dbf6b3999 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h @@ -16,8 +16,8 @@ @interface MWMRoutePreview : MWMNavigationView @property (weak, nonatomic, readonly) IBOutlet UIButton * extendButton; -@property (nonatomic, readonly) MWMCircularProgress * pedestrianProgressView; -@property (nonatomic, readonly) MWMCircularProgress * vehicleProgressView; +@property (nonatomic, readonly) MWMCircularProgress * pedestrianProgress; +@property (nonatomic, readonly) MWMCircularProgress * vehicleProgress; @property (weak, nonatomic) id<MWMRoutePreviewDataSource> dataSource; @property (weak, nonatomic) MWMNavigationDashboardManager * dashboardManager; |