diff options
Diffstat (limited to 'iphone/Maps')
6 files changed, 27 insertions, 27 deletions
diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm index 0edbfefee5..62295bb548 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm @@ -39,7 +39,7 @@ for (auto const & i : indexes) { [titles addObject:[NSString stringWithUTF8String:a.GetCountryName(i).c_str()]]; - totalRoutingSize += a.GetCountrySize(i, isMaps ? TMapOptions::EMapWithCarRouting : TMapOptions::ECarRouting).second; + totalRoutingSize += a.GetCountrySize(i, isMaps ? TMapOptions::MapWithCarRouting : TMapOptions::CarRouting).second; } self.isMapsFiles = isMaps; self.titles = titles; @@ -130,9 +130,9 @@ static CGFloat const kMinimumOffset = 20.; __strong MWMDownloadTransitMapAlert * alert = wAlert; auto & a = GetFramework().GetCountryTree().GetActiveMapLayout(); for (auto const & index : alert->maps) - a.DownloadMap(index, TMapOptions::EMapWithCarRouting); + a.DownloadMap(index, TMapOptions::MapWithCarRouting); for (auto const & index : alert->routes) - a.DownloadMap(index, TMapOptions::ECarRouting); + a.DownloadMap(index, TMapOptions::CarRouting); }; [alert configure]; return alert; diff --git a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm index 7325379418..6eb767cee8 100644 --- a/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm +++ b/iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm @@ -121,7 +121,7 @@ - (IBAction)downloadMapTouchUpInside:(nonnull UIButton *)sender { - auto const mapType = self.downloadRoutesButton.selected ? TMapOptions::EMapWithCarRouting : TMapOptions::EMap; + auto const mapType = self.downloadRoutesButton.selected ? TMapOptions::MapWithCarRouting : TMapOptions::Map; GetFramework().GetCountryTree().GetActiveMapLayout().DownloadMap(self.currentCountryIndex, mapType); [self showRequest]; } diff --git a/iphone/Maps/Classes/LocalNotificationManager.mm b/iphone/Maps/Classes/LocalNotificationManager.mm index 3e86d9d620..9486ccdb91 100644 --- a/iphone/Maps/Classes/LocalNotificationManager.mm +++ b/iphone/Maps/Classes/LocalNotificationManager.mm @@ -280,7 +280,7 @@ typedef void (^CompletionHandler)(UIBackgroundFetchResult); /// Call download via Framework. Framework & f = GetFramework(); - f.GetCountryTree().GetActiveMapLayout().DownloadMap(index, TMapOptions::EMap); + f.GetCountryTree().GetActiveMapLayout().DownloadMap(index, TMapOptions::Map); m2::RectD const rect = f.GetCountryBounds(index); double const lon = MercatorBounds::XToLon(rect.Center().x); double const lat = MercatorBounds::YToLat(rect.Center().y); diff --git a/iphone/Maps/Classes/MapCell.mm b/iphone/Maps/Classes/MapCell.mm index 5c33e11396..bb52a30565 100644 --- a/iphone/Maps/Classes/MapCell.mm +++ b/iphone/Maps/Classes/MapCell.mm @@ -43,7 +43,7 @@ self.progressView.failedMode = NO; - if (options == TMapOptions::EMap) + if (options == TMapOptions::Map) self.routingImageView.image = [UIImage imageNamed:@"DownloadRoutingButton"]; else self.routingImageView.image = [UIImage imageNamed:@"RoutingDownloadedButton"]; diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 8b53200a91..041de24a78 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -691,7 +691,7 @@ typedef NS_OPTIONS(NSUInteger, MapInfoView) LocalAndRemoteSizeT sizes = layout.GetRemoteCountrySizes(idx); uint64_t sizeToDownload = sizes.first; TMapOptions options = static_cast<TMapOptions>(opt); - if(HasOptions(options, TMapOptions::ECarRouting)) + if(HasOptions(options, TMapOptions::CarRouting)) sizeToDownload += sizes.second; NSString * name = [NSString stringWithUTF8String:layout.GetCountryName(idx).c_str()]; diff --git a/iphone/Maps/DownloaderParentVC.mm b/iphone/Maps/DownloaderParentVC.mm index 387fce3ae7..f2480e47c1 100644 --- a/iphone/Maps/DownloaderParentVC.mm +++ b/iphone/Maps/DownloaderParentVC.mm @@ -30,22 +30,22 @@ { if (buttonIndex != alertView.cancelButtonIndex) { - if (self.selectedInActionSheetOptions == TMapOptions::EMap) + if (self.selectedInActionSheetOptions == TMapOptions::Map) [self performAction:DownloaderActionDownloadMap withSizeCheck:NO]; - else if (self.selectedInActionSheetOptions == TMapOptions::ECarRouting) + else if (self.selectedInActionSheetOptions == TMapOptions::CarRouting) [self performAction:DownloaderActionDownloadCarRouting withSizeCheck:NO]; - else if (self.selectedInActionSheetOptions == TMapOptions::EMapWithCarRouting) + else if (self.selectedInActionSheetOptions == TMapOptions::MapWithCarRouting) [self performAction:DownloaderActionDownloadAll withSizeCheck:NO]; } } - (void)download { - if (self.selectedInActionSheetOptions == TMapOptions::EMap) + if (self.selectedInActionSheetOptions == TMapOptions::Map) [self performAction:DownloaderActionDownloadMap withSizeCheck:NO]; - else if (self.selectedInActionSheetOptions == TMapOptions::ECarRouting) + else if (self.selectedInActionSheetOptions == TMapOptions::CarRouting) [self performAction:DownloaderActionDownloadCarRouting withSizeCheck:NO]; - else if (self.selectedInActionSheetOptions == TMapOptions::EMapWithCarRouting) + else if (self.selectedInActionSheetOptions == TMapOptions::MapWithCarRouting) [self performAction:DownloaderActionDownloadAll withSizeCheck:NO]; } @@ -56,7 +56,7 @@ - (NSString *)selectedMapName { return nil; } - (uint64_t)selectedMapSizeWithOptions:(TMapOptions)options { return 0; } - (TStatus)selectedMapStatus { return TStatus::EUnknown; } -- (TMapOptions)selectedMapOptions { return TMapOptions::EMap; } +- (TMapOptions)selectedMapOptions { return TMapOptions::Map; } #pragma mark - Virtual table view methods @@ -97,38 +97,38 @@ if (status == TStatus::ENotDownloaded || status == TStatus::EOutOfMemFailed || status == TStatus::EDownloadFailed) { - NSString * fullSize = formattedSize([self selectedMapSizeWithOptions:TMapOptions::EMapWithCarRouting]); - NSString * onlyMapSize = formattedSize([self selectedMapSizeWithOptions:TMapOptions::EMap]); + NSString * fullSize = formattedSize([self selectedMapSizeWithOptions:TMapOptions::MapWithCarRouting]); + NSString * onlyMapSize = formattedSize([self selectedMapSizeWithOptions:TMapOptions::Map]); [self addButtonWithTitle:[NSString stringWithFormat:@"%@, %@", L(@"downloader_download_map"), fullSize] action:DownloaderActionDownloadAll toActionSheet:actionSheet]; [self addButtonWithTitle:[NSString stringWithFormat:@"%@, %@", L(@"downloader_download_map_no_routing"), onlyMapSize] action:DownloaderActionDownloadMap toActionSheet:actionSheet]; } - if (status == TStatus::EOnDiskOutOfDate && options == TMapOptions::EMapWithCarRouting) + if (status == TStatus::EOnDiskOutOfDate && options == TMapOptions::MapWithCarRouting) { - NSString * size = formattedSize([self selectedMapSizeWithOptions:TMapOptions::EMapWithCarRouting]); + NSString * size = formattedSize([self selectedMapSizeWithOptions:TMapOptions::MapWithCarRouting]); [self addButtonWithTitle:[NSString stringWithFormat:@"%@, %@", L(@"downloader_update_map_and_routing"), size] action:DownloaderActionDownloadAll toActionSheet:actionSheet]; } - if (status == TStatus::EOnDisk && options == TMapOptions::EMap) + if (status == TStatus::EOnDisk && options == TMapOptions::Map) { - NSString * size = formattedSize([self selectedMapSizeWithOptions:TMapOptions::ECarRouting]); + NSString * size = formattedSize([self selectedMapSizeWithOptions:TMapOptions::CarRouting]); NSString * title = [NSString stringWithFormat:@"%@, %@", L(@"downloader_download_routing"), size]; [self addButtonWithTitle:title action:DownloaderActionDownloadCarRouting toActionSheet:actionSheet]; } - if (status == TStatus::EOnDiskOutOfDate && options == TMapOptions::EMap) + if (status == TStatus::EOnDiskOutOfDate && options == TMapOptions::Map) { - NSString * size = formattedSize([self selectedMapSizeWithOptions:TMapOptions::EMap]); + NSString * size = formattedSize([self selectedMapSizeWithOptions:TMapOptions::Map]); NSString * title = [NSString stringWithFormat:@"%@, %@", L(@"downloader_update_map"), size]; [self addButtonWithTitle:title action:DownloaderActionDownloadMap toActionSheet:actionSheet]; - size = formattedSize([self selectedMapSizeWithOptions:TMapOptions::EMapWithCarRouting]); + size = formattedSize([self selectedMapSizeWithOptions:TMapOptions::MapWithCarRouting]); title = [NSString stringWithFormat:@"%@, %@", L(@"downloader_update_map_and_routing"), size]; [self addButtonWithTitle:title action:DownloaderActionDownloadAll toActionSheet:actionSheet]; } if (status == TStatus::EOnDisk || status == TStatus::EOnDiskOutOfDate) { - if (options == TMapOptions::EMapWithCarRouting) + if (options == TMapOptions::MapWithCarRouting) [self addButtonWithTitle:L(@"downloader_delete_routing") action:DownloaderActionDeleteCarRouting toActionSheet:actionSheet]; [self addButtonWithTitle:L(@"downloader_delete_map") action:DownloaderActionDeleteMap toActionSheet:actionSheet]; @@ -183,17 +183,17 @@ { case DownloaderActionDownloadAll: case DownloaderActionDeleteAll: - self.selectedInActionSheetOptions = TMapOptions::EMapWithCarRouting; + self.selectedInActionSheetOptions = TMapOptions::MapWithCarRouting; break; case DownloaderActionDownloadMap: case DownloaderActionDeleteMap: - self.selectedInActionSheetOptions = TMapOptions::EMap; + self.selectedInActionSheetOptions = TMapOptions::Map; break; case DownloaderActionDownloadCarRouting: case DownloaderActionDeleteCarRouting: - self.selectedInActionSheetOptions = TMapOptions::ECarRouting; + self.selectedInActionSheetOptions = TMapOptions::CarRouting; break; default: |