[iOS] review fixes

iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.swift

@@ -38,43 +38,42 @@ final class LayersViewController: MWMViewController {
   }
 
   @IBAction func onTrafficButton(_ sender: UIButton) {
-    MWMTrafficManager.enableTraffic(!MWMTrafficManager.trafficEnabled())
+    MWMTrafficManager.setTrafficEnabled(!MWMTrafficManager.trafficEnabled())
   }
 
   @IBAction func onSubwayButton(_ sender: UIButton) {
-    MWMTrafficManager.enableTransit(!MWMTrafficManager.transitEnabled())
+    MWMTrafficManager.setTransitEnabled(!MWMTrafficManager.transitEnabled())
   }
 }
 
 extension LayersViewController: MWMTrafficManagerObserver {
   func onTrafficStateUpdated() {
     updateTrafficButton()
-    var statusString: String = ""
+    let statusString: String
     switch MWMTrafficManager.trafficState() {
-    case .enabled:
-      statusString = "success"
-    case .noData:
-      statusString = "unavailable"
-    case .networkError:
-      statusString = "error"
-    default:
-      statusString = ""
+    case .enabled: statusString = "success"
+    case .noData: statusString = "unavailable"
+    case .networkError: statusString = "error"
+    case .disabled: fallthrough
+    case .waitingData: fallthrough
+    case .outdated: fallthrough
+    case .expiredData: fallthrough
+    case .expiredApp: statusString = ""
     }
+
     Statistics.logEvent("Map_Layers_activate", withParameters: ["name" : "traffic",
                                                                 "status" : statusString])
   }
 
   func onTransitStateUpdated() {
     updateSubwayButton()
-    var statusString: String = ""
+    let statusString: String
     switch MWMTrafficManager.transitState() {
-    case .enabled:
-      statusString = "success"
-    case .noData:
-      statusString = "unavailable"
-    default:
-      statusString = ""
+    case .enabled: statusString = "success"
+    case .noData: statusString = "unavailable"
+    case .disabled: statusString = ""
     }
+    
     Statistics.logEvent("Map_Layers_activate", withParameters: ["name" : "subway",
                                                                 "status" : statusString])
   }

iphone/Maps/Classes/CustomViews/MapViewControls/Layers/ModalTransitioning.swift

@@ -84,9 +84,7 @@ fileprivate final class PresentationAnimator: NSObject, UIViewControllerAnimated
     UIView.animate(withDuration: transitionDuration(using: transitionContext),
                    animations: {
                     toVC.view.frame = finalFrame
-    }) { finished in
-      transitionContext.completeTransition(finished)
-    }
+    }) { transitionContext.completeTransition($0) }
   }
 }
 

iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm

@@ -37,6 +37,7 @@ NSArray<UIImage *> * imagesWithName(NSString * name)
 @property(nonatomic) NSLayoutConstraint * topOffset;
 @property(nonatomic) NSLayoutConstraint * leftOffset;
 @property(nonatomic) CGRect availableArea;
+
 @end
 
 @implementation MWMTrafficButtonViewController
@@ -109,7 +110,7 @@ NSArray<UIImage *> * imagesWithName(NSString * name)
   {
     switch ([MWMTrafficManager trafficState])
     {
-    case MWMTrafficManagerStateDisabled: btn.imageName = @"btn_traffic_off"; break;
+      case MWMTrafficManagerStateDisabled: CHECK(false, ("Incorrect traffic manager state.")); break;
       case MWMTrafficManagerStateEnabled: btn.imageName = @"btn_traffic_on"; break;
       case MWMTrafficManagerStateWaitingData:
         iv.animationImages = imagesWithName(@"btn_traffic_update");
@@ -123,7 +124,7 @@ NSArray<UIImage *> * imagesWithName(NSString * name)
         break;
       case MWMTrafficManagerStateNetworkError:
         btn.imageName = @"btn_traffic_off";
-        [MWMTrafficManager enableTraffic:NO];
+        [MWMTrafficManager setTrafficEnabled:NO];
         [[MWMAlertViewController activeAlertController] presentNoConnectionAlert];
         break;
       case MWMTrafficManagerStateExpiredData:
@@ -151,9 +152,13 @@ NSArray<UIImage *> * imagesWithName(NSString * name)
 - (IBAction)buttonTouchUpInside
 {
   if ([MWMTrafficManager trafficEnabled])
-    [MWMTrafficManager enableTraffic:NO];
+  {
+    [MWMTrafficManager setTrafficEnabled:NO];
+  }
   else if ([MWMTrafficManager transitEnabled])
-    [MWMTrafficManager enableTransit:NO];
+  {
+    [MWMTrafficManager setTransitEnabled:NO];
+  }
   else
   {
     auto layersVC = [[LayersViewController alloc] init];

iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm

@@ -283,7 +283,7 @@ using Observers = NSHashTable<Observer>;
 {
   BOOL const switchOn = ([MWMTrafficManager trafficState] == MWMTrafficManagerStateDisabled);
   [Statistics logEvent:kStatMenu withParameters:@{kStatTraffic : switchOn ? kStatOn : kStatOff}];
-  [MWMTrafficManager enableTraffic:switchOn];
+  [MWMTrafficManager setTrafficEnabled:switchOn];
 }
 
 - (IBAction)settingsButtonAction

iphone/Maps/Core/Traffic/MWMTrafficManager.h

@@ -35,7 +35,7 @@ typedef NS_ENUM(NSUInteger, MWMTransitManagerState) {
 + (BOOL)trafficEnabled;
 + (BOOL)transitEnabled;
 
-+ (void)enableTraffic:(BOOL)enable;
-+ (void)enableTransit:(BOOL)enable;
++ (void)setTrafficEnabled:(BOOL)enable;
++ (void)setTransitEnabled:(BOOL)enable;
 
 @end

iphone/Maps/Core/Traffic/MWMTrafficManager.mm

@@ -102,19 +102,21 @@ using Observers = NSHashTable<Observer>;
   return [MWMTrafficManager manager].transitState != TransitReadManager::TransitSchemeState::Disabled;
 }
 
-+ (void)enableTraffic:(BOOL)enable
++ (void)setTrafficEnabled:(BOOL)enable
 {
   if (enable)
-    [self enableTransit:!enable];
+    [self setTransitEnabled:!enable];
+  
   auto & f = GetFramework();
   f.GetTrafficManager().SetEnabled(enable);
   f.SaveTrafficEnabled(enable);
 }
 
-+ (void)enableTransit:(BOOL)enable
++ (void)setTransitEnabled:(BOOL)enable
 {
   if (enable)
-    [self enableTraffic:!enable];
+    [self setTrafficEnabled:!enable];
+  
   auto & f = GetFramework();
   f.GetTransitManager().EnableTransitSchemeMode(enable);
   f.SaveTransitSchemeEnabled(enable);

iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm

@@ -301,6 +301,7 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName)
   [MWMRouter stopRouting];
   if ([MWMTrafficManager transitEnabled])
     [MWMRouter setType:MWMRouterTypePublicTransport];
+  
   MWMRoutePoint * point = [self routePointWithType:MWMRoutePointTypeFinish intermediateIndex:0];
   [MWMRouter buildToPoint:point bestRouter:YES];
   [self closePlacePage];