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

[ios] Fixed bug with routing progress and type changing.

Browse source
This commit is contained in:
VladiMihaylenko 2016-03-17 17:43:02 +03:00 • committed by Sergey Yershov
parent 2928862bac
commit 1f5462c149
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
View file

@ -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];

4
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h
View file

@ -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;