diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreviewTaxiCellType.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreviewTaxiCellType.h
index adc6daad1e..81f49feac6 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreviewTaxiCellType.h
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreviewTaxiCellType.h
@@ -3,5 +3,5 @@ typedef NS_ENUM(NSInteger, MWMRoutePreviewTaxiCellType) {
MWMRoutePreviewTaxiCellTypeUber,
MWMRoutePreviewTaxiCellTypeYandex,
MWMRoutePreviewTaxiCellTypeMaxim,
- MWMRoutePreviewTaxiCellTypeRutaxi
+ MWMRoutePreviewTaxiCellTypeVezet
};
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm
index d9221b004f..ed7ca9ad91 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm
@@ -134,8 +134,8 @@ using namespace taxi;
providerName = kStatMaxim;
break;
case taxi::Provider::Type::Rutaxi:
- self.type = MWMRoutePreviewTaxiCellTypeRutaxi;
- providerName = kStatRutaxi;
+ self.type = MWMRoutePreviewTaxiCellTypeVezet;
+ providerName = kStatVezet;
break;
case taxi::Provider::Type::Count:
LOG(LERROR, ("Incorrect taxi provider"));
@@ -171,7 +171,7 @@ using namespace taxi;
case taxi::Provider::Type::Uber: provider = kStatUber; break;
case taxi::Provider::Type::Yandex: provider = kStatYandex; break;
case taxi::Provider::Type::Maxim: provider = kStatMaxim; break;
- case taxi::Provider::Type::Rutaxi: provider = kStatRutaxi; break;
+ case taxi::Provider::Type::Rutaxi: provider = kStatVezet; break;
case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
}
NSString * errorValue = nil;
@@ -204,7 +204,7 @@ using namespace taxi;
case MWMRoutePreviewTaxiCellTypeUber: url = [NSURL URLWithString:@"uber://"]; break;
case MWMRoutePreviewTaxiCellTypeYandex: url = [NSURL URLWithString:@"yandextaxi://"]; break;
case MWMRoutePreviewTaxiCellTypeMaxim: url = [NSURL URLWithString:@"maximzakaz://"]; break;
- case MWMRoutePreviewTaxiCellTypeRutaxi: url = [NSURL URLWithString:@"rto://"]; break;
+ case MWMRoutePreviewTaxiCellTypeVezet: url = [NSURL URLWithString:@"vzt://"]; break;
}
return [UIApplication.sharedApplication canOpenURL:url];
}
@@ -227,7 +227,7 @@ using namespace taxi;
case MWMRoutePreviewTaxiCellTypeUber: type = Provider::Type::Uber; break;
case MWMRoutePreviewTaxiCellTypeYandex: type = Provider::Type::Yandex; break;
case MWMRoutePreviewTaxiCellTypeMaxim: type = Provider::Type::Maxim; break;
- case MWMRoutePreviewTaxiCellTypeRutaxi: type = Provider::Type::Rutaxi; break;
+ case MWMRoutePreviewTaxiCellTypeVezet: type = Provider::Type::Rutaxi; break;
}
auto links = engine->GetRideRequestLinks(type, productId, m_from, m_to);
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift
index 3ab6ab16be..b9fe20a464 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift
@@ -23,7 +23,7 @@ final class RoutePreviewTaxiCell: UICollectionViewCell {
case .uber: return #imageLiteral(resourceName: "icTaxiUber")
case .yandex: return #imageLiteral(resourceName: "ic_taxi_logo_yandex")
case .maxim: return #imageLiteral(resourceName: "ic_taxi_logo_maksim")
- case .rutaxi: return #imageLiteral(resourceName: "ic_taxi_logo_rutaxi")
+ case .vezet: return #imageLiteral(resourceName: "ic_taxi_logo_vezet")
}
}
@@ -33,7 +33,7 @@ final class RoutePreviewTaxiCell: UICollectionViewCell {
case .uber: return title
case .yandex: return L("yandex_taxi_title")
case .maxim: return L("maxim_taxi_title")
- case .rutaxi: return L("rutaxi_title")
+ case .vezet: return L("vezet_taxi")
}
}
@@ -43,7 +43,7 @@ final class RoutePreviewTaxiCell: UICollectionViewCell {
case .uber: return price
case .yandex: fallthrough
case .maxim: fallthrough
- case .rutaxi:
+ case .vezet:
let formatter = NumberFormatter()
formatter.numberStyle = .currency
formatter.currencyCode = currency
@@ -59,7 +59,7 @@ final class RoutePreviewTaxiCell: UICollectionViewCell {
let timeString = { () -> String in
var timeValue = DateComponentsFormatter.etaString(from: TimeInterval(eta)!)!
- if type == .rutaxi {
+ if type == .vezet {
timeValue = String(coreFormat: L("place_page_starting_from"), arguments: [timeValue]);
}
diff --git a/iphone/Maps/Common/Statistics/StatisticsStrings.h b/iphone/Maps/Common/Statistics/StatisticsStrings.h
index 040ca84226..674c583ee4 100644
--- a/iphone/Maps/Common/Statistics/StatisticsStrings.h
+++ b/iphone/Maps/Common/Statistics/StatisticsStrings.h
@@ -345,7 +345,6 @@ static NSString * const kStatRoutingTooltipClicked = @"Routing_PlanTooltip_click
static NSString * const kStatRoutingRouteStart = @"Routing_Route_start";
static NSString * const kStatRoutingRouteFinish = @"Routing_Route_finish";
static NSString * const kStatRoutingInterrupted = @"interrupted";
-static NSString * const kStatRutaxi = @"Rutaxi";
static NSString * const kStatSave = @"Save";
static NSString * const kStatScenario = @"scenario";
static NSString * const kStatScreen = @"Screen";
@@ -438,6 +437,7 @@ static NSString * const kStatUserInterrupted = @"user_interrupted";
static NSString * const kStatValue = @"Value";
static NSString * const kStatVehicle = @"Vehicle";
static NSString * const kStatVendor = @"vendor";
+static NSString * const kStatVezet = @"Vezet";
static NSString * const kStatViewOnMap = @"view_on_map";
static NSString * const kStatVisible = @"Visible";
static NSString * const kStatWhatsNew = @"What's New";
diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm
index afa950b45a..c6fca3b510 100644
--- a/iphone/Maps/Core/Routing/MWMRouter.mm
+++ b/iphone/Maps/Core/Routing/MWMRouter.mm
@@ -131,7 +131,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
case MWMRoutePreviewTaxiCellTypeUber: provider = kStatUber; break;
case MWMRoutePreviewTaxiCellTypeYandex: provider = kStatYandex; break;
case MWMRoutePreviewTaxiCellTypeMaxim: provider = kStatMaxim; break;
- case MWMRoutePreviewTaxiCellTypeRutaxi: provider = kStatRutaxi; break;
+ case MWMRoutePreviewTaxiCellTypeVezet: provider = kStatVezet; break;
}
[Statistics logEvent:eventName
diff --git a/iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/ic_taxi_logo_rutaxi.png b/iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/ic_taxi_logo_rutaxi.png
deleted file mode 100644
index e3ec2b1c39..0000000000
Binary files a/iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/ic_taxi_logo_rutaxi.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/ic_taxi_logo_rutaxi@2x.png b/iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/ic_taxi_logo_rutaxi@2x.png
deleted file mode 100644
index b459d75882..0000000000
Binary files a/iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/ic_taxi_logo_rutaxi@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/ic_taxi_logo_rutaxi@3x.png b/iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/ic_taxi_logo_rutaxi@3x.png
deleted file mode 100644
index 66fc5118ae..0000000000
Binary files a/iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/ic_taxi_logo_rutaxi@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/Contents.json
similarity index 100%
rename from iphone/Maps/Images.xcassets/ic_taxi_logo_rutaxi.imageset/Contents.json
rename to iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/Contents.json
diff --git a/iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/ic_taxi_logo_rutaxi.png b/iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/ic_taxi_logo_rutaxi.png
new file mode 100644
index 0000000000..60344fa0a4
Binary files /dev/null and b/iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/ic_taxi_logo_rutaxi.png differ
diff --git a/iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/ic_taxi_logo_rutaxi@2x.png b/iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/ic_taxi_logo_rutaxi@2x.png
new file mode 100644
index 0000000000..634e2d441e
Binary files /dev/null and b/iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/ic_taxi_logo_rutaxi@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/ic_taxi_logo_rutaxi@3x.png b/iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/ic_taxi_logo_rutaxi@3x.png
new file mode 100644
index 0000000000..38facf2aca
Binary files /dev/null and b/iphone/Maps/Images.xcassets/ic_taxi_logo_vezet.imageset/ic_taxi_logo_rutaxi@3x.png differ
diff --git a/iphone/Maps/MAPSME.plist b/iphone/Maps/MAPSME.plist
index 3c42f53b4f..93013cb4fe 100644
--- a/iphone/Maps/MAPSME.plist
+++ b/iphone/Maps/MAPSME.plist
@@ -110,7 +110,7 @@
tel
booking
maximzakaz
- rto
+ vzt
LSRequiresIPhoneOS
diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
index 1719d33971..7ed9bbcb3d 100644
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
@@ -111,7 +111,7 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
case taxi::Provider::Uber: provider = kStatUber; break;
case taxi::Provider::Yandex: provider = kStatYandex; break;
case taxi::Provider::Maxim: provider = kStatMaxim; break;
- case taxi::Provider::Rutaxi: provider = kStatRutaxi; break;
+ case taxi::Provider::Rutaxi: provider = kStatVezet; break;
case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
}
[Statistics logEvent:kStatPlacepageTaxiShow withParameters:@{ @"provider" : provider }];
diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
index 5ea15c1c69..0628d24c1b 100644
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
@@ -361,7 +361,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
case MWMPlacePageTaxiProviderUber: providerString = kStatUber; break;
case MWMPlacePageTaxiProviderYandex: providerString = kStatYandex; break;
case MWMPlacePageTaxiProviderMaxim: providerString = kStatMaxim; break;
- case MWMPlacePageTaxiProviderRutaxi: providerString = kStatRutaxi; break;
+ case MWMPlacePageTaxiProviderVezet: providerString = kStatVezet; break;
}
[Statistics logEvent:kStatPlacePageTaxiClick
withParameters:@{kStatProvider : providerString, kStatTags : data.statisticsTags}];
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/MWMPlacePageTaxiProvider.h b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/MWMPlacePageTaxiProvider.h
index 7bddd23ef7..8cb49895e7 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/MWMPlacePageTaxiProvider.h
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/MWMPlacePageTaxiProvider.h
@@ -3,5 +3,5 @@ typedef NS_ENUM(NSInteger, MWMPlacePageTaxiProvider) {
MWMPlacePageTaxiProviderUber,
MWMPlacePageTaxiProviderYandex,
MWMPlacePageTaxiProviderMaxim,
- MWMPlacePageTaxiProviderRutaxi
+ MWMPlacePageTaxiProviderVezet
};
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/PlacePageTaxiCell.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/PlacePageTaxiCell.swift
index 0326b01b8e..4a7e08dba4 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/PlacePageTaxiCell.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/PlacePageTaxiCell.swift
@@ -40,9 +40,9 @@ final class PlacePageTaxiCell: MWMTableViewCell {
case .maxim:
icon.image = #imageLiteral(resourceName: "ic_taxi_logo_maksim")
title.text = L("maxim_taxi_title")
- case .rutaxi:
- icon.image = #imageLiteral(resourceName: "ic_taxi_logo_rutaxi")
- title.text = L("rutaxi_title")
+ case .vezet:
+ icon.image = #imageLiteral(resourceName: "ic_taxi_logo_vezet")
+ title.text = L("vezet_taxi")
}
}
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
index ec1cd416a3..e4556372fc 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
@@ -393,7 +393,7 @@ map const kMetaInfoCells = {
case taxi::Provider::Uber: type = MWMPlacePageTaxiProviderUber; break;
case taxi::Provider::Yandex: type = MWMPlacePageTaxiProviderYandex; break;
case taxi::Provider::Maxim: type = MWMPlacePageTaxiProviderMaxim; break;
- case taxi::Provider::Rutaxi: type = MWMPlacePageTaxiProviderRutaxi; break;
+ case taxi::Provider::Rutaxi: type = MWMPlacePageTaxiProviderVezet; break;
case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
}
[c configWithType:type delegate:delegate];
@@ -631,7 +631,7 @@ map const kMetaInfoCells = {
case taxi::Provider::Uber: provider = kStatUber; break;
case taxi::Provider::Yandex: provider = kStatYandex; break;
case taxi::Provider::Maxim: provider = kStatMaxim; break;
- case taxi::Provider::Rutaxi: provider = kStatRutaxi; break;
+ case taxi::Provider::Rutaxi: provider = kStatVezet; break;
case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
}
[Statistics logEvent:kStatPlacepageTaxiShow