diff --git a/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.h b/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.h index 1039de396c..5a68b6164d 100644 --- a/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.h +++ b/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.h @@ -58,6 +58,7 @@ NS_SWIFT_NAME(MapOverlayManager) + (BOOL)isoLinesEnabled; + (BOOL)guidesEnabled; + (BOOL)guidesFirstLaunch; ++ (BOOL)isolinesVisible; + (void)setTrafficEnabled:(BOOL)enable; + (void)setTransitEnabled:(BOOL)enable; diff --git a/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm b/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm index 3679609bc8..4653fc3cac 100644 --- a/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm +++ b/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm @@ -154,6 +154,10 @@ static NSString *kGuidesWasShown = @"guidesWasShown"; return ![ud boolForKey:kGuidesWasShown]; } ++ (BOOL)isolinesVisible { + return GetFramework().GetIsolinesManager().IsVisible(); +} + + (void)setTrafficEnabled:(BOOL)enable { if (enable) { [self setGuidesEnabled:false]; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm index fd251dbe0b..fd0c2d83b7 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm @@ -134,8 +134,13 @@ NSArray *imagesWithName(NSString *name) { [[MWMToast toastWithText:L(@"subway_data_unavailable")] show]; } else if ([MWMMapOverlayManager isoLinesEnabled]) { btn.imageName = @"btn_isoMap_on"; - if ([MWMMapOverlayManager isolinesState] == MWMMapOverlayIsolinesStateNoData) + if ([MWMMapOverlayManager isolinesState] == MWMMapOverlayIsolinesStateEnabled && + ![MWMMapOverlayManager isolinesVisible]) { + [[MWMToast toastWithText:L(@"isolines_toast_zooms_1_10")] show]; + [Statistics logEvent:kStatMapToastShow withParameters:@{kStatType : kStatIsolines}]; + } else if ([MWMMapOverlayManager isolinesState] == MWMMapOverlayIsolinesStateNoData) { [[MWMToast toastWithText:L(@"isolines_location_error_dialog")] show]; + } else if ([MWMMapOverlayManager isolinesState] == MWMMapOverlayIsolinesStateExpiredData) [MWMAlertViewController.activeAlertController presentInfoAlert:L(@"isolines_activation_error_dialog") text:@""]; } else if ([MWMMapOverlayManager guidesEnabled]) { diff --git a/iphone/Maps/Common/Statistics/StatisticsStrings.h b/iphone/Maps/Common/Statistics/StatisticsStrings.h index b32c6a2762..2e06d4d689 100644 --- a/iphone/Maps/Common/Statistics/StatisticsStrings.h +++ b/iphone/Maps/Common/Statistics/StatisticsStrings.h @@ -273,6 +273,7 @@ static NSString * const kStatMapSponsoredButtonShow = @"Map_SponsoredButton_show static NSString * const kStatMapSponsoredButtonClick = @"Map_SponsoredButton_click"; static NSString * const kStatMapDataSize = @"map_data_size"; static NSString * const kStatMapSearch = @"Map search"; +static NSString * const kStatMapToastShow = @"Map_Toast_show"; static NSString * const kStatMapViewStyle = @"Map view style"; static NSString * const kStatMapViewStyleSettings = @"Map view style settings"; static NSString * const kStatMapsme = @"maps.me";