diff --git a/android/src/com/mapswithme/maps/taxi/TaxiAdapter.java b/android/src/com/mapswithme/maps/taxi/TaxiAdapter.java index 817fb8c042..839fc7711b 100644 --- a/android/src/com/mapswithme/maps/taxi/TaxiAdapter.java +++ b/android/src/com/mapswithme/maps/taxi/TaxiAdapter.java @@ -53,7 +53,7 @@ public class TaxiAdapter extends PagerAdapter String separator; // We ignore all Yandex.Taxi product names until they do support of passing product parameters // to their app via deeplink. - if (mType == TaxiType.YANDEX || mType == TaxiType.MAXIM) + if (mType == TaxiType.YANDEX || mType == TaxiType.MAXIM || mType == TaxiType.RUTAXI) { name.setText(mType.getTitle()); separator = " • ~"; diff --git a/android/src/com/mapswithme/maps/taxi/TaxiType.java b/android/src/com/mapswithme/maps/taxi/TaxiType.java index 9b20d7b0bb..b4a5f63dea 100644 --- a/android/src/com/mapswithme/maps/taxi/TaxiType.java +++ b/android/src/com/mapswithme/maps/taxi/TaxiType.java @@ -104,6 +104,39 @@ public enum TaxiType { return "Maxim"; } + }, + // Dummy. + RUTAXI + { + @NonNull + public String getPackageName() + { + return "ru.rutaxi.vezet"; + } + + @NonNull + public Utils.PartnerAppOpenMode getOpenMode() + { + return Utils.PartnerAppOpenMode.Direct; + } + + @DrawableRes + public int getIcon() + { + return R.drawable.ic_taxi_logo_maksim; + } + + @StringRes + public int getTitle() + { + return R.string.maxim_taxi_title; + } + + @NonNull + public String getProviderName() + { + return "Rutaxi"; + } }; @NonNull diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm index c6c4904cc5..ed25bf1770 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm @@ -133,6 +133,10 @@ using namespace taxi; self.type = MWMRoutePreviewTaxiCellTypeMaxim; providerName = kStatMaxim; break; + // Dummy. + case taxi::Provider::Type::Rutaxi: + self.type = MWMRoutePreviewTaxiCellTypeMaxim; + providerName = kStatMaxim; case taxi::Provider::Type::Count: LOG(LERROR, ("Incorrect taxi provider")); break; @@ -167,6 +171,8 @@ 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; + // Dummy. + case taxi::Provider::Type::Rutaxi: provider = kStatMaxim; break; case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break; } NSString * errorValue = nil; diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm index 37f451b6c4..8736b5cbe8 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm @@ -107,6 +107,8 @@ 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; + // Dummy. + case taxi::Provider::Rutaxi: provider = kStatMaxim; break; case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break; } [Statistics logEvent:kStatPlacepageTaxiShow withParameters:@{ @"provider" : provider }]; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm index dbbde95392..b9b5cce8e8 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm @@ -386,6 +386,8 @@ map const kMetaInfoCells = { case taxi::Provider::Uber: type = MWMPlacePageTaxiProviderUber; break; case taxi::Provider::Yandex: type = MWMPlacePageTaxiProviderYandex; break; case taxi::Provider::Maxim: type = MWMPlacePageTaxiProviderMaxim; break; + // Dummy. + case taxi::Provider::Rutaxi: type = MWMPlacePageTaxiProviderMaxim; break; case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break; } [c configWithType:type delegate:delegate]; @@ -628,6 +630,8 @@ map const kMetaInfoCells = { case taxi::Provider::Uber: provider = kStatUber; break; case taxi::Provider::Yandex: provider = kStatYandex; break; case taxi::Provider::Maxim: provider = kStatMaxim; break; + // Dummy. + case taxi::Provider::Rutaxi: provider = kStatMaxim; break; case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break; } [Statistics logEvent:kStatPlacepageTaxiShow