pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[taxi][ios] citymobil taxi is added

Browse source
This commit is contained in:
Arsentiy Milchakov 2020-10-14 12:32:10 +03:00 • committed by Aleksey Belousov
parent ae2f460c28
commit 8e7044ceaa
13 changed files with 204 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.h
View file

@ -33,6 +33,7 @@ typedef NS_ENUM(NSInteger, PlacePageTaxiProvider) {
PlacePageTaxiProviderRutaxi,
PlacePageTaxiProviderFreenow,
PlacePageTaxiProviderYango,
PlacePageTaxiProviderCitymobil,
};
typedef NS_ENUM(NSInteger, PlacePageRoadType) {

16
iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
View file

@ -39,19 +39,21 @@ static PlacePageSponsoredType convertSponsoredType(place_page::SponsoredType spo
static PlacePageTaxiProvider convertTaxiProvider(taxi::Provider::Type providerType) {
switch (providerType) {
case taxi::Provider::Uber:
case taxi::Provider::Type::Uber:
return PlacePageTaxiProviderUber;
case taxi::Provider::Yandex:
case taxi::Provider::Type::Yandex:
return PlacePageTaxiProviderYandex;
case taxi::Provider::Maxim:
case taxi::Provider::Type::Maxim:
return PlacePageTaxiProviderMaxim;
case taxi::Provider::Rutaxi:
case taxi::Provider::Type::Rutaxi:
return PlacePageTaxiProviderRutaxi;
case taxi::Provider::Freenow:
case taxi::Provider::Type::Freenow:
return PlacePageTaxiProviderFreenow;
case taxi::Provider::Yango:
case taxi::Provider::Type::Yango:
return PlacePageTaxiProviderYango;
case taxi::Provider::Count:
case taxi::Provider::Type::Citymobil:
return PlacePageTaxiProviderCitymobil;
case taxi::Provider::Type::Count:
return PlacePageTaxiProviderNone;
}
}

1
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreviewTaxiCellType.h
View file

@ -6,4 +6,5 @@ typedef NS_ENUM(NSInteger, MWMRoutePreviewTaxiCellType) {
MWMRoutePreviewTaxiCellTypeVezet,
MWMRoutePreviewTaxiCellTypeFreenow,
MWMRoutePreviewTaxiCellTypeYango,
MWMRoutePreviewTaxiCellTypeCitymobil,
};

9
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm
View file

@ -145,6 +145,10 @@ using namespace taxi;
self.type = MWMRoutePreviewTaxiCellTypeYango;
providerName = kStatYango;
break;
case taxi::Provider::Type::Citymobil:
self.type = MWMRoutePreviewTaxiCellTypeCitymobil;
providerName = kStatCitymobil;
break;
case taxi::Provider::Type::Count:
LOG(LERROR, ("Incorrect taxi provider"));
break;
@ -182,7 +186,8 @@ using namespace taxi;
case taxi::Provider::Type::Rutaxi: provider = kStatVezet; break;
case taxi::Provider::Type::Freenow: provider = kStatFreenow; break;
case taxi::Provider::Type::Yango: provider = kStatYango; break;
case taxi::Provider::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
case taxi::Provider::Type::Citymobil: provider = kStatCitymobil; break;
case taxi::Provider::Type::Count: LOG(LERROR, ("Incorrect taxi provider")); break;
}
NSString * errorValue = nil;
switch (errorCode)
@ -216,6 +221,7 @@ using namespace taxi;
case MWMRoutePreviewTaxiCellTypeVezet: url = [NSURL URLWithString:@"vzt://"]; break;
case MWMRoutePreviewTaxiCellTypeFreenow: url = [NSURL URLWithString:@"mytaxi://"]; break;
case MWMRoutePreviewTaxiCellTypeYango: url = [NSURL URLWithString:@"yandexyango://"]; break;
case MWMRoutePreviewTaxiCellTypeCitymobil: url = [NSURL URLWithString:@"citymobil-taxi://"]; break;
}
return [UIApplication.sharedApplication canOpenURL:url];
}
@ -240,6 +246,7 @@ using namespace taxi;
case MWMRoutePreviewTaxiCellTypeVezet: type = Provider::Type::Rutaxi; break;
case MWMRoutePreviewTaxiCellTypeFreenow: type = Provider::Type::Freenow; break;
case MWMRoutePreviewTaxiCellTypeYango: type = Provider::Type::Yango; break;
case MWMRoutePreviewTaxiCellTypeCitymobil: type = Provider::Type::Citymobil; break;
}
auto links = engine->GetRideRequestLinks(type, productId, m_from, m_to);

8
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewTaxiCell.swift
View file

@ -15,17 +15,19 @@ final class RoutePreviewTaxiCell: UICollectionViewCell {
case .vezet: return #imageLiteral(resourceName: "ic_taxi_logo_vezet")
case .freenow: return #imageLiteral(resourceName: "ic_logo_freenow")
case .yango: return #imageLiteral(resourceName: "ic_taxi_logo_yango")
case .citymobil: return #imageLiteral(resourceName: "ic_taxi_logo_citymobil")
}
}
let titleString = { () -> String in
switch type {
case .taxi: fallthrough
case .uber: return title
case .uber: fallthrough
case .freenow: fallthrough
case .citymobil: return title
case .yandex: return L("yandex_taxi_title")
case .maxim: return L("maxim_taxi_title")
case .vezet: return L("vezet_taxi")
case .freenow: return title
case .yango: return L("yango_taxi_title")
}
}
@ -33,7 +35,7 @@ final class RoutePreviewTaxiCell: UICollectionViewCell {
let priceString = { () -> String in
switch type {
case .taxi, .uber, .freenow: return price
case .yandex, .maxim, .vezet, .yango:
case .yandex, .maxim, .vezet, .yango, .citymobil:
let formatter = NumberFormatter()
formatter.numberStyle = .currency
formatter.currencyCode = currency

1
iphone/Maps/Common/Statistics/StatisticsStrings.h
View file

@ -589,6 +589,7 @@ static NSString *const kStatWifi = @"wifi";
static NSString *const kStatWikipedia = @"wikipedia";
static NSString *const kStatYandex = @"Yandex";
static NSString *const kStatYango = @"Yango";
static NSString *const kStatCitymobil = @"Citymobil";
static NSString *const kStatYes = @"Yes";
static NSString *const kStatZoom = @"Zoom";
static NSString *const kStatId = @"id";

1
iphone/Maps/Core/Routing/MWMRouter.mm
View file

@ -126,6 +126,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
case MWMRoutePreviewTaxiCellTypeVezet: provider = kStatVezet; break;
case MWMRoutePreviewTaxiCellTypeFreenow: provider = kStatFreenow; break;
case MWMRoutePreviewTaxiCellTypeYango: provider = kStatYango; break;
case MWMRoutePreviewTaxiCellTypeCitymobil: provider = kStatCitymobil; break;
}
[Statistics logEvent:eventName

12
iphone/Maps/Images.xcassets/ic_taxi_logo_citymobil.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "ic_taxi_logo_citymobil.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

149
iphone/Maps/Images.xcassets/ic_taxi_logo_citymobil.imageset/ic_taxi_logo_citymobil.pdf vendored Normal file
View file

@ -0,0 +1,149 @@
%PDF-1.7
1 0 obj
<< >>
endobj
2 0 obj
<< /Length 3 0 R >>
stream
/DeviceRGB CS
/DeviceRGB cs
q
1.000000 0.000000 -0.000000 1.000000 0.923828 11.840393 cm
1.000000 0.447059 0.000000 scn
0.544954 0.038538 m
0.247706 0.038538 0.000000 0.280739 0.000000 0.583492 c
0.000000 1.321106 0.000000 2.614684 0.000000 3.209179 c
0.000000 3.412849 0.088073 3.605510 0.236697 3.743125 c
0.638532 4.106428 1.458716 4.838537 1.899083 5.234868 c
2.069725 5.388996 2.328440 5.388996 2.499083 5.234868 c
2.939450 4.838537 3.759633 4.106428 4.161468 3.743125 c
4.315597 3.605510 4.398165 3.412849 4.398165 3.209179 c
4.398165 2.609179 4.398165 1.321106 4.398165 0.583492 c
4.398165 0.286244 4.155963 0.038538 3.853211 0.038538 c
3.016514 0.038538 1.392660 0.038538 0.544954 0.038538 c
h
f*
n
Q
q
1.000000 0.000000 -0.000000 1.000000 9.730469 11.840393 cm
1.000000 0.447059 0.000000 scn
0.544952 0.038538 m
0.247705 0.038538 0.000000 0.280739 0.000000 0.583492 c
0.000000 1.321106 0.000000 2.614684 0.000000 3.209179 c
0.000000 3.412849 0.088073 3.605510 0.236697 3.743125 c
0.638530 4.106428 1.458711 4.838537 1.899076 5.234868 c
2.069718 5.388996 2.328433 5.388996 2.499074 5.234868 c
2.939440 4.838537 3.759620 4.106428 4.161454 3.743125 c
4.315582 3.605510 4.398151 3.412849 4.398151 3.209179 c
4.398151 2.609179 4.398151 1.321106 4.398151 0.583492 c
4.398151 0.286244 4.155950 0.038538 3.853199 0.038538 c
3.016504 0.038538 1.392656 0.038538 0.544952 0.038538 c
h
f*
n
Q
q
1.000000 0.000000 -0.000000 1.000000 18.539062 11.840393 cm
1.000000 0.447059 0.000000 scn
0.544955 0.038538 m
0.247708 0.038538 0.000000 0.280739 0.000000 0.583492 c
0.000000 1.321106 0.000000 2.614684 0.000000 3.209179 c
0.000000 3.412849 0.088074 3.605510 0.236698 3.743125 c
0.638533 4.106428 1.458716 4.838537 1.899083 5.234868 c
2.069725 5.388996 2.328442 5.388996 2.499084 5.234868 c
2.939451 4.838537 3.759634 4.106428 4.161469 3.743125 c
4.315597 3.605510 4.398167 3.412849 4.398167 3.209179 c
4.398167 2.609179 4.398167 1.321106 4.398167 0.583492 c
4.398167 0.286244 4.155963 0.038538 3.853211 0.038538 c
3.016514 0.038538 1.392662 0.038538 0.544955 0.038538 c
h
f*
n
Q
q
1.000000 0.000000 -0.000000 1.000000 14.134766 6.528381 cm
1.000000 0.447059 0.000000 scn
0.544955 0.038529 m
0.247708 0.038529 0.000000 0.280733 0.000000 0.583486 c
0.000000 1.321101 0.000000 2.614680 0.000000 3.209177 c
0.000000 3.412847 0.088074 3.605508 0.236698 3.743123 c
0.638533 4.106426 1.458716 4.838537 1.899083 5.234868 c
2.069725 5.388996 2.328442 5.388996 2.499084 5.234868 c
2.939451 4.838537 3.759634 4.106426 4.161469 3.743123 c
4.315597 3.605508 4.398167 3.412847 4.398167 3.209177 c
4.398167 2.609176 4.398167 1.321101 4.398167 0.583486 c
4.398167 0.286238 4.155963 0.038529 3.853211 0.038529 c
3.016514 0.038529 1.392662 0.038529 0.544955 0.038529 c
h
f*
n
Q
q
1.000000 0.000000 -0.000000 1.000000 5.328125 6.528381 cm
1.000000 0.447059 0.000000 scn
0.544954 0.038529 m
0.247706 0.038529 0.000000 0.280733 0.000000 0.583486 c
0.000000 1.321101 0.000000 2.614680 0.000000 3.209177 c
0.000000 3.412847 0.088073 3.605508 0.236697 3.743123 c
0.638532 4.106426 1.458716 4.838537 1.899083 5.234868 c
2.069725 5.388996 2.328440 5.388996 2.499083 5.234868 c
2.939450 4.838537 3.759633 4.106426 4.161468 3.743123 c
4.315596 3.605508 4.398165 3.412847 4.398165 3.209177 c
4.398165 2.609176 4.398165 1.321101 4.398165 0.583486 c
4.398165 0.286238 4.155964 0.038529 3.853211 0.038529 c
3.016514 0.038529 1.392660 0.038529 0.544954 0.038529 c
h
f*
n
Q
endstream
endobj
3 0 obj
3433
endobj
4 0 obj
<< /Annots []
/Type /Page
/MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
/Resources 1 0 R
/Contents 2 0 R
/Parent 5 0 R
>>
endobj
5 0 obj
<< /Kids [ 4 0 R ]
/Count 1
/Type /Pages
>>
endobj
6 0 obj
<< /Type /Catalog
/Pages 5 0 R
>>
endobj
xref
0 7
0000000000 65535 f
0000000010 00000 n
0000000034 00000 n
0000003523 00000 n
0000003546 00000 n
0000003719 00000 n
0000003793 00000 n
trailer
<< /ID [ (some) (id) ]
/Root 6 0 R
/Size 7
>>
startxref
3852
%%EOF

1
iphone/Maps/MAPSME.plist
View file

@ -116,6 +116,7 @@
<string>maximzakaz</string>
<string>vzt</string>
<string>mytaxi</string>
<string>citymobil-taxi</string>
<string>wunderlinq</string>
</array>
<key>LSRequiresIPhoneOS</key>

3
iphone/Maps/UI/PlacePage/Components/TaxiViewController.swift
View file

@ -33,6 +33,9 @@ class TaxiViewController: UIViewController {
case .yango:
taxiImageView.image = UIImage(named: "ic_taxi_logo_yango")
taxiNameLabel.text = L("yango_taxi_title")
case .citymobil:
taxiImageView.image = UIImage(named: "ic_taxi_logo_citymobil")
taxiNameLabel.text = L("citymobil_taxi_title")
@unknown default:
fatalError()
}

1
iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
View file

@ -138,6 +138,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type)
case PlacePageTaxiProviderRutaxi: providerString = kStatVezet; break;
case PlacePageTaxiProviderFreenow: providerString = kStatFreenow; break;
case PlacePageTaxiProviderYango: providerString = kStatYango; break;
case PlacePageTaxiProviderCitymobil: providerString = kStatCitymobil; break;
}
[Statistics logEvent:kStatPlacePageTaxiClick

12
xcode/partners_api/partners_api.xcodeproj/project.pbxproj
View file

@ -42,6 +42,9 @@
3D8DAE7525026B550000513A /* yango_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D8DAE7325026B540000513A /* yango_api.hpp */; };
3D8DAE7625026B550000513A /* yango_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D8DAE7425026B550000513A /* yango_api.cpp */; };
3DA5713420B57358007BDE27 /* booking_params_base.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DA5713320B57358007BDE27 /* booking_params_base.hpp */; };
3DA6BCDF2535B52E00DF0DA5 /* citymobil_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DA6BCDD2535B52E00DF0DA5 /* citymobil_api.hpp */; };
3DA6BCE02535B52E00DF0DA5 /* citymobil_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DA6BCDE2535B52E00DF0DA5 /* citymobil_api.cpp */; };
3DA6BCE22535B53C00DF0DA5 /* citymobil_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DA6BCE12535B53C00DF0DA5 /* citymobil_tests.cpp */; };
3DBD7B9824112DE100ED9FE8 /* freenow_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7B9624112DE000ED9FE8 /* freenow_api.cpp */; };
3DBD7B9924112DE100ED9FE8 /* freenow_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7B9724112DE100ED9FE8 /* freenow_api.hpp */; };
3DBD7B9B24112DEA00ED9FE8 /* freenow_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7B9A24112DEA00ED9FE8 /* freenow_tests.cpp */; };
@ -165,6 +168,9 @@
3D8DAE7325026B540000513A /* yango_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = yango_api.hpp; sourceTree = "<group>"; };
3D8DAE7425026B550000513A /* yango_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = yango_api.cpp; sourceTree = "<group>"; };
3DA5713320B57358007BDE27 /* booking_params_base.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = booking_params_base.hpp; sourceTree = "<group>"; };
3DA6BCDD2535B52E00DF0DA5 /* citymobil_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = citymobil_api.hpp; sourceTree = "<group>"; };
3DA6BCDE2535B52E00DF0DA5 /* citymobil_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = citymobil_api.cpp; sourceTree = "<group>"; };
3DA6BCE12535B53C00DF0DA5 /* citymobil_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = citymobil_tests.cpp; sourceTree = "<group>"; };
3DBC1C501E4B14810016897F /* facebook_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = facebook_tests.cpp; sourceTree = "<group>"; };
3DBD7B9624112DE000ED9FE8 /* freenow_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = freenow_api.cpp; sourceTree = "<group>"; };
3DBD7B9724112DE100ED9FE8 /* freenow_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = freenow_api.hpp; sourceTree = "<group>"; };
@ -348,6 +354,8 @@
F6B5363B1DA520B20067EEA5 /* partners_api */ = {
isa = PBXGroup;
children = (
3DA6BCDE2535B52E00DF0DA5 /* citymobil_api.cpp */,
3DA6BCDD2535B52E00DF0DA5 /* citymobil_api.hpp */,
3D8DAE7425026B550000513A /* yango_api.cpp */,
3D8DAE7325026B540000513A /* yango_api.hpp */,
3DCAC69324D1CFE800518E8B /* booking_ordering_params.cpp */,
@ -405,6 +413,7 @@
F6B536441DA521060067EEA5 /* partners_api_tests */ = {
isa = PBXGroup;
children = (
3DA6BCE12535B53C00DF0DA5 /* citymobil_tests.cpp */,
3DCF64AA24DC0A2300C49963 /* mastercard_sberbank_tests.cpp */,
3D035CA4245195EF00C21B57 /* guides_on_map_tests.cpp */,
3DBD7C1C24251C1100ED9FE8 /* bookmark_catalog_ads_tests.cpp */,
@ -495,6 +504,7 @@
3DBD7B9924112DE100ED9FE8 /* freenow_api.hpp in Headers */,
3D8DAE7525026B550000513A /* yango_api.hpp in Headers */,
3D15ACE6214AA1B000F725D5 /* taxi_delegate.hpp in Headers */,
3DA6BCDF2535B52E00DF0DA5 /* citymobil_api.hpp in Headers */,
3DFEBF9A1EFBFC1500317D5C /* taxi_base.hpp in Headers */,
3DFEBF9F1EFBFC1500317D5C /* yandex_api.hpp in Headers */,
3DFEBF9D1EFBFC1500317D5C /* taxi_provider.hpp in Headers */,
@ -611,8 +621,10 @@
files = (
3D18DC4222956DFA00A583A6 /* promo_api.cpp in Sources */,
349CFD0B2045720000569949 /* maxim_api.cpp in Sources */,
3DA6BCE22535B53C00DF0DA5 /* citymobil_tests.cpp in Sources */,
3DBD7C1424251BF000ED9FE8 /* facebook_ads.cpp in Sources */,
3DFEBFA41EFBFC2300317D5C /* yandex_tests.cpp in Sources */,
3DA6BCE02535B52E00DF0DA5 /* citymobil_api.cpp in Sources */,
3D1775A72318198700F8889C /* promo_catalog_types.cpp in Sources */,
3D452AEF1EE6D202009EAB9B /* google_tests.cpp in Sources */,
3D035CA3245195E600C21B57 /* guides_on_map_api.cpp in Sources */,