[iOS] Fixes for statistic events

iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.mm

@@ -5,11 +5,6 @@
 using namespace network_policy;
 using np = platform::NetworkPolicy;
 
-namespace
-{
-NSString * const kStatisticsEvent = @"Mobile Internet Settings Alert";
-}
-
 @interface MWMMobileInternetAlert ()
 
 @property(copy, nonatomic) MWMVoidBlock completionBlock;
@@ -20,7 +15,6 @@ NSString * const kStatisticsEvent = @"Mobile Internet Settings Alert";
 
 + (nonnull instancetype)alertWithBlock:(nonnull MWMVoidBlock)block
 {
-  [Statistics logEvent:kStatisticsEvent withParameters:@{kStatAction : kStatOpen}];
   MWMMobileInternetAlert * alert =
       [NSBundle.mainBundle loadNibNamed:[self className] owner:nil options:nil].firstObject;
   alert.completionBlock = block;
@@ -29,21 +23,21 @@ NSString * const kStatisticsEvent = @"Mobile Internet Settings Alert";
 
 - (IBAction)alwaysTap
 {
-  [Statistics logEvent:kStatMobileInternet withParameters:@{kStatValue : kStatAlways}];
+  [Statistics logEvent:kStatMobileInternetAlert withParameters:@{kStatValue : kStatAlways}];
   SetStage(Stage::Always);
   [self close:self.completionBlock];
 }
 
 - (IBAction)askTap
 {
-  [Statistics logEvent:kStatMobileInternet withParameters:@{kStatValue: kStatToday}];
+  [Statistics logEvent:kStatMobileInternetAlert withParameters:@{kStatValue: kStatToday}];
   SetStage(Stage::Today);
   [self close:self.completionBlock];
 }
 
 - (IBAction)neverTap
 {
-  [Statistics logEvent:kStatisticsEvent withParameters:@{kStatAction: kStatNotToday}];
+  [Statistics logEvent:kStatMobileInternetAlert withParameters:@{kStatAction: kStatNotToday}];
   SetStage(Stage::NotToday);
   [self close:self.completionBlock];
 }

iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm

@@ -286,7 +286,17 @@ using namespace storage;
         __weak __typeof(self) ws = self;
         self.bannerViewController = [[MWMMegafonBannerViewController alloc] initWithTapHandler:^{
           [ws bannerAction];
+          [Statistics logEvent:kStatDownloaderBannerClick
+                withParameters:@{
+                                 kStatFrom: kStatMap,
+                                 kStatProvider: kStatMegafon
+                                 }];
         }];
+        [Statistics logEvent:kStatDownloaderBannerShow
+              withParameters:@{
+                               kStatFrom: kStatMap,
+                               kStatProvider: kStatMegafon
+                               }];
         break;
       }
       case promo::DownloaderPromo::Type::BookmarkCatalog: {
@@ -299,9 +309,17 @@ using namespace storage;
           }
           NSURL *url = [NSURL URLWithString:urlString];
           [self.controller openCatalogAbsoluteUrl:url animated:YES utm:MWMUTMDownloadMwmBanner];
-          [Statistics logEvent:kStatDownloaderBannerClick];
+          [Statistics logEvent:kStatDownloaderBannerClick
+                withParameters:@{
+                                 kStatFrom: kStatMap,
+                                 kStatProvider: kStatMapsmeGuides
+                                 }];
         }];
-        [Statistics logEvent:kStatDownloaderBannerShow];
+        [Statistics logEvent:kStatDownloaderBannerShow
+              withParameters:@{
+                               kStatFrom: kStatMap,
+                               kStatProvider: kStatMapsmeGuides
+                               }];
         break;
       }
       case promo::DownloaderPromo::Type::NoPromo:

iphone/Maps/Common/Statistics/StatisticsStrings.h

@@ -114,6 +114,7 @@ static NSString * const kStatDiscoveryButtonItemShow = @"DiscoveryButton_Item_Sh
 static NSString * const kStatDiscoveryButtonOpen = @"DiscoveryButton_Open";
 static NSString * const kStatDisk = @"disk";
 static NSString * const kStatDownload = @"download";
+static NSString * const kStatDownloadError = @"download_error";
 static NSString * const kStatDownloadGroup = @"download_group";
 static NSString * const kStatDownloadGuides = @"download_guides";
 static NSString * const kStatDownloadMap = @"Download map";
@@ -229,11 +230,13 @@ static NSString * const kStatMapsmeInAppSuggestionClicked = @"MapsMe_InAppSugges
 static NSString * const kStatMapsmeInAppSuggestionClosed = @"MapsMe_InAppSuggestion_closed";
 static NSString * const kStatMapsmeInAppSuggestionShown = @"MapsMe_InAppSuggestion_shown";
 static NSString * const kStatMaxim = @"Maxim";
+static NSString * const kStatMegafon = @"Megafon";
 static NSString * const kStatMenu = @"menu";
 static NSString * const kStatMigrationBig2SmallMWM = @"Big mwms to small mwms migration counter";
 static NSString * const kStatMiles = @"Miles";
 static NSString * const kStatMobile = @"mobile";
 static NSString * const kStatMobileInternet = @"Mobile Internet";
+static NSString * const kStatMobileInternetAlert = @"MobileInternet_alert";
 static NSString * const kStatMode = @"mode";
 static NSString * const kStatMopub = @"Mopub";
 static NSString * const kStatMore = @"More";
@@ -253,6 +256,7 @@ static NSString * const kStatNightMode = @"NightMode";
 static NSString * const kStatNo = @"No";
 static NSString * const kStatNoBackup = @"no_backup";
 static NSString * const kStatNoConnection = @"no_connection";
+static NSString * const kStatNoInternet = @"no_internet";
 static NSString * const kStatNoSpace = @"no_space";
 static NSString * const kStatNone = @"none";
 static NSString * const kStatNotification = @"notification";
@@ -390,6 +394,7 @@ static NSString * const kStatSendAsFile = @"send_as_file";
 static NSString * const kStatSendEmail = @"Send email";
 static NSString * const kStatSettings = @"settings";
 static NSString * const kStatSettingsBookmarksSyncToggle = @"Settings_BookmarksSync_toggle";
+static NSString * const kStatSettingsMobileInternetChange = @"Settings_MobileInternet_change";
 static NSString * const kStatSettingsOpenSection = @"Settings open section";
 static NSString * const kStatSettingsSpeedCameras = @"Settings Speed_cameras";
 static NSString * const kStatShare = @"Share";

iphone/Maps/UI/PlacePage/MWMPlacePageData.mm

@@ -901,7 +901,8 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
     [Statistics logEvent:kStatPlacepageSponsoredError
           withParameters:@{
                            kStatProvider: kStatMapsmeGuides,
-                           kStatPlacement: kStatPlacePage
+                           kStatPlacement: kStatPlacePage,
+                           kStatError: kStatNoInternet
                            }];
   } else {
     auto const resultHandler = [self](promo::CityGallery const & cityGallery) {
@@ -923,7 +924,8 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
       [Statistics logEvent:kStatPlacepageSponsoredError
             withParameters:@{
                              kStatProvider: kStatMapsmeGuides,
-                             kStatPlacement: kStatPlacePage
+                             kStatPlacement: kStatPlacePage,
+                             kStatError: kStatDownloadError
                              }];
       if (self.refreshPromoCallback) {
         self.refreshPromoCallback();

iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm

@@ -880,7 +880,7 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
     [Statistics logEvent:kStatPlacepageSponsoredMoreSelected
           withParameters:@{
                            kStatProvider: kStatMapsmeGuides,
-                           kStatPlacement: kStatDiscovery
+                           kStatPlacement: kStatPlacePage
                            }];
   } else {
     promo::CityGallery::Item const &item = [self.data.promoGallery galleryItemAtIndex:indexPath.row];

iphone/Maps/UI/Promo/PromoAfterBookingViewController.swift

@@ -4,7 +4,7 @@ class PromoAfterBookingViewController: UIViewController {
   private var cityImageUrl: String
   private var okClosure: MWMVoidBlock
   private var cancelClosure: MWMVoidBlock
-  private var isCancelled: Bool = false
+  private var isOnButtonClosed: Bool = false
   
   @IBOutlet weak var cityImageView: UIImageView!
   
@@ -27,7 +27,7 @@ class PromoAfterBookingViewController: UIViewController {
   
   override func viewDidDisappear(_ animated: Bool) {
     super.viewDidDisappear(animated)
-    if !isCancelled {
+    if !isOnButtonClosed {
       let eventParams = [kStatProvider: kStatMapsmeGuides,
                          kStatScenario: kStatBooking,
                          kStatOption: kStatOffscreen]
@@ -47,6 +47,7 @@ class PromoAfterBookingViewController: UIViewController {
   @IBAction func onOk() {
     let eventParams = [kStatProvider: kStatMapsmeGuides, kStatScenario: kStatBooking]
     Statistics.logEvent(kStatMapsmeInAppSuggestionClicked, withParameters: eventParams)
+    isOnButtonClosed = true
     okClosure()
   }
   
@@ -55,7 +56,7 @@ class PromoAfterBookingViewController: UIViewController {
                        kStatScenario: kStatBooking,
                        kStatOption: kStatCancel]
     Statistics.logEvent(kStatMapsmeInAppSuggestionClosed, withParameters: eventParams)
-    isCancelled = true
+    isOnButtonClosed = true
     cancelClosure()
   }
   

iphone/Maps/UI/Settings/MWMMobileInternetViewController.mm

@@ -58,7 +58,7 @@ using np = platform::NetworkPolicy;
     SetStage(Never);
   }
 
-  [Statistics logEvent:kStatMobileInternet withParameters:@{kStatValue : statValue}];
+  [Statistics logEvent:kStatSettingsMobileInternetChange withParameters:@{kStatValue : statValue}];
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath