From 72827d5bbbaecf13505e5e07e7297068c5278c0b Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Thu, 19 Mar 2020 18:01:27 +0300 Subject: [PATCH] [ios] download on map banners are added --- .../CoreApi/PlacePageData/Ad/CoreBanner.h | 7 +- .../CoreApi/PlacePageData/Ad/CoreBanner.mm | 10 + iphone/Maps/Bridging-Header.h | 1 + iphone/Maps/Classes/MapViewController.mm | 2 +- iphone/Maps/Classes/MapsAppDelegate.mm | 2 +- .../Classes/Widgets/MWMMapDownloadDialog.mm | 66 +- .../Widgets/MWMMegafonBannerViewController.h | 9 - .../Widgets/MWMMegafonBannerViewController.m | 5 - .../Widgets/PartnerBannerViewController.swift | 71 + ...er.xib => PartnerBannerViewController.xib} | 27 +- .../Common/Statistics/StatisticsStrings.h | 7 +- iphone/Maps/Core/Ads/BannerType.swift | 2 +- iphone/Maps/Core/Ads/MWMBannerHelpers.h | 7 +- iphone/Maps/Core/Search/MWMSearch.mm | 2 +- .../ic_24px_megafon.pdf | Bin 4500 -> 0 bytes .../Contents.json | 2 +- .../ic_logo_mts.imageset/ic_logo_mts.pdf | 84 + .../ic_logo_skyeng.imageset/Contents.json | 12 + .../ic_logo_skyeng.pdf | 93 + .../ic_logo_tinkoff.imageset/Contents.json | 12 + .../ic_logo_tinkoff.pdf | 1638 +++++++++++++++++ iphone/Maps/Maps.xcodeproj/project.pbxproj | 18 +- .../Maps/UI/Editor/MWMEditorViewController.mm | 6 +- .../MWMObjectsCategorySelectorController.mm | 2 +- xcode/map/map.xcodeproj/project.pbxproj | 8 + .../partners_api.xcodeproj/project.pbxproj | 192 +- 26 files changed, 2156 insertions(+), 129 deletions(-) delete mode 100644 iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.h delete mode 100644 iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.m create mode 100644 iphone/Maps/Classes/Widgets/PartnerBannerViewController.swift rename iphone/Maps/Classes/Widgets/{MWMMegafonBannerViewController.xib => PartnerBannerViewController.xib} (85%) delete mode 100644 iphone/Maps/Images.xcassets/ic_brand_megafon_green.imageset/ic_24px_megafon.pdf rename iphone/Maps/Images.xcassets/{ic_brand_megafon_green.imageset => ic_logo_mts.imageset}/Contents.json (75%) create mode 100644 iphone/Maps/Images.xcassets/ic_logo_mts.imageset/ic_logo_mts.pdf create mode 100644 iphone/Maps/Images.xcassets/ic_logo_skyeng.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/ic_logo_skyeng.imageset/ic_logo_skyeng.pdf create mode 100644 iphone/Maps/Images.xcassets/ic_logo_tinkoff.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/ic_logo_tinkoff.imageset/ic_logo_tinkoff.pdf diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.h b/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.h index 40814e02a2..215002272a 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.h +++ b/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.h @@ -4,7 +4,12 @@ typedef NS_ENUM(NSInteger, MWMBannerType) { MWMBannerTypeNone, MWMBannerTypeFacebook, MWMBannerTypeRb, - MWMBannerTypeMopub + MWMBannerTypeMopub, + MWMBannerTypeTinkoffAllAirlines, + MWMBannerTypeTinkoffInsurance, + MWMBannerTypeMts, + MWMBannerTypeSkyeng, + MWMBannerTypeBookmarkCatalog, }; NS_ASSUME_NONNULL_BEGIN diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.mm b/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.mm index 3ad3c6ce34..348667f5e1 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.mm +++ b/iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.mm @@ -10,6 +10,16 @@ static MWMBannerType ConvertBannerType(ads::Banner::Type coreType) { return MWMBannerTypeRb; case ads::Banner::Type::Mopub: return MWMBannerTypeMopub; + case ads::Banner::Type::TinkoffAllAirlines: + return MWMBannerTypeTinkoffAllAirlines; + case ads::Banner::Type::TinkoffInsurance: + return MWMBannerTypeTinkoffInsurance; + case ads::Banner::Type::Mts: + return MWMBannerTypeMts; + case ads::Banner::Type::Skyeng: + return MWMBannerTypeSkyeng; + case ads::Banner::Type::BookmarkCatalog: + return MWMBannerTypeBookmarkCatalog; } } diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h index ff02ae72ba..8ed3bd6f6a 100644 --- a/iphone/Maps/Bridging-Header.h +++ b/iphone/Maps/Bridging-Header.h @@ -87,3 +87,4 @@ #import "DeepLinkRouteStrategyAdapter.h" #import "MWMMapViewControlsManager.h" #import "SwizzleStyle.h" +#import "MWMDownloadBannerViewController.h" diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index edf71d79e0..acc7e78b8f 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -469,7 +469,7 @@ NSString * const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; withParameters:@{ kStatIsAuthenticated: @(AuthorizationHaveCredentials()), kStatIsOnline: Platform::IsConnected() ? kStatYes : kStatNo, - kStatEditorMWMName: @(featureID.GetMwmName().c_str()), + kStatMWMName: @(featureID.GetMwmName().c_str()), kStatEditorMWMVersion: @(featureID.GetMwmVersion()) }]; [self performSegueWithIdentifier:kEditorSegue sender:self.controlsManager.featureHolder]; diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 74a597b640..877cd15751 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -35,9 +35,9 @@ #include "map/framework_light.hpp" #include "map/gps_tracker.hpp" +#include "partners_api/ads/mopub_ads.hpp" #include "platform/http_thread_apple.h" #include "platform/local_country_file_utils.hpp" -#include "partners_api/mopub_ads.hpp" #include "base/assert.hpp" diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm index dc62efd70a..d68b063fa5 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm +++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm @@ -1,9 +1,9 @@ #import "MWMMapDownloadDialog.h" #import #import "CLLocation+Mercator.h" +#import "MWMBannerHelpers.h" #import "MWMBookmarksBannerViewController.h" #import "MWMCircularProgress.h" -#import "MWMMegafonBannerViewController.h" #import "MWMStorage+UI.h" #import "MapViewController.h" #import "Statistics.h" @@ -11,7 +11,8 @@ #include -#include "partners_api/downloader_promo.hpp" +#include "partners_api/ads/ads_engine.hpp" +#include "partners_api/ads/banner.hpp" #include "storage/country_info_getter.hpp" @@ -39,16 +40,17 @@ BOOL canAutoDownload(storage::CountryId const &countryId) { return YES; } -promo::DownloaderPromo::Banner getPromoBanner(std::string const &mwmId) { - auto const &purchase = GetFramework().GetPurchase(); - bool const hasRemoveAdsSubscription = purchase && purchase->IsSubscriptionActive(SubscriptionType::RemoveAds); - auto const policy = platform::GetCurrentNetworkPolicy(); - if (!policy.CanUse()) +ads::Banner getPromoBanner(std::string const &mwmId) { + std::vector banners; + auto const pos = GetFramework().GetCurrentPosition(); + if (pos) { + banners = GetFramework().GetAdsEngine().GetDownloadOnMapBanners(mwmId, *pos, languages::GetCurrentNorm()); + } + + if (banners.empty()) return {}; - auto const *promoApi = GetFramework().GetPromoApi(policy); - CHECK(promoApi != nullptr, ()); - return promo::DownloaderPromo::GetBanner(GetFramework().GetStorage(), *promoApi, mwmId, languages::GetCurrentNorm(), - hasRemoveAdsSubscription); + + return banners[0]; } } // namespace @@ -77,7 +79,7 @@ using namespace storage; @implementation MWMMapDownloadDialog { CountryId m_countryId; CountryId m_autoDownloadCountryId; - promo::DownloaderPromo::Banner m_promoBanner; + ads::Banner m_promoBanner; } + (instancetype)dialogForController:(MapViewController *)controller { @@ -278,13 +280,41 @@ using namespace storage; m_promoBanner = getPromoBanner(m_countryId); [self layoutIfNeeded]; if (self.bannerView.hidden) { + NSString *statProvider; switch (m_promoBanner.m_type) { - case promo::DownloaderPromo::Type::Megafon: - case promo::DownloaderPromo::Type::BookmarkCatalog: { + case ads::Banner::Type::TinkoffAllAirlines: + statProvider = kStatTinkoffAirlines; + case ads::Banner::Type::TinkoffInsurance: + statProvider = kStatTinkoffInsurance; + case ads::Banner::Type::Mts: + statProvider = kStatMts; + case ads::Banner::Type::Skyeng: { + statProvider = kStatSkyeng; + __weak __typeof(self) ws = self; + PartnerBannerViewController *controller = [[PartnerBannerViewController alloc] initWithTapHandler:^{ + [ws bannerAction]; + [Statistics logEvent:kStatDownloaderBannerClick + withParameters:@{ + kStatFrom: kStatMap, + kStatProvider: statProvider, + kStatMWMName: @(self->m_countryId.c_str()) + }]; + }]; + [Statistics logEvent:kStatDownloaderBannerShow + withParameters:@{ + kStatFrom: kStatMap, + kStatProvider: statProvider, + kStatMWMName: @(self->m_countryId.c_str()) + }]; + [controller configWithType:banner_helpers::MatchBannerType(m_promoBanner.m_type)]; + self.bannerViewController = controller; + break; + } + case ads::Banner::Type::BookmarkCatalog: { __weak __typeof(self) ws = self; self.bannerViewController = [[MWMBookmarksBannerViewController alloc] initWithTapHandler:^{ __strong __typeof(self) self = ws; - NSString *urlString = @(self->m_promoBanner.m_url.c_str()); + NSString *urlString = @(self->m_promoBanner.m_value.c_str()); if (urlString.length == 0) { return; } @@ -303,7 +333,7 @@ using namespace storage; }]; break; } - case promo::DownloaderPromo::Type::NoPromo: + default: self.bannerViewController = nil; break; } @@ -401,10 +431,10 @@ using namespace storage; #pragma mark - Actions - (IBAction)bannerAction { - if (m_promoBanner.m_url.empty()) + if (m_promoBanner.m_value.empty()) return; - NSURL *bannerURL = [NSURL URLWithString:@(m_promoBanner.m_url.c_str())]; + NSURL *bannerURL = [NSURL URLWithString:@(m_promoBanner.m_value.c_str())]; SFSafariViewController *safari = [[SFSafariViewController alloc] initWithURL:bannerURL]; [self.controller presentViewController:safari animated:YES completion:nil]; } diff --git a/iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.h b/iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.h deleted file mode 100644 index 5afa1d6244..0000000000 --- a/iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.h +++ /dev/null @@ -1,9 +0,0 @@ -#import "MWMDownloadBannerViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface MWMMegafonBannerViewController : MWMDownloadBannerViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.m b/iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.m deleted file mode 100644 index 045cfd4b38..0000000000 --- a/iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.m +++ /dev/null @@ -1,5 +0,0 @@ -#import "MWMMegafonBannerViewController.h" - -@implementation MWMMegafonBannerViewController - -@end diff --git a/iphone/Maps/Classes/Widgets/PartnerBannerViewController.swift b/iphone/Maps/Classes/Widgets/PartnerBannerViewController.swift new file mode 100644 index 0000000000..65d0caf6e2 --- /dev/null +++ b/iphone/Maps/Classes/Widgets/PartnerBannerViewController.swift @@ -0,0 +1,71 @@ +@objc +final class PartnerBannerViewController: MWMDownloadBannerViewController { + + @IBOutlet weak var icon: UIImageView! + @IBOutlet weak var message: UILabel! + @IBOutlet weak var button: UIButton! + + var bannerType: MWMBannerType = .none + + @objc func config(type: MWMBannerType) { + bannerType = type + } + + override func viewDidLoad() { + let iconImage = { () -> UIImage in + switch self.bannerType { + case .tinkoffAllAirlines: return #imageLiteral(resourceName: "ic_logo_tinkoff") + case .tinkoffInsurance: return #imageLiteral(resourceName: "ic_logo_tinkoff") + case .mts: return #imageLiteral(resourceName: "ic_logo_mts") + case .skyeng: return #imageLiteral(resourceName: "ic_logo_skyeng") + default: fatalError() + } + } + + let messageString = { () -> String in + switch self.bannerType { + case .tinkoffAllAirlines: return L("tinkoff_allairlines_map_downloader_title") + case .tinkoffInsurance: return L("tinkoff_insurance_map_downloader_title") + case .mts: return L("mts_map_downloader_title") + case .skyeng: return L("skyeng_map_downloader_title") + default: fatalError() + } + } + + let buttonString = { () -> String in + switch self.bannerType { + case .tinkoffAllAirlines: return L("tinkoff_allairlines_map_downloader_cta_button") + case .tinkoffInsurance: return L("tinkoff_insurance_map_downloader_cta_button") + case .mts: return L("mts_map_downloader_cta_button") + case .skyeng: return L("skyeng_map_downloader_cta_button") + default: fatalError() + } + } + + let buttonBackgroundColor = { () -> UIColor in + switch self.bannerType { + case .tinkoffAllAirlines: return UIColor.init(fromHexString: "FFDD2D") + case .tinkoffInsurance: return UIColor.init(fromHexString: "FFDD2D") + case .mts: return UIColor.init(fromHexString: "E30611") + case .skyeng: return UIColor.init(fromHexString: "4287DF") + default: fatalError() + } + } + + let buttonTextColor = { () -> UIColor in + switch self.bannerType { + case .tinkoffAllAirlines: return .black + case .tinkoffInsurance: return .black + case .mts: return .white + case .skyeng: return .white + default: fatalError() + } + } + + icon.image = iconImage() + message.text = messageString() + button.localizedText = buttonString() + button.backgroundColor = buttonBackgroundColor() + button.titleLabel?.textColor = buttonTextColor() +} +} diff --git a/iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.xib b/iphone/Maps/Classes/Widgets/PartnerBannerViewController.xib similarity index 85% rename from iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.xib rename to iphone/Maps/Classes/Widgets/PartnerBannerViewController.xib index 62fceeb5bf..0122c8aeca 100644 --- a/iphone/Maps/Classes/Widgets/MWMMegafonBannerViewController.xib +++ b/iphone/Maps/Classes/Widgets/PartnerBannerViewController.xib @@ -1,15 +1,18 @@ - + - + - + + + + @@ -18,20 +21,19 @@ - - + + - @@ -71,6 +72,7 @@ + @@ -81,7 +83,4 @@ - - - diff --git a/iphone/Maps/Common/Statistics/StatisticsStrings.h b/iphone/Maps/Common/Statistics/StatisticsStrings.h index 60f84a700b..8af87947e8 100644 --- a/iphone/Maps/Common/Statistics/StatisticsStrings.h +++ b/iphone/Maps/Common/Statistics/StatisticsStrings.h @@ -175,7 +175,7 @@ static NSString * const kStatEditorEditCancel = @"Editor_Edit_cancel"; static NSString * const kStatEditorEditError = @"Editor_Edit_error"; static NSString * const kStatEditorEditStart = @"Editor_Edit_start"; static NSString * const kStatEditorEditSuccess = @"Editor_Edit_success"; -static NSString * const kStatEditorMWMName = @"mwm_name"; +static NSString * const kStatMWMName = @"mwm_name"; static NSString * const kStatEditorMWMVersion = @"mwm_version"; static NSString * const kStatEditorProblemReport = @"Editor_Problem_report"; static NSString * const kStatEditorRegRequest = @"Editor_Reg_request"; @@ -267,7 +267,10 @@ static NSString * const kStatMapsmeInAppSuggestionClicked = @"MapsMe_InAppSugges static NSString * const kStatMapsmeInAppSuggestionClosed = @"MapsMe_InAppSuggestion_closed"; static NSString * const kStatMapsmeInAppSuggestionShown = @"MapsMe_InAppSuggestion_shown"; static NSString * const kStatMaxim = @"Maxim"; -static NSString * const kStatMegafon = @"Megafon"; +static NSString * const kStatTinkoffAirlines = @"Tinkoff_AllAirlines"; +static NSString * const kStatTinkoffInsurance = @"Tinkoff_Insurance"; +static NSString * const kStatMts = @"MTS"; +static NSString * const kStatSkyeng= @"Skyeng"; static NSString * const kStatMenu = @"menu"; static NSString * const kStatMethod = @"method"; static NSString * const kStatMiles = @"Miles"; diff --git a/iphone/Maps/Core/Ads/BannerType.swift b/iphone/Maps/Core/Ads/BannerType.swift index ec5e749025..16c5a964e2 100644 --- a/iphone/Maps/Core/Ads/BannerType.swift +++ b/iphone/Maps/Core/Ads/BannerType.swift @@ -24,10 +24,10 @@ enum BannerType { init(type: MWMBannerType, id: String, query: String = "") { switch type { - case .none: self = .none case .facebook: self = .facebook(id) case .rb: self = .rb(id) case .mopub: self = .mopub(id) + default: self = .none } } } diff --git a/iphone/Maps/Core/Ads/MWMBannerHelpers.h b/iphone/Maps/Core/Ads/MWMBannerHelpers.h index 222e9665f5..060a200f77 100644 --- a/iphone/Maps/Core/Ads/MWMBannerHelpers.h +++ b/iphone/Maps/Core/Ads/MWMBannerHelpers.h @@ -1,6 +1,6 @@ #import -#include "partners_api/banner.hpp" +#include "partners_api/ads/banner.hpp" #include @@ -14,6 +14,11 @@ static inline MWMBannerType MatchBannerType(ads::Banner::Type coreType) case ads::Banner::Type::Facebook: return MWMBannerTypeFacebook; case ads::Banner::Type::RB: return MWMBannerTypeRb; case ads::Banner::Type::Mopub: return MWMBannerTypeMopub; + case ads::Banner::Type::TinkoffAllAirlines: return MWMBannerTypeTinkoffAllAirlines; + case ads::Banner::Type::TinkoffInsurance: return MWMBannerTypeTinkoffInsurance; + case ads::Banner::Type::Mts: return MWMBannerTypeMts; + case ads::Banner::Type::Skyeng: return MWMBannerTypeSkyeng; + case ads::Banner::Type::BookmarkCatalog: return MWMBannerTypeBookmarkCatalog; } } diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm index 31579d4783..50d99c24ac 100644 --- a/iphone/Maps/Core/Search/MWMSearch.mm +++ b/iphone/Maps/Core/Search/MWMSearch.mm @@ -6,7 +6,7 @@ #include -#include "partners_api/ads_engine.hpp" +#include "partners_api/ads/ads_engine.hpp" #include "platform/network_policy.hpp" namespace diff --git a/iphone/Maps/Images.xcassets/ic_brand_megafon_green.imageset/ic_24px_megafon.pdf b/iphone/Maps/Images.xcassets/ic_brand_megafon_green.imageset/ic_24px_megafon.pdf deleted file mode 100644 index f3fa9f937320dcc31cab88814437433ba116a6a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4500 zcmai22UHW=7NsdwK&6X1B7`Q8Mu|x8O`0H~ClGoQLJ>rI6AyAM= z)A*2LlKUMvA#_TU^MVJak%FBm7^!XA^&|#1W4%$PfdiS%x3HJ2G^lB*>0~Tssn^z5 zD?3V~EHgbZX?X^pAJ>{Cm{?``u~R((S7Xbv5@@6W%FXKC$*oO`>FZs-ndj!K5y9y!yRY+#k+Fmah&ZKd!V zh;m)SkV*2TMLlDQwSd{3m2>_TiN=r=IpSSeN>%2nZnhfUytp9c zr4I3`dg_pD%&=K!dq0$$EN88KYB zyJvgUy&sj@6qryn4lWP4NrEJ0AJDVjQo+rrZ7Az+&{Z*A_iX3l?M3oUH&{xu9I6Iq zESP2Ok)V|iu)T?#^^s9tj|KZ~R1OM}^{`C|EVrY-To@RBd0FWBpj1xLE`3!M=TQl5 zPbv>^jgyp@E~GGYEpne>j0Hw&Sa)h$)@`-D$C7$F2YuCQ^kcV({0y53V>8l>o#c^A z+Q|ehmK;9TxTp&gq0Zu;J0cmslFig+yo5e%?uiZ=YQs-Oux%)}Qbs1Uc*s5?W1WvN z8(yJSDx`gbq7`ggj|X?Zs4gU9m_i%^ruIcW8A2wUXFi3u2pjYv+3d`H7y z2GL;fgrPXUH zj{~clhwZErOcpzBw@foDpvt^!(ywWQ@$uiMmo!CiZa|uBT%*bz5~nepH*ULO01+LO?T=q~j0+Zk{iz^5jEAeI zyA{R*5c?BQaCN~F=RJU9)#)9p=_lXu{4W*ixVu{EW3Ye;kyKF`FatysT%BCq_1#cb z7~oi@3LX$Z{3pS091_2A{8TdHN0i8QVnQNv$7*&VN*NGQ#CX|TVf0kw|G&sHQ@n5J zkFi7$@Z$KsGh6`ACWkLIFd(VQOraa47N|oO9t!eOJfX~Vn%~g+#%ofQ2rernCfbl- z^a%AjqfT3suAOWFPqH_>T(Tp`B4TR?yF@0TX zGCgy)t96@BSa_g&bpmqI+D~&oJk9S7_@m%5x z+$TwBl!nEw-377Ek|pU^zF~(RQM}zu=7)wupe#Amxlg&KTg#ocp3Di>cc!I+W^y=? zz3i{xSuyoG6F8o!ycmic(=?t>wt06bG58y5IFi|IzQMtrhngf{rgV$$c~Fj16jX_c z{cF@Z83|QVE8>+qee^EEE{nvcz;@;yMU)!4;PgnE{p^65RU=6fP$dZf6LQXm@ zKNZ2VkZf@qXPmEWNH!p;ay}_LJM~n16(CtZK~gpGaN|O_lX*hxXF6Wm=;dW657KN$ zVZkrr``N*+ZyUoA+v#0j_YEZrSY?7Pt1-hcO0xw|3N#eEyXojt3D$?(j7QV25%xWu zEmt09zh+$v`(mK`C5bvT%C0`_T9DBLVQZSufZ?eCHZfjG_Pd#mOm?0YB>rItofh0EmJE;7Dk{!1o|5SosLS9YcGH%Yd>~0^ZkWC<@I7dN8YV$IdqmIffWbYAW9{@jjNa`PYI*n`) zb!wF4W#CwaBqx|;Ndi@ zG(%0+IWZeXSkP|pWAyN|0wdn1GG5eTr!!)OS`97ZEKMp>pOKHEmL)mq+h4PP=5)JT z!)6L~5iO&rW*CX74_sMFN|%mbxtMuvFix+TG`vOw-p}i zoho!0GAd51%QV);EBdSZi>M^RQa4hkJ4+Kw;vJKhQvGSN+I;B&QvX~GAwa(nZmSNzGl0xkk~lDU#?l1Y=}iZu;fhna>mi=B(LhrkXX z2b9B@!~U>vNi5+B!8?nPX#qc)Ifz)SsEhKg*>m{bvM9Bf$bsW%;9%!4;7EnHiL&Ed zaGkhW+&sL!%FdYf1%>gf@%#&OaB}+B?i)5dmC=Zt(z2B&LjBVD<0Vq1R)v*Dwt3ep zd(WCB2%Ct@Rhw4pd&_HUh!}}jloX6HAmG@1mweccDVw~Us{Xe!LPm(z&K zLgh_aT`rC<=@-Z|&Xa7DuzGpx-kS8Z38*3}Q!PO)wo^-gbZFv+WgVf4K<7AT2ZEP~ z*0<+Yd_*FjD!+S#Xt~yLC+~K~t{|;cv{7^>%Q%b0m6a>{LQ7XJBKeUgjGU_$EB0F6 zx8fYlto+-<9j2`+dkefAa$Dm8XkvoFY?!4R(!-JbL$ah`)fYaW?eelz}N zd3C}zdevd|iS$+JDCt<~vkhJiCH^8is6(*>GGM`NI>bUIf1uzMc8yw;&Ww4_gH8Af{3&Spc8!70T_0}> zA+(aBLTkNhT*p9%N^~rX28*|Hr^*|pVHGVUKc!S9jZ~v6$jTYz7~>eAK#Jw!Ic7g@ zFZZJDfpLw9>E+Kf(_e*QrYV)n@7-U_7IhKI9#}LXZwXvDck%or<5ASv=Av26vQ3Lx z?^%kG#QKQ+g!wkX`PenH9n3*IMQZ5t(0;|#R2pIfX4%@id) zNXp}f74;YO*oRi_R1M1Wpzc)&n!%)a@ggnoJg`FDTl?X!24{0+`{OnFJdif^Y4`uo z{H_|qoxu}=q^)##K4GhZ$$qQbeR^(l1~=obN{ZWji|S$ZG+bz;Rj8kUmfX7 z!`_vdeyF|fZPrvb^}S&!&KYo49sAa$+!c#CH|cV3Vo3LqZbgHoUFGUrn|!Uj?i60A z*M#2bjT5ue%D7Essl$gF4i^L23Q0r zuBfiX6I8-f9=A8gc@9esjffYDCy6!3CbT`9zSZt}`02ZX-`SD{9avuN4u!-e#MR8MBp+ zt9)y#L5S~VewcyC_P)C=-xjtO9mN`P^(I!ju4-l=v#g?QqAMu1+@dh7Jx@KBoP0`5Msp6>Q@}r9cAx?asTnDL*L$) zxPHX8NYB-kST)C$L0m{R7aLb%3H>=%Bo@&%acgTR3My)2V+BK_5Mme!Yq%%|B@PCo kL`A_i5STR0{}1`I2tBaG()h6> +endobj + +2 0 obj + << /Length 3 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 0.036560 0.033691 cm +0.929412 0.113725 0.141176 scn +23.929649 23.929688 m +0.000000 23.929688 l +0.000000 0.000038 l +23.929649 0.000038 l +23.929649 23.929688 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 7.214905 5.298584 cm +1.000000 1.000000 1.000000 scn +4.783679 13.402832 m +3.784734 13.402832 2.602884 12.440469 1.623637 10.828087 c +0.607123 9.155016 0.047278 7.244560 0.000000 5.287462 c +0.000000 2.656439 1.477313 0.000091 4.783679 0.000091 c +8.090045 0.000091 9.567358 2.656439 9.567358 5.287462 c +9.519758 7.241964 8.961978 9.150059 7.949348 10.822459 c +6.964474 12.434840 5.779809 13.397204 4.783679 13.397204 c +f +n +Q + +endstream +endobj + +3 0 obj + 694 +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 +0000000784 00000 n +0000000806 00000 n +0000000979 00000 n +0000001053 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +1112 +%%EOF \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/ic_logo_skyeng.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_logo_skyeng.imageset/Contents.json new file mode 100644 index 0000000000..d29348908a --- /dev/null +++ b/iphone/Maps/Images.xcassets/ic_logo_skyeng.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_logo_skyeng.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/ic_logo_skyeng.imageset/ic_logo_skyeng.pdf b/iphone/Maps/Images.xcassets/ic_logo_skyeng.imageset/ic_logo_skyeng.pdf new file mode 100644 index 0000000000..a4261dc7f4 --- /dev/null +++ b/iphone/Maps/Images.xcassets/ic_logo_skyeng.imageset/ic_logo_skyeng.pdf @@ -0,0 +1,93 @@ +%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.000000 0.000000 cm +0.258824 0.529412 0.874510 scn +24.000000 24.000000 m +0.000000 24.000000 l +0.000000 0.000000 l +24.000000 0.000000 l +24.000000 24.000000 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 7.228027 5.191162 cm +1.000000 1.000000 1.000000 scn +0.912758 3.419436 m +0.912758 3.419436 2.373204 1.439775 4.928944 1.439775 c +6.389349 1.439775 7.667220 2.159656 7.667220 3.509406 c +7.667220 6.298877 0.273823 5.848986 0.273823 9.988207 c +0.273823 12.327788 2.281916 13.497559 4.928944 13.497559 c +6.389349 13.497559 9.036379 13.047628 9.036379 11.157978 c +9.036379 10.078177 l +7.393397 10.078177 l +7.393397 10.708088 l +7.393397 11.697878 6.024239 12.057838 5.111480 12.057838 c +3.285963 12.057838 2.190629 11.427928 2.190629 10.168188 c +2.190629 7.288707 9.584025 7.918577 9.584025 3.599376 c +9.584025 1.439775 7.575932 0.000055 5.020192 0.000055 c +1.642981 0.000055 0.000000 2.249626 0.000000 2.249626 c +0.912758 3.419436 l +h +f +n +Q + +endstream +endobj + +3 0 obj + 1007 +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 +0000001097 00000 n +0000001120 00000 n +0000001293 00000 n +0000001367 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +1426 +%%EOF \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/ic_logo_tinkoff.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_logo_tinkoff.imageset/Contents.json new file mode 100644 index 0000000000..c1ca13a22f --- /dev/null +++ b/iphone/Maps/Images.xcassets/ic_logo_tinkoff.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_logo_tinkoff.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/ic_logo_tinkoff.imageset/ic_logo_tinkoff.pdf b/iphone/Maps/Images.xcassets/ic_logo_tinkoff.imageset/ic_logo_tinkoff.pdf new file mode 100644 index 0000000000..50632b9b15 --- /dev/null +++ b/iphone/Maps/Images.xcassets/ic_logo_tinkoff.imageset/ic_logo_tinkoff.pdf @@ -0,0 +1,1638 @@ +%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.000000 0.000000 cm +1.000000 1.000000 1.000000 scn +23.688215 11.411909 m +24.000002 12.409069 l +22.969465 12.376399 l +22.882107 12.376399 22.249292 12.394864 21.635656 12.839466 c +21.681820 12.835205 21.727276 12.828814 21.774151 12.828814 c +22.406254 12.828814 23.017761 13.208784 23.262789 13.753529 c +23.705971 14.737194 l +23.149862 14.729382 22.642046 14.800404 22.642046 14.800404 c +22.637785 14.801113 22.237219 14.852962 21.774151 15.325974 c +21.441765 15.664751 21.031254 15.844439 20.585941 15.844439 c +20.390629 15.844439 20.216623 15.808926 20.066767 15.761341 c +20.090204 15.840886 20.112217 15.921854 20.125000 16.004950 c +20.266336 16.925406 19.674719 17.627110 19.674719 17.626398 c +18.899153 18.585917 l +18.418327 17.458075 l +18.416906 17.454523 18.294748 17.190319 18.078129 17.061058 c +18.012789 17.392735 17.851564 17.765602 17.507814 18.121428 c +16.859377 18.792591 16.070314 18.892735 15.656962 18.892735 c +15.465912 18.892735 15.328835 18.872137 15.295455 18.866455 c +14.360086 18.682507 l +14.414064 18.891314 14.529122 19.255661 14.739350 19.583076 c +15.255682 20.387053 l +13.956678 20.239325 l +13.542614 21.117876 l +12.741480 20.704523 l +12.000711 21.436768 l +11.262075 20.704523 l +10.458809 21.117876 l +10.046166 20.239325 l +8.747871 20.387762 l +9.264916 19.583076 l +9.475143 19.255661 9.590199 18.892025 9.643467 18.683928 c +8.750712 18.860064 l +8.720171 18.865036 l +8.675426 18.872137 8.539773 18.892735 8.347301 18.892735 c +7.934660 18.892735 7.145597 18.792591 6.498580 18.121428 c +6.154120 17.765602 5.992899 17.392735 5.926848 17.061058 c +5.711649 17.188900 5.590909 17.448841 5.590909 17.448841 c +5.109375 18.583075 l +4.322445 17.617165 l +4.225854 17.492876 3.751422 16.833076 3.880683 16.002819 c +3.894177 15.919724 3.915485 15.839466 3.938922 15.759921 c +3.789775 15.807507 3.615768 15.843019 3.420455 15.843019 c +2.975142 15.843019 2.563921 15.663330 2.230824 15.324551 c +1.769177 14.852961 1.370739 14.799694 1.374290 14.799694 c +1.374290 14.799694 0.953127 14.723701 0.301138 14.735775 c +0.742188 13.752110 l +0.987927 13.207365 1.600142 12.827392 2.230824 12.827392 c +2.278409 12.827392 2.323864 12.833785 2.370739 12.838047 c +1.757813 12.392735 1.125002 12.374979 1.049007 12.374269 c +0.000000 12.407649 l +0.318183 11.410489 l +0.477984 10.896995 1.012785 10.046143 2.036223 9.954523 c +1.924717 9.487904 1.678267 8.964465 1.136364 8.739324 c +0.354405 8.417590 l +0.780541 7.674693 l +1.020598 7.274125 1.585938 6.806085 2.390625 6.806085 c +2.564631 6.806794 2.732244 6.824552 2.894176 6.858643 c +2.935369 6.676114 2.987217 6.492166 3.048297 6.310347 c +3.287643 5.597279 3.080967 5.100119 3.078836 5.095146 c +2.692472 4.286200 l +3.553978 4.058926 l +3.564632 4.056084 3.825285 3.984352 4.150569 3.984352 c +4.298296 3.984352 4.440341 3.999977 4.572444 4.031227 c +4.672586 4.054665 4.769177 4.085915 4.861507 4.123556 c +4.973013 3.923273 5.108667 3.740744 5.266337 3.577391 c +5.818184 3.010630 6.600854 2.723698 7.591621 2.723698 c +7.594462 2.723698 l +8.301848 2.732929 l +6.840199 2.124975 l +7.949576 1.588755 l +8.352985 1.392021 8.830967 1.159779 9.317472 0.982222 c +9.178980 0.602959 l +9.561791 0.428242 l +9.595882 0.412617 10.331678 0.083784 11.553980 0.013472 c +11.553980 0.013472 11.849433 -0.000023 12.011364 -0.000023 c +12.174006 -0.000023 12.465200 0.014183 12.465200 0.014183 c +13.679689 0.085915 14.409802 0.412621 14.443893 0.427534 c +14.827417 0.602247 l +14.687501 0.981512 l +15.188210 1.164749 15.683951 1.406229 16.070316 1.595148 c +17.159096 2.124266 l +15.702418 2.731512 l +16.412645 2.722279 l +17.404833 2.722279 18.187504 3.009209 18.738640 3.576681 c +18.896311 3.738613 19.031254 3.921143 19.143471 4.122137 c +19.236511 4.084496 19.333099 4.053244 19.433950 4.029806 c +19.566053 3.998556 19.707388 3.982931 19.855116 3.982931 c +20.175428 3.982931 20.438211 4.053953 20.445314 4.056084 c +21.310371 4.284777 l +20.933241 5.078102 l +20.924717 5.098700 20.718042 5.595147 20.957390 6.308926 c +21.018469 6.490744 21.069605 6.673984 21.111507 6.856512 c +21.274149 6.822421 21.443186 6.804664 21.618610 6.803954 c +22.643469 6.803954 23.134235 7.524835 23.229406 7.681085 c +23.651281 8.415460 l +22.869320 8.736484 l +22.325996 8.962337 22.079548 9.485062 21.969463 9.950971 c +22.980827 10.043301 23.522732 10.894863 23.688215 11.411909 c +h +9.710939 18.340887 m +9.700286 18.338757 l +9.708809 18.350121 l +9.710939 18.340887 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 10.418335 17.169922 cm +1.000000 1.000000 1.000000 scn +1.583097 1.215820 m +0.755683 1.215110 0.134233 0.943803 0.000000 0.624911 c +1.583097 -0.000089 l +3.166906 0.624911 l +3.033383 0.943803 2.412643 1.215110 1.583097 1.215820 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 10.061066 0.681885 cm +1.000000 1.000000 1.000000 scn +1.957386 1.160443 m +1.955967 1.160443 l +1.942472 1.160443 l +1.926847 1.160443 l +1.925427 1.160443 l +1.424007 1.156892 0.732956 1.259877 0.400569 1.357178 c +0.000000 0.274081 l +0.263494 0.180331 1.158381 -0.000070 1.942472 -0.000070 c +2.724432 -0.000070 3.619319 0.180331 3.882814 0.274081 c +3.482955 1.357178 l +3.149149 1.259877 2.458807 1.157602 1.957386 1.160443 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 13.698151 1.485840 cm +1.000000 1.000000 1.000000 scn +1.350143 1.434570 m +1.051847 1.266246 0.386364 1.012697 0.000000 0.894799 c +0.324574 -0.000090 l +0.923296 0.163262 1.417615 0.354314 1.825285 0.559570 c +1.151280 0.783293 l +1.350143 1.434570 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 8.481506 1.485840 cm +1.000000 1.000000 1.000000 scn +0.475142 1.434570 m +0.674716 0.783293 l +0.000000 0.559570 l +0.406960 0.355024 0.903409 0.163973 1.500000 -0.000090 c +1.825283 0.894799 l +1.438919 1.012697 0.772728 1.266246 0.475142 1.434570 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 10.111542 19.009766 cm +1.000000 1.000000 1.000000 scn +1.889916 0.411245 m +2.514206 0.411245 3.125711 0.262096 3.596592 0.000022 c +3.639206 0.144198 3.699574 0.318913 3.781250 0.502862 c +3.602986 0.481556 l +3.416196 0.462379 l +3.337358 0.632124 l +3.099433 1.134964 l +2.665485 0.909112 l +2.496451 0.823175 l +2.361506 0.955988 l +1.889916 1.422607 l +1.419035 0.955988 l +1.284092 0.823175 l +1.115058 0.909112 l +0.678979 1.134964 l +0.443892 0.632124 l +0.363638 0.462379 l +0.177557 0.481556 l +0.000000 0.502862 l +0.081676 0.318913 0.141336 0.144198 0.184660 0.000022 c +0.657671 0.262096 1.268467 0.411245 1.889916 0.411245 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 20.039062 13.570312 cm +1.000000 1.000000 1.000000 scn +1.490056 0.040527 m +1.571021 0.012117 1.653409 0.000045 1.735085 0.000045 c +2.088068 0.000045 2.428977 0.228737 2.546874 0.489391 c +2.546874 0.489391 1.899859 0.528453 1.203836 1.235129 c +0.982245 1.463823 0.747870 1.532715 0.546876 1.532715 c +0.234376 1.532715 0.000000 1.367942 0.000000 1.367942 c +0.839489 0.919788 1.011362 0.201748 1.490056 0.040527 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 1.419037 13.570312 cm +1.000000 1.000000 1.000000 scn +0.811081 0.000045 m +0.892757 0.000045 0.975143 0.012117 1.054688 0.040527 c +1.534802 0.202458 1.708096 0.920498 2.547585 1.367942 c +2.547585 1.367942 2.312500 1.532715 2.001420 1.532715 c +1.799005 1.532715 1.564630 1.463823 1.342329 1.235129 c +0.647017 0.528453 0.000000 0.489391 0.000000 0.489391 c +0.116477 0.228027 0.458098 0.000045 0.811081 0.000045 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 14.534790 3.468018 cm +1.000000 1.000000 1.000000 scn +7.221592 7.224363 m +7.236506 7.223653 7.248578 7.223654 7.263493 7.223654 c +8.144175 7.223654 8.443184 8.166836 8.443184 8.166836 c +8.426139 8.166836 l +8.264207 8.166836 6.954548 8.205187 6.029121 9.381323 c +5.419746 10.155471 4.920456 10.835871 3.933951 11.102916 c +3.836646 11.119961 l +3.815340 11.218683 l +3.788351 11.369251 3.891334 11.510586 4.125709 11.663284 c +5.487215 12.554619 4.562500 13.691693 4.562500 13.691693 c +4.562500 13.691693 4.174004 12.782603 3.303975 12.782603 c +3.283378 12.782603 3.261363 12.784023 3.239346 12.784023 c +3.140625 12.788994 3.044743 12.792545 2.949572 12.813143 c +2.789060 12.844393 l +2.789060 12.844393 3.036929 13.519109 2.438208 14.138427 c +1.987213 14.605757 1.438920 14.685303 1.122158 14.685303 c +0.962357 14.685303 0.861506 14.664705 0.861506 14.664705 c +1.161932 14.271950 1.379260 13.619250 1.032669 13.217262 c +0.732243 12.871381 0.000000 12.855047 0.000000 12.339422 c +0.000000 12.120672 0.203833 11.866410 0.570310 11.637717 c +1.671873 10.943825 2.764913 10.023370 3.220169 8.789705 c +3.788351 7.251352 3.147725 6.230045 2.234373 5.644108 c +2.234373 5.644108 2.521305 5.379903 2.936078 5.346522 c +3.020595 5.337999 3.103692 5.334450 3.180396 5.334450 c +4.057527 5.334450 4.511362 5.745671 4.511362 5.745671 c +4.511362 5.745671 4.436789 5.177488 3.980113 4.649789 c +3.558948 4.162573 3.006393 3.875643 2.162643 3.863569 c +2.162643 3.863569 2.136361 3.472234 2.509230 3.133455 c +2.748577 2.919677 3.299714 2.850073 3.299714 2.850073 c +3.299714 2.850073 2.266335 2.640556 2.152699 1.114278 c +2.090909 0.287573 1.879259 -0.000067 1.879259 -0.000067 c +1.897726 -0.000067 l +4.295453 -0.000067 4.234375 2.056750 4.234375 2.056750 c +4.234375 2.056750 4.401280 1.448086 5.070314 1.288995 c +5.151280 1.267688 5.237215 1.259875 5.319601 1.259875 c +5.534800 1.259875 5.722303 1.310301 5.722303 1.310301 c +5.722303 1.310301 5.371448 2.048938 5.719459 3.082319 c +6.007812 3.940273 5.960938 4.575216 5.960938 4.575216 c +5.960938 4.575216 6.284093 4.086579 7.085229 4.082318 c +7.093041 4.082318 l +7.759944 4.082318 8.050426 4.587999 8.050426 4.587999 c +6.451704 5.252062 6.609376 7.393398 6.609376 7.393398 c +6.609376 7.393398 6.817472 7.238568 7.221592 7.224363 c +h +6.740767 4.986439 m +6.090198 5.307461 5.679689 6.158312 5.580257 6.465130 c +5.472303 4.776919 4.648439 3.605756 3.685371 2.477915 c +3.185371 1.893397 3.011362 1.325215 3.011362 1.325215 c +3.011362 1.325215 3.107953 1.969392 3.539771 2.493540 c +4.438209 3.573086 5.292613 4.917546 5.355823 6.471524 c +5.399147 7.556751 5.120738 8.436012 4.685368 9.161155 c +4.928976 8.406183 4.894174 7.481466 4.067470 6.618540 c +4.067470 6.618540 5.713779 8.590842 3.412642 10.612860 c +2.492187 11.382746 1.483663 11.857887 0.965197 12.194535 c +2.839487 11.583029 3.754972 12.256325 3.754972 12.256325 c +3.156250 11.737148 2.381390 11.746381 1.901276 11.820954 c +2.031958 11.757744 2.167615 11.690984 2.313211 11.612859 c +3.893467 10.754194 5.313920 9.342261 5.556108 7.386295 c +5.556108 7.401211 l +5.922585 5.479336 6.740767 4.986439 6.740767 4.986439 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 1.024841 3.468750 cm +1.000000 1.000000 1.000000 scn +5.144885 2.849364 m +5.144885 2.849364 5.696733 2.918968 5.936079 3.132747 c +6.308949 3.471525 6.281960 3.862861 6.281960 3.862861 c +5.438210 3.874934 4.886363 4.161864 4.462358 4.649080 c +4.008522 5.176779 3.933237 5.745671 3.933237 5.745671 c +3.933237 5.745671 4.387073 5.334452 5.262783 5.334452 c +5.341618 5.334452 5.423295 5.338001 5.507812 5.346524 c +5.924006 5.379905 6.210937 5.644110 6.210937 5.644110 c +5.296164 6.230047 4.656250 7.251355 5.223721 8.789707 c +5.678977 10.022661 6.772017 10.943827 7.873579 11.637719 c +8.239347 11.866412 8.443181 12.120672 8.443181 12.339422 c +8.443181 12.855047 7.711647 12.871384 7.411221 13.217264 c +7.063920 13.619963 7.281250 14.271952 7.581677 14.664708 c +7.581677 14.664708 7.481534 14.685303 7.321023 14.685303 c +7.004261 14.685303 6.455966 14.605759 6.005682 14.138429 c +5.406250 13.519111 5.654830 12.844395 5.654830 12.844395 c +5.494318 12.813145 l +5.398437 12.793259 5.301847 12.788997 5.203835 12.784025 c +5.181108 12.784025 5.161220 12.783314 5.140624 12.783314 c +4.268465 12.783314 3.882101 13.692407 3.882101 13.692407 c +3.882101 13.692407 2.958097 12.555332 4.318892 11.663998 c +4.553267 11.512009 4.656249 11.369963 4.628551 11.219395 c +4.607244 11.120671 l +4.508522 11.103626 l +3.523437 10.835871 3.023437 10.155474 2.414062 9.382036 c +1.488636 8.205190 0.180398 8.167547 0.017756 8.167547 c +0.000000 8.167547 l +0.000000 8.167547 0.299005 7.224365 1.179687 7.224365 c +1.193891 7.224365 1.206675 7.224366 1.221590 7.225076 c +1.627130 7.239281 1.834516 7.394111 1.834516 7.394111 c +1.834516 7.394111 1.991476 5.252775 0.393464 4.588713 c +0.393464 4.588713 0.684659 4.083029 1.351562 4.083029 c +1.359374 4.083029 l +2.161221 4.087291 2.483665 4.575927 2.483665 4.575927 c +2.483665 4.575927 2.436789 3.940274 2.724431 3.083030 c +3.071732 2.048939 2.723011 1.310303 2.723011 1.310303 c +2.723011 1.310303 2.909091 1.259875 3.124289 1.259875 c +3.208096 1.259875 3.293324 1.267688 3.373580 1.288995 c +4.041904 1.448086 4.209517 2.056750 4.209517 2.056750 c +4.209517 2.056750 4.148437 -0.000065 6.546164 -0.000065 c +6.563209 -0.000065 l +6.563209 -0.000065 6.353693 0.287575 6.291904 1.114280 c +6.178267 2.639848 5.144885 2.849364 5.144885 2.849364 c +h +4.759232 2.477206 m +3.796164 3.605047 2.972300 4.776211 2.863635 6.464421 c +2.764203 6.157603 2.354403 5.306752 1.704546 4.985729 c +1.704546 4.985729 2.522017 5.478626 2.889204 7.399081 c +2.889204 7.384167 l +3.132102 9.340133 4.551845 10.752775 6.132812 11.610730 c +6.277698 11.689566 6.414062 11.755616 6.544034 11.818827 c +6.063210 11.744252 5.288351 11.735020 4.690340 12.254196 c +4.690340 12.254196 5.605824 11.580900 7.479404 12.192407 c +6.960938 11.855759 5.953835 11.380615 5.033381 10.610729 c +2.731534 8.588712 4.377840 6.616411 4.377840 6.616411 c +3.549715 7.480047 3.517044 8.404053 3.759942 9.159023 c +3.323862 8.433882 3.044743 7.554621 3.090198 6.469394 c +3.153408 4.915416 4.007102 3.570956 4.904119 2.490701 c +5.338068 1.967263 5.436079 1.323087 5.436079 1.323087 c +5.436079 1.323087 5.259232 1.891979 4.759232 2.477206 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 9.544006 12.351562 cm +1.000000 1.000000 1.000000 scn +0.684660 1.486572 m +0.723723 1.444668 0.762785 1.398504 0.799717 1.352340 c +0.808239 1.341686 0.816761 1.331742 0.825284 1.319668 c +0.860085 1.274213 0.894176 1.225208 0.927557 1.175492 c +0.935369 1.165548 0.942472 1.154185 0.950285 1.142822 c +0.990057 1.082453 1.028410 1.019243 1.066052 0.954612 c +1.411933 0.357311 1.965199 0.000776 2.456676 0.000066 c +2.948153 0.000776 3.501420 0.358021 3.848011 0.954612 c +3.886364 1.021373 3.925428 1.085294 3.965200 1.145663 c +3.970882 1.154186 3.977274 1.163419 3.982956 1.171941 c +4.017047 1.223788 4.052559 1.273503 4.090201 1.321798 c +4.098014 1.332452 4.105827 1.341685 4.112929 1.350918 c +4.151281 1.398503 4.191053 1.445378 4.231536 1.487991 c +4.238638 1.495094 4.244317 1.501487 4.250709 1.507169 c +4.426845 1.687567 4.637077 1.824640 4.911935 1.901344 c +4.789773 1.972367 l +4.782673 1.972367 l +4.296165 2.255038 l +3.796166 2.541260 l +2.460228 1.813988 l +2.456676 1.816827 l +2.453837 1.813988 l +1.117188 2.541260 l +0.617188 2.255038 l +0.129262 1.972367 l +0.123579 1.972367 l +0.000000 1.901344 l +0.275568 1.825350 0.484375 1.688986 0.661222 1.508589 c +0.671165 1.501486 0.676137 1.492964 0.684660 1.486572 c +h +1.916903 1.544811 m +2.482954 1.544811 l +3.047588 1.544811 l +3.047588 1.157027 l +2.914775 1.319669 2.655541 1.286998 2.655541 1.286998 c +2.655541 0.728049 l +2.655541 0.728049 2.665484 0.453190 2.762075 0.333872 c +2.482954 0.333872 l +2.202416 0.333872 l +2.300427 0.452480 2.308950 0.728049 2.308950 0.728049 c +2.308950 1.286998 l +2.308950 1.286998 2.051136 1.320379 1.916903 1.157027 c +1.916903 1.544811 l +1.916903 1.544811 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 10.441071 14.648438 cm +1.000000 1.000000 1.000000 scn +1.445313 0.000110 m +1.445313 2.271418 l +0.000000 2.761475 l +0.381392 0.561189 l +1.445313 0.000110 l +h +1.134944 1.713178 m +1.134944 1.348122 l +1.064630 1.380081 l +1.061789 1.382922 0.958097 1.405651 0.779119 1.547696 c +0.482955 1.777100 0.477273 1.989458 0.477273 1.989458 c +1.134944 1.713178 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 12.117889 14.647705 cm +1.000000 1.000000 1.000000 scn +1.064630 0.561189 m +1.444604 2.761475 l +0.000000 2.271418 l +0.000000 0.000110 l +1.064630 0.561189 l +h +0.310371 1.713889 m +0.968040 1.990169 l +0.968040 1.990169 0.962358 1.778521 0.665483 1.548407 c +0.486505 1.406362 0.383524 1.382923 0.380683 1.380792 c +0.311080 1.348833 l +0.311080 1.713889 l +0.310371 1.713889 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 9.501251 9.322510 cm +1.000000 1.000000 1.000000 scn +0.341087 0.061858 m +0.481712 0.010721 0.652876 0.000068 0.740234 0.000068 c +0.743075 0.010722 0.748046 0.024215 0.752307 0.040550 c +0.760119 0.066118 0.767222 0.092398 0.772904 0.120097 c +0.797762 0.245807 0.806285 0.387851 0.808416 0.480181 c +0.749467 0.517112 0.665661 0.582454 0.618786 0.680465 c +0.565519 0.793391 0.488814 0.845947 0.376598 0.845947 c +0.231002 0.845947 0.075462 0.758590 0.007990 0.717396 c +-0.045987 0.404186 0.185547 0.119386 0.341087 0.061858 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 10.459503 8.942627 cm +1.000000 1.000000 1.000000 scn +2.579546 1.646240 m +2.311080 1.354337 1.785511 0.845814 1.759943 0.820246 c +1.727982 0.788287 l +0.067470 0.814565 l +0.066050 0.649792 0.039773 0.509876 0.013494 0.407604 c +0.009233 0.390558 0.004972 0.372803 0.000000 0.355047 c +1.975142 -0.000066 l +2.180398 0.143400 2.745740 0.556752 2.965910 0.718683 c +2.806109 0.951638 2.791193 1.228628 2.826704 1.423230 c +2.723011 1.489991 2.643467 1.566695 2.579546 1.646240 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 11.616455 8.480713 cm +1.000000 1.000000 1.000000 scn +1.647729 4.105225 m +1.264917 3.725963 0.898439 3.585338 0.570314 3.552668 c +0.510655 3.546276 0.450997 3.542726 0.389917 3.542726 c +0.384945 3.542726 l +0.381395 3.542726 l +0.320316 3.542726 0.259945 3.546276 0.200286 3.552668 c +0.142757 3.557639 0.083098 3.566874 0.022729 3.580368 c +0.001422 3.494430 -0.026276 3.316873 0.051849 3.147129 c +0.121451 2.993720 0.262077 2.880082 0.468043 2.804088 c +0.536933 2.777101 l +0.538355 2.702526 l +0.538355 2.680509 0.554691 2.196844 1.080969 2.063321 c +1.166907 2.152099 1.245031 2.231646 1.302560 2.299117 c +1.195316 2.551958 1.251422 2.810480 1.407672 2.937611 c +1.400570 2.910622 1.332390 2.277100 1.840202 2.041304 c +1.924009 2.001532 l +1.899148 1.912042 l +1.891336 1.885764 1.721594 1.271419 2.336651 1.043436 c +2.445313 1.002241 l +2.397018 0.896418 l +2.386365 0.872981 2.144889 0.316163 2.713070 0.000112 c +3.945313 0.000112 l +3.945313 0.978805 l +3.507103 1.032072 3.321736 1.384345 3.273441 1.633634 c +3.069606 1.668436 2.911936 1.756504 2.803982 1.899970 c +2.545459 2.240169 2.767758 2.551957 2.770599 2.569003 c +2.769888 2.566162 2.770599 2.234487 2.975144 2.029232 c +3.076707 1.930510 3.196735 1.853804 3.378553 1.836758 c +3.468042 1.828947 l +3.475854 1.737327 l +3.477274 1.718151 3.526993 1.268577 3.944606 1.198265 c +3.943185 3.196843 l +3.943185 3.506502 4.033382 3.817583 4.142047 4.105225 c +1.647729 4.105225 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 9.913391 10.375732 cm +1.000000 1.000000 1.000000 scn +0.034090 1.294122 m +0.000000 0.022105 l +0.144885 0.000088 l +0.498579 1.220969 l +0.319602 1.596680 l +0.034090 1.294122 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 9.837372 3.805420 cm +1.000000 1.000000 1.000000 scn +4.009933 2.026323 m +4.020586 2.026323 4.033370 2.024902 4.044734 2.022061 c +4.264904 1.958851 4.320302 1.165528 4.706666 1.095216 c +4.745018 1.087403 4.779817 1.085272 4.810357 1.085272 c +4.921862 1.085272 4.988625 1.132858 5.060358 1.217375 c +5.060358 1.217375 4.865754 1.522771 4.720867 1.728737 c +4.527685 1.998624 4.377831 2.323908 4.018456 2.323908 c +4.009933 2.323908 3.999278 2.323909 3.990756 2.322488 c +3.872148 2.316096 3.799704 2.258568 3.799704 2.258568 c +3.654108 2.350188 3.518455 2.381436 3.396296 2.381436 c +3.171154 2.381436 2.996438 2.278455 2.908370 2.278455 c +2.905526 2.278455 l +2.102970 2.358000 l +1.977970 2.370074 1.878540 2.496493 1.842318 2.545499 c +1.833795 2.558993 1.828113 2.566807 1.828113 2.566807 c +1.828113 2.588824 1.828114 2.610841 1.826693 2.630727 c +1.799704 3.286977 1.291893 3.567518 1.110785 3.572489 c +1.110785 3.572489 1.132091 3.697489 1.083085 3.745074 c +0.905528 3.530586 l +0.325272 3.821777 l +0.739335 3.338113 l +0.388483 2.943937 l +0.344449 2.899193 0.350131 2.838113 0.368597 2.812545 c +0.519875 2.678313 l +0.712346 2.794789 l +0.721579 2.801891 0.739334 2.804023 0.760641 2.804023 c +0.813908 2.804023 0.893454 2.789817 0.965187 2.789817 c +1.044022 2.789817 1.111495 2.806864 1.119307 2.880017 c +1.095160 2.636409 0.869306 2.213824 1.017743 1.881438 c +1.127830 1.630728 l +0.418313 1.733001 l +0.085925 1.171919 l +-0.016347 0.985130 -0.032683 0.783426 0.066039 0.673341 c +0.190329 0.517801 l +0.190329 0.517801 0.364334 0.702460 0.403397 0.823908 c +0.346580 0.885698 l +0.298994 0.938255 0.301125 0.984421 0.330955 1.040529 c +0.539051 1.385698 l +1.376409 1.188255 l +1.420443 1.263539 l +1.477261 1.358000 1.558937 1.386409 1.649136 1.386409 c +1.686068 1.386409 1.723709 1.382149 1.763482 1.375756 c +1.919022 1.345217 2.174704 1.304023 2.430386 1.304023 c +2.710926 1.304023 2.990045 1.353738 3.138483 1.520641 c +3.441750 1.071067 4.056807 0.999335 4.008511 0.770641 c +3.846577 0.000046 l +3.953822 0.004308 4.056807 0.011408 4.154818 0.024903 c +4.308936 0.826039 l +4.325982 0.913397 4.342319 1.030585 4.342319 1.030585 c +4.283370 1.090954 4.139194 1.218085 4.058228 1.372915 c +3.949563 1.581012 4.008512 1.690386 3.907660 1.960983 c +3.907660 1.963114 3.938910 2.026323 4.009933 2.026323 c +h +0.875698 3.152744 m +0.834504 3.154165 0.804675 3.188966 0.806806 3.230159 c +0.810357 3.269932 0.843739 3.301183 0.884222 3.297631 c +0.925415 3.296211 0.954533 3.259988 0.953823 3.220926 c +0.950272 3.179732 0.915470 3.149193 0.875698 3.152744 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 9.476501 5.102295 cm +1.000000 1.000000 1.000000 scn +0.093096 -0.000067 m +0.093096 -0.000067 0.370793 0.114280 0.395651 0.195246 c +0.358720 0.288286 l +0.332442 0.348655 0.335993 0.413995 0.387129 0.449506 c +0.686845 0.656894 l +1.187557 0.561013 l +1.187557 0.561013 1.096646 0.674650 1.105879 0.825928 c +0.627897 0.927490 l +0.177613 0.653344 l +-0.015569 0.509167 -0.029775 0.272660 0.034146 0.132746 c +0.093096 -0.000067 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 13.110779 3.796875 cm +1.000000 1.000000 1.000000 scn +0.000000 -0.000021 m +0.089489 0.003530 0.188920 0.004947 0.296874 0.004947 c +0.296874 0.004947 0.554684 0.758500 0.568888 0.781938 c +0.424712 0.845858 0.125000 1.004949 0.008522 1.077393 c +0.085227 0.963046 0.271306 0.832364 0.234374 0.731512 c +0.000000 -0.000021 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 8.441711 3.405518 cm +1.000000 0.898039 0.000000 scn +7.121449 4.859375 m +0.000000 4.859375 l +0.000000 2.180397 l +0.000000 1.084517 0.792613 0.399148 1.963067 0.399148 c +2.940340 0.399148 3.198153 0.360796 3.561790 0.000001 c +3.812500 0.250001 4.019176 0.343041 4.445312 0.377842 c +4.455257 0.419032 l +4.679687 1.112926 l +4.666903 1.128551 4.300428 1.545454 4.300428 1.545454 c +4.154831 1.497159 4.032670 1.489345 3.827414 1.489345 c +3.616477 1.489345 3.378552 1.514205 3.120739 1.562501 c +3.095171 1.568183 3.070312 1.571023 3.046164 1.571023 c +3.014204 1.571023 3.012073 1.568182 3.004261 1.552557 c +2.959516 1.478693 l +2.877841 1.343750 l +2.723722 1.379261 l +2.040482 1.540482 l +1.946733 1.385653 l +1.960937 1.369319 l +2.044034 1.277699 l +2.007101 1.158381 l +1.956675 1.002131 1.794034 0.819603 1.744318 0.769887 c +1.573864 0.586647 l +1.418324 0.783381 l +1.301137 0.930397 l +1.178268 1.068181 1.149858 1.278409 1.218750 1.499290 c +1.217330 1.497869 1.214489 1.496448 1.211648 1.496448 c +1.019177 1.416903 l +0.932529 1.605113 l +0.871448 1.738636 l +0.766335 1.973721 0.805398 2.317472 1.088069 2.524858 c +1.637784 2.835227 l +2.161221 2.732243 l +2.174005 2.782669 2.192471 2.962357 2.207386 3.007812 c +2.197443 3.009232 2.188211 3.011364 2.177557 3.011364 c +1.876419 2.898438 l +1.585228 3.099432 l +1.585228 3.099432 1.471590 3.208807 1.574573 3.318892 c +1.855824 3.745739 l +1.142045 4.642045 l +2.239347 4.191762 l +2.312500 4.281960 l +2.460226 4.459517 l +2.628550 4.299716 l +2.676135 4.253551 2.703125 4.197444 2.716619 4.141336 c +3.018466 4.023438 3.561080 3.676137 3.608665 3.111506 c +3.438920 3.043323 l +3.438920 3.039062 l +3.477982 2.992897 3.509943 2.974431 3.519886 2.972301 c +4.303267 2.895597 l +4.323153 2.899148 4.348013 2.907671 4.375712 2.916194 c +4.473013 2.949575 4.618609 2.997159 4.792615 2.997159 c +4.933950 2.997159 5.070314 2.965198 5.201706 2.903408 c +5.250002 2.921874 5.309659 2.934659 5.377841 2.939631 c +5.415481 2.940341 l +5.834516 2.940341 6.043323 2.627130 6.210226 2.377130 c +6.237925 2.333806 6.265624 2.293323 6.294743 2.252840 c +6.441050 2.046164 6.632104 1.744319 6.639917 1.730824 c +6.725852 1.595880 l +6.620028 1.473011 l +6.539062 1.378551 6.416192 1.268466 6.205965 1.268466 c +6.162641 1.268466 6.115056 1.273438 6.063919 1.282671 c +6.019175 1.291194 5.978692 1.304687 5.939630 1.321022 c +5.933948 1.279829 5.924715 1.230113 5.917613 1.188210 c +5.780539 0.471593 l +6.601562 0.673297 7.123581 1.293323 7.123581 2.181817 c +7.121449 4.859375 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 8.241486 8.480713 cm +1.000000 0.898039 0.000000 scn +0.200285 0.000088 m +5.739349 0.000088 l +5.462360 0.285599 5.466619 0.647815 5.536932 0.882900 c +5.456676 0.921252 5.389916 0.968127 5.330257 1.018553 c +5.113638 0.858752 4.453125 0.377928 4.280540 0.257190 c +4.243608 0.232331 l +2.069603 0.625087 l +2.025568 0.625087 l +1.973011 0.625087 1.897017 0.627219 1.813210 0.637162 c +1.789773 0.539150 1.705257 0.471678 1.607956 0.471678 c +1.596592 0.471678 1.584517 0.472389 1.573153 0.474519 c +1.516335 0.484462 1.467330 0.512871 1.433949 0.560456 c +1.399858 0.607331 1.386363 0.662729 1.395596 0.720257 c +1.403410 0.767133 l +1.179688 0.924803 0.972302 1.277785 1.063921 1.649945 c +1.072444 1.689008 l +1.104403 1.711736 l +1.108664 1.715287 1.146306 1.740855 1.202414 1.772815 c +1.044744 1.796962 l +0.985795 1.807616 0.946024 1.862303 0.955257 1.921252 c +0.965200 1.980201 1.021308 2.022816 1.079546 2.011452 c +1.455966 1.951791 l +1.490058 3.277076 l +2.049717 3.869405 l +2.399148 3.133610 l +2.030540 1.858752 l +2.362926 1.806195 l +2.421164 1.796962 2.461648 1.742275 2.452415 1.681906 c +2.443892 1.628639 2.398438 1.592416 2.345881 1.592416 c +2.340199 1.592416 2.334518 1.592417 2.328836 1.593127 c +2.058240 1.636452 l +2.061791 1.628640 2.066761 1.623667 2.070312 1.615144 c +2.098721 1.555485 2.162643 1.513583 2.200285 1.494407 c +3.857244 1.468127 l +3.927557 1.536308 4.101562 1.706765 4.280540 1.887162 c +3.872869 2.041992 3.724432 2.392842 3.699574 2.626507 c +3.471591 2.723808 3.313921 2.869406 3.227273 3.058326 c +3.120739 3.292701 3.158381 3.527076 3.187501 3.641423 c +2.966620 3.721678 2.734375 3.869407 2.496449 4.104492 c +0.000000 4.104492 l +0.107244 3.816850 0.197443 3.505770 0.197443 3.196111 c +0.197443 0.000088 l +0.200285 0.000088 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 10.644714 6.952148 cm +0.113725 0.113725 0.105882 scn +0.077598 0.150848 m +0.037115 0.154399 0.003734 0.123148 0.000183 0.083375 c +-0.002658 0.042182 0.027882 0.007381 0.069075 0.005961 c +0.108848 0.003120 0.143650 0.032948 0.147201 0.073431 c +0.147911 0.112494 0.118791 0.148717 0.077598 0.150848 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 7.993652 0.456543 cm +0.113725 0.113725 0.105882 scn +7.560369 1.787731 m +7.149859 1.945403 l +7.262784 2.369407 l +7.387784 2.831055 l +7.387784 2.831055 6.661223 2.436170 5.636365 2.140716 c +5.345882 2.057619 5.125711 2.019265 5.125711 2.019265 c +5.125711 1.704635 l +5.125711 1.704635 4.577415 1.609467 4.024148 1.609467 c +4.017755 1.609467 l +4.009232 1.609467 l +3.998579 1.609467 l +3.992187 1.609467 l +3.438210 1.609467 2.890624 1.704635 2.890624 1.704635 c +2.890624 2.019265 l +2.890624 2.019265 2.670453 2.057619 2.379970 2.140716 c +1.355823 2.436881 0.629260 2.831055 0.629260 2.831055 c +0.752131 2.369407 l +0.867898 1.945403 l +0.456676 1.787731 l +0.000000 1.617279 l +0.522727 1.364438 1.247870 0.997247 1.911222 0.815429 c +1.754971 0.387875 l +1.754971 0.387875 2.596590 0.004352 3.997868 0.000800 c +3.997868 0.000090 l +4.002131 0.000090 l +4.008523 0.000090 l +4.013493 0.000090 l +4.016335 0.000090 l +4.016335 0.000800 l +5.419744 0.004352 6.260653 0.387875 6.260653 0.387875 c +6.103692 0.815429 l +6.767044 0.997247 7.493608 1.364438 8.014205 1.617279 c +7.560369 1.787731 l +h +0.487215 1.588868 m +1.161931 1.812591 l +0.962357 2.463868 l +1.259942 2.295545 1.926136 2.041995 2.312500 1.924097 c +1.987215 1.029208 l +1.391334 1.193271 0.894885 1.384322 0.487215 1.588868 c +h +4.009943 0.225230 m +3.225852 0.225230 2.331675 0.405632 2.067471 0.499382 c +2.468040 1.583185 l +2.800426 1.485884 3.491478 1.382904 3.992898 1.386455 c +3.994318 1.386455 l +4.009943 1.386455 l +4.023438 1.386455 l +4.024857 1.386455 l +4.526278 1.383614 5.216619 1.485884 5.550426 1.583185 c +5.950284 0.499382 l +5.686790 0.404921 4.791903 0.225230 4.009943 0.225230 c +h +6.029119 1.029208 m +5.703834 1.924097 l +6.090907 2.041995 6.756391 2.295545 7.053977 2.463868 c +6.855114 1.812591 l +7.529119 1.588868 l +7.122159 1.384322 6.627841 1.193271 6.029119 1.029208 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 9.644867 18.587158 cm +0.113725 0.113725 0.105882 scn +2.356534 0.571779 m +3.191761 0.571779 3.860086 0.294789 4.228694 0.000045 c +4.228694 0.000045 4.338069 0.659847 4.712359 1.242234 c +4.039771 1.165528 l +3.687501 1.913397 l +3.011364 1.564675 l +2.355823 2.212402 l +1.701704 1.564675 l +1.024147 1.913397 l +0.672585 1.165528 l +0.000000 1.242234 l +0.374290 0.659847 0.483665 0.000045 0.483665 0.000045 c +0.857244 0.295499 1.522727 0.571779 2.356534 0.571779 c +h +0.644885 0.904165 m +0.830965 0.884279 l +0.911221 1.054022 l +1.146306 1.556864 l +1.582386 1.331012 l +1.751421 1.245073 l +1.886364 1.378596 l +2.357245 1.845216 l +2.828835 1.378596 l +2.963779 1.245073 l +3.132814 1.331012 l +3.566762 1.556864 l +3.804686 1.054022 l +3.883520 0.884279 l +4.070311 0.904165 l +4.248578 0.925471 l +4.166902 0.741522 4.106534 0.566807 4.063921 0.422631 c +3.593040 0.684705 2.981534 0.833853 2.357245 0.833853 c +1.735796 0.833853 1.125000 0.684705 0.652699 0.422631 c +0.609375 0.566807 0.549716 0.741522 0.468040 0.925471 c +0.644885 0.904165 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 14.245728 3.177734 cm +0.113725 0.113725 0.105882 scn +7.552554 7.225030 m +8.632100 7.225030 8.993606 8.323751 9.008520 8.370626 c +9.129260 8.757700 l +8.724429 8.744916 l +8.723012 8.744916 l +8.580256 8.744916 7.388495 8.776876 6.544035 9.850029 c +6.464490 9.949461 l +5.912643 10.651165 5.389205 11.318780 4.453126 11.623467 c +4.480114 11.648325 4.519176 11.678155 4.572443 11.712246 c +5.068892 12.038950 5.357956 12.435968 5.430399 12.896196 c +5.536933 13.589377 5.094461 14.141932 5.074574 14.163950 c +4.774146 14.536111 l +4.585938 14.095060 l +4.573154 14.067361 4.257810 13.361394 3.593037 13.361394 c +3.543325 13.361394 l +3.497870 13.364235 3.453834 13.365656 3.411930 13.369207 c +3.435368 13.683838 3.377842 14.171763 2.935370 14.629150 c +2.403410 15.179576 1.752130 15.261963 1.411221 15.261963 c +1.229403 15.261963 1.107953 15.239236 1.094458 15.237816 c +0.640626 15.147615 l +0.920456 14.778298 l +1.139916 14.493497 1.339486 13.968637 1.102981 13.693780 c +1.026986 13.606421 0.872159 13.536111 0.723722 13.464377 c +0.417614 13.323752 0.000000 13.127020 0.000000 12.627729 c +0.000000 12.304577 0.250710 11.967218 0.705255 11.679576 c +2.049715 10.833695 2.879259 9.951591 3.237924 8.977160 c +3.792611 7.478580 3.068892 6.624176 2.366478 6.173892 c +2.051137 5.971479 l +2.326705 5.717928 l +2.363637 5.685257 2.700994 5.388382 3.199573 5.345058 c +3.294033 5.338666 3.384230 5.333694 3.468748 5.333694 c +3.787640 5.333694 4.060367 5.384121 4.281248 5.451592 c +4.220879 5.345058 4.145596 5.236393 4.051846 5.127018 c +3.650567 4.661819 3.156251 4.450171 2.446734 4.438807 c +2.182527 4.434546 l +2.162643 4.169633 l +2.159802 4.116365 2.140625 3.625598 2.605113 3.207984 c +2.676136 3.143353 2.762072 3.090085 2.852271 3.046762 c +2.536930 2.762671 2.216617 2.269063 2.154827 1.422472 c +2.102270 0.715796 1.933950 0.454432 1.931819 0.452301 c +1.640623 0.006991 l +2.167615 -0.000113 l +3.038354 -0.000113 3.705255 0.239945 4.167613 0.716508 c +4.441051 0.998468 4.596592 1.316648 4.688922 1.597898 c +4.840910 1.468637 5.036222 1.355712 5.291193 1.295342 c +5.387784 1.272615 5.493606 1.260540 5.608663 1.260540 c +5.854401 1.260540 6.060368 1.313097 6.083805 1.318069 c +6.420452 1.407557 l +6.272017 1.721479 l +6.261364 1.746337 5.980115 2.377018 6.282672 3.276166 c +6.412643 3.665370 6.479403 4.013383 6.511363 4.284689 c +6.723011 4.174604 7.007103 4.082984 7.374291 4.082274 c +8.207388 4.082274 8.575282 4.704433 8.591618 4.730712 c +8.755679 5.016223 l +8.451704 5.141223 l +7.458807 5.553155 7.238636 6.660398 7.195312 7.259830 c +7.284801 7.242075 7.387782 7.226451 7.503549 7.223610 c +7.552554 7.225030 l +h +8.340199 4.878438 m +8.340199 4.878438 8.049716 4.372757 7.382102 4.372757 c +7.374291 4.372757 l +6.573154 4.377018 6.250711 4.865655 6.250711 4.865655 c +6.250711 4.865655 6.296873 4.230002 6.008521 3.372758 c +5.661220 2.338667 6.011364 1.600739 6.011364 1.600739 c +6.011364 1.600739 5.824573 1.550314 5.609374 1.550314 c +5.526987 1.550314 5.441049 1.558126 5.360083 1.579433 c +4.691049 1.738524 4.524148 2.347189 4.524148 2.347189 c +4.524148 2.347189 4.585937 0.290372 2.187499 0.290372 c +2.169033 0.290372 l +2.169033 0.290372 2.380683 0.578012 2.442473 1.404716 c +2.556109 2.930995 3.589487 3.140512 3.589487 3.140512 c +3.589487 3.140512 3.038350 3.210115 2.799004 3.423894 c +2.425424 3.762672 2.451706 4.154008 2.451706 4.154008 c +3.295456 4.166081 3.848010 4.453012 4.269175 4.940228 c +4.725141 5.467927 4.800424 6.036110 4.800424 6.036110 c +4.800424 6.036110 4.346589 5.624887 3.469458 5.624887 c +3.392044 5.624887 3.309657 5.628438 3.225140 5.636961 c +2.809657 5.670341 2.523435 5.934546 2.523435 5.934546 c +3.436787 6.520484 4.077413 7.541791 3.509231 9.080143 c +3.053975 10.313099 1.960225 11.234263 0.859373 11.928156 c +0.492896 12.156849 0.289063 12.411111 0.289063 12.629861 c +0.289063 13.145486 1.022017 13.161819 1.322443 13.507700 c +1.669034 13.910399 1.451706 14.562388 1.151280 14.955144 c +1.151280 14.955144 1.252841 14.975741 1.411932 14.975741 c +1.728693 14.975741 2.276987 14.896195 2.727981 14.428865 c +3.326703 13.809547 3.078834 13.134831 3.078834 13.134831 c +3.239346 13.103580 l +3.335226 13.083694 3.430398 13.079433 3.529830 13.074461 c +3.551137 13.074461 3.573152 13.073042 3.594459 13.073042 c +4.464488 13.073042 4.852984 13.982132 4.852984 13.982132 c +4.852984 13.982132 5.777699 12.845058 4.416193 11.953723 c +4.181818 11.801734 4.078835 11.659689 4.105824 11.509830 c +4.127130 11.411110 l +4.223720 11.394063 l +5.210225 11.126307 5.709515 10.445910 6.318890 9.672473 c +7.245026 8.495626 8.553975 8.457983 8.715907 8.457983 c +8.733663 8.457983 l +8.733663 8.457983 8.434658 7.514802 7.553976 7.514802 c +7.539062 7.514802 7.526990 7.514802 7.512075 7.515513 c +7.107245 7.529717 6.899855 7.684547 6.899855 7.684547 c +6.899855 7.684547 6.741477 5.542500 8.340199 4.878438 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 19.487244 13.283447 cm +0.113725 0.113725 0.105882 scn +0.413353 1.399105 m +0.816052 1.184616 1.051137 0.896974 1.256392 0.642002 c +1.458807 0.392712 1.650571 0.153366 1.950997 0.053934 c +2.057531 0.017712 2.170455 -0.000044 2.286222 -0.000044 c +2.736506 -0.000044 3.189632 0.275525 3.360797 0.657627 c +3.533381 1.040439 l +3.115767 1.065297 l +3.095881 1.066007 2.558948 1.115012 1.960937 1.725807 c +1.715198 1.976518 1.417615 2.107910 1.097302 2.107910 c +0.705967 2.107910 0.415485 1.912597 0.383525 1.892000 c +0.000000 1.621404 l +0.413353 1.399105 l +h +1.098013 1.819558 m +1.299008 1.819558 1.533383 1.750666 1.755684 1.521973 c +2.451707 0.815296 3.098722 0.776234 3.098722 0.776234 c +2.980825 0.515580 2.639916 0.287597 2.286933 0.287597 c +2.205257 0.287597 2.123580 0.299672 2.041904 0.328081 c +1.563211 0.490012 1.391336 1.208052 0.551137 1.655496 c +0.550427 1.654075 0.785513 1.819558 1.098013 1.819558 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 15.499268 4.791748 cm +0.113725 0.113725 0.105882 scn +4.590910 6.076037 m +4.590910 6.061123 l +4.348723 8.017090 2.928270 9.429022 1.348014 10.287686 c +1.201708 10.366522 1.066765 10.432572 0.936083 10.495783 c +1.416907 10.421208 2.191764 10.411976 2.789775 10.931152 c +2.789775 10.931152 1.875000 10.257857 0.000000 10.869363 c +0.518466 10.532715 1.526990 10.057571 2.447445 9.287685 c +4.748582 7.265668 3.102277 5.293368 3.102277 5.293368 c +3.928982 6.156294 3.963779 7.081009 3.720171 7.835980 c +4.155540 7.110839 4.433950 6.231578 4.390626 5.146350 c +4.327416 3.592373 3.473012 2.247912 2.574574 1.168366 c +2.142756 0.644219 2.046169 0.000044 2.046169 0.000044 c +2.046169 0.000044 2.220174 0.568227 2.720174 1.152744 c +3.683243 2.280584 4.507106 3.451748 4.615060 5.139958 c +4.714492 4.833851 5.125001 3.982287 5.775569 3.661265 c +5.776279 3.662685 4.958098 4.155583 4.590910 6.076037 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 0.629272 3.182373 cm +0.113725 0.113725 0.105882 scn +7.197444 0.450353 m +7.196734 0.453193 7.029121 0.714555 6.975854 1.420521 c +6.913354 2.267112 6.593041 2.760719 6.276990 3.044810 c +6.367899 3.088135 6.453125 3.141403 6.524148 3.206034 c +6.988636 3.623647 6.968752 4.114412 6.965201 4.167680 c +6.947445 4.432595 l +6.681818 4.436856 l +5.973722 4.448220 5.478693 4.659868 5.077415 5.125067 c +4.984375 5.234442 4.909091 5.343107 4.848011 5.449641 c +5.068892 5.382170 5.339490 5.331743 5.659802 5.331743 c +5.745740 5.331743 5.835227 5.336715 5.928977 5.343107 c +6.427557 5.385721 6.764916 5.682596 6.802558 5.715977 c +7.078835 5.969526 l +6.763494 6.171942 l +6.058949 6.622226 5.338068 7.477339 5.892046 8.975208 c +6.250711 9.949640 7.078837 10.831744 8.425428 11.677625 c +8.879973 11.964557 9.128552 12.302624 9.128552 12.625776 c +9.128552 13.125067 8.711648 13.321799 8.406251 13.462424 c +8.257103 13.533447 8.102274 13.604471 8.026990 13.691829 c +7.790484 13.965977 7.990058 14.491544 8.209518 14.776345 c +8.491479 15.145664 l +8.035512 15.235863 l +8.022017 15.237283 7.902700 15.260010 7.719462 15.260010 c +7.378553 15.260010 6.727984 15.177626 6.196734 14.627199 c +5.753552 14.169103 5.696023 13.681885 5.718750 13.367254 c +5.676136 13.363703 5.632812 13.362284 5.587358 13.359443 c +5.539063 13.359443 l +4.872869 13.359443 4.557529 14.065408 4.545455 14.093107 c +4.357955 14.534160 l +4.054688 14.161999 l +4.037642 14.139272 3.594461 13.586714 3.702416 12.894243 c +3.774149 12.434015 4.063210 12.037000 4.560369 11.710295 c +4.614347 11.675493 4.651990 11.645664 4.678978 11.621516 c +3.741478 11.316829 3.218750 10.649215 2.666903 9.947510 c +2.587358 9.848079 l +1.743608 8.774216 0.549715 8.742966 0.406959 8.742966 c +0.000000 8.755749 l +0.123579 8.368673 l +0.137783 8.321798 0.497868 7.223079 1.578834 7.223079 c +1.631392 7.224499 l +1.745739 7.227340 1.848012 7.243675 1.939631 7.260721 c +1.894887 6.662000 1.674716 5.554753 0.681108 5.142112 c +0.377842 5.017113 l +0.541904 4.731601 l +0.557529 4.705322 0.926137 4.083162 1.760654 4.083162 c +2.125711 4.084583 2.409092 4.175492 2.621450 4.285578 c +2.653410 4.014271 2.720170 3.666261 2.850852 3.277056 c +3.152698 2.377909 2.871449 1.747225 2.860796 1.721657 c +2.711648 1.407738 l +3.049006 1.318248 l +3.071023 1.312566 3.278409 1.260719 3.523437 1.260719 c +3.637784 1.260719 3.744319 1.272793 3.840200 1.295520 c +4.095882 1.355889 4.293325 1.469526 4.443893 1.598078 c +4.535513 1.316828 4.692472 0.998648 4.964489 0.716687 c +5.428267 0.240125 6.093751 0.000066 6.964490 0.000066 c +7.492188 0.007167 l +7.197444 0.450353 l +h +6.942473 0.285579 m +4.544035 0.285579 4.605825 2.342397 4.605825 2.342397 c +4.605825 2.342397 4.438210 1.733732 3.769886 1.574641 c +3.689631 1.553334 3.604405 1.545522 3.520598 1.545522 c +3.305399 1.545522 3.119318 1.595947 3.119318 1.595947 c +3.119318 1.595947 3.468041 2.334584 3.120739 3.367965 c +2.833097 4.225209 2.879971 4.860863 2.879971 4.860863 c +2.879971 4.860863 2.557529 4.372226 1.755682 4.367965 c +1.747869 4.367965 l +1.080965 4.367965 0.789773 4.873646 0.789773 4.873646 c +2.387784 5.537708 2.230824 7.679044 2.230824 7.679044 c +2.230824 7.679044 2.023438 7.524214 1.617898 7.510009 c +1.602983 7.509299 1.590199 7.509301 1.575995 7.509301 c +0.694603 7.509301 0.396306 8.452482 0.396306 8.452482 c +0.414062 8.452482 l +0.576704 8.452482 1.884944 8.490833 2.810370 9.666969 c +3.420456 10.440407 3.919745 11.120806 4.904830 11.388562 c +5.003551 11.405607 l +5.024859 11.504330 l +5.051847 11.654898 4.948864 11.796231 4.715199 11.948931 c +3.354403 12.840265 4.278409 13.977340 4.278409 13.977340 c +4.278409 13.977340 4.664773 13.068249 5.536932 13.068249 c +5.558239 13.068249 5.578126 13.068960 5.600143 13.068960 c +5.698155 13.074642 5.794745 13.078194 5.890626 13.098080 c +6.051136 13.129328 l +6.051136 13.129328 5.801847 13.804044 6.401989 14.423362 c +6.852983 14.890692 7.400570 14.970238 7.717331 14.970238 c +7.877843 14.970238 7.977275 14.949640 7.977275 14.949640 c +7.677559 14.556885 7.460227 13.904186 7.806818 13.502197 c +8.107244 13.156317 8.838778 13.139982 8.838778 12.624357 c +8.838778 12.405607 8.634944 12.151345 8.269177 11.922652 c +7.167614 11.228760 6.073864 10.307594 5.619319 9.074640 c +5.051847 7.536288 5.692472 6.514272 6.606534 5.929045 c +6.606534 5.929045 6.318893 5.665550 5.903410 5.631459 c +5.818893 5.623647 5.737216 5.619385 5.658381 5.619385 c +4.782670 5.619385 4.328835 6.030607 4.328835 6.030607 c +4.328835 6.030607 4.404120 5.462424 4.857955 4.934015 c +5.281961 4.446799 5.833807 4.159867 6.677557 4.147794 c +6.677557 4.147794 6.704546 3.756458 6.331677 3.417680 c +6.092330 3.203901 5.540483 3.134300 5.540483 3.134300 c +5.540483 3.134300 6.574574 2.924783 6.688210 1.398504 c +6.750000 0.571799 6.959518 0.284157 6.959518 0.284157 c +6.942473 0.284157 l +6.942473 0.285579 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 0.983673 13.283447 cm +0.113725 0.113725 0.105882 scn +1.246450 -0.000068 m +1.362217 -0.000068 1.475142 0.016979 1.582387 0.053910 c +1.883523 0.154052 2.075284 0.392689 2.276989 0.641978 c +2.483665 0.896950 2.715910 1.184592 3.118609 1.399081 c +3.533381 1.621380 l +3.148439 1.891977 l +3.116479 1.911863 2.827417 2.107178 2.436081 2.107178 c +2.115059 2.107178 1.816761 1.975785 1.571023 1.725075 c +0.973011 1.114280 0.436790 1.065273 0.417614 1.064562 c +0.000000 1.039704 l +0.171165 0.656893 l +0.344461 0.275501 0.796876 -0.000068 1.246450 -0.000068 c +h +1.777699 1.521949 m +2.000000 1.751352 2.234375 1.819534 2.436790 1.819534 c +2.747870 1.819534 2.982955 1.654761 2.982955 1.654761 c +2.142756 1.207318 1.969461 0.489278 1.490058 0.327346 c +1.410512 0.298937 1.328837 0.286865 1.246450 0.286865 c +0.893467 0.286865 0.551847 0.514848 0.435370 0.775501 c +0.435370 0.775501 1.082386 0.815273 1.777699 1.521949 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 2.729431 4.794678 cm +0.113725 0.113725 0.105882 scn +1.385652 5.144155 m +1.340908 6.229382 1.619316 7.108643 2.055396 7.833785 c +1.812498 7.078814 1.845170 6.154099 2.673295 5.291173 c +2.673295 5.291173 1.026988 7.263473 3.328835 9.285490 c +4.249290 10.055377 5.256392 10.530518 5.774858 10.867166 c +3.901279 10.255660 2.985794 10.928955 2.985794 10.928955 c +3.583806 10.410489 4.358664 10.419012 4.839488 10.494296 c +4.709517 10.430376 4.573152 10.364326 4.428266 10.286201 c +2.847300 9.427535 1.427556 8.015603 1.184659 6.059637 c +1.184659 6.074553 l +0.817471 4.154098 0.000000 3.661200 0.000000 3.661200 c +0.649858 3.982223 1.059658 4.833075 1.159089 5.139894 c +1.267754 3.451683 2.091618 2.280518 3.054686 1.152677 c +3.554686 0.568159 3.730824 -0.000021 3.730824 -0.000021 c +3.730824 -0.000021 3.633522 0.644154 3.198862 1.168302 c +2.301845 2.245716 1.448152 3.590178 1.385652 5.144155 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 11.460938 12.685303 cm +0.113725 0.113725 0.105882 scn +0.000000 1.210938 m +0.000000 0.823154 l +0.134233 0.985796 0.392047 0.953125 0.392047 0.953125 c +0.392047 0.394176 l +0.392047 0.394176 0.383524 0.119317 0.285513 -0.000001 c +0.566051 -0.000001 l +0.845172 -0.000001 l +0.748581 0.118607 0.738638 0.394176 0.738638 0.394176 c +0.738638 0.953125 l +0.738638 0.953125 0.997873 0.986506 1.130685 0.823154 c +1.130685 1.210938 l +0.566051 1.210938 l +0.000000 1.210938 l +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 10.918335 15.996338 cm +0.113725 0.113725 0.105882 scn +0.301847 0.199596 m +0.480824 0.057550 0.583806 0.034112 0.587357 0.031981 c +0.656960 0.000022 l +0.656960 0.365078 l +0.000000 0.641357 l +0.000000 0.641357 0.005682 0.429710 0.301847 0.199596 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 12.428284 15.995850 cm +0.113725 0.113725 0.105882 scn +0.355112 0.200307 m +0.651987 0.429710 0.657669 0.641357 0.657669 0.641357 c +0.000000 0.365078 l +0.000000 0.000022 l +0.069601 0.031981 l +0.073152 0.034822 0.176844 0.058972 0.355112 0.200307 c +h +f +n +Q +q +1.000000 0.000000 -0.000000 1.000000 7.649841 2.929688 cm +0.113725 0.113725 0.105882 scn +6.317473 14.754328 m +6.317473 15.308305 5.384942 15.806885 4.355113 15.806885 c +4.354403 15.806885 l +4.351562 15.806885 l +4.348721 15.806885 l +3.318891 15.806885 2.386362 15.308305 2.386362 14.754328 c +2.406959 14.617965 l +2.818182 12.257878 l +2.405540 12.017821 l +1.337357 11.393531 l +1.340907 11.393531 l +1.340907 11.393531 1.100852 11.269952 0.989346 11.193957 c +0.582386 10.911287 0.495739 10.499355 0.732244 10.328901 c +0.790483 10.664839 1.056106 11.016400 1.553976 11.016400 c +1.911930 11.016400 2.185369 10.831033 2.405540 10.554044 c +2.462358 10.484442 2.516334 10.409157 2.566761 10.328901 c +2.628550 10.227339 2.690341 10.138561 2.752131 10.052624 c +0.000000 10.052624 l +0.202415 9.646374 0.394175 9.215265 0.394175 8.747225 c +0.394175 2.656315 l +0.394175 1.181883 1.527699 0.478046 2.754261 0.478046 c +3.702415 0.478046 3.829544 0.521372 4.352982 0.000065 c +4.873579 0.521372 5.001419 0.478046 5.950283 0.478046 c +7.177555 0.478046 8.309660 1.181883 8.309660 2.656315 c +8.309660 8.747225 l +8.309660 9.215265 8.501421 9.645663 8.704546 10.052624 c +5.951704 10.052624 l +6.012784 10.137851 6.075283 10.227339 6.137073 10.328901 c +6.188209 10.409157 6.241476 10.484442 6.296874 10.554044 c +6.519175 10.832453 6.791903 11.016400 7.150568 11.016400 c +7.647727 11.016400 7.913353 10.665548 7.972302 10.328901 c +8.208808 10.499355 8.122869 10.911997 7.713778 11.193957 c +7.604403 11.269952 7.363636 11.393531 7.363636 11.393531 c +7.367187 11.393531 l +6.297585 12.017821 l +5.886364 12.257878 l +6.297585 14.617965 l +6.317473 14.754328 l +h +2.790482 14.480181 m +4.235795 13.990124 l +4.235795 11.718817 l +3.171873 12.279184 l +2.790482 14.480181 l +h +3.090198 9.656315 m +3.327414 9.420521 3.560369 9.273504 3.781250 9.193249 c +3.752841 9.079612 3.715198 8.844527 3.821022 8.610152 c +3.908380 8.421232 4.066050 8.275635 4.293323 8.179044 c +4.318181 7.945379 4.465908 7.594526 4.874289 7.439696 c +4.695311 7.259299 4.521306 7.088844 4.450994 7.020663 c +2.794034 7.046941 l +2.756392 7.065407 2.692470 7.108019 2.664061 7.167678 c +2.661220 7.176201 2.655540 7.180464 2.651989 7.188987 c +2.921874 7.145661 l +2.927556 7.144951 2.933237 7.144953 2.938919 7.144953 c +2.991476 7.144953 3.036930 7.181173 3.045453 7.234440 c +3.053976 7.294099 3.014205 7.349497 2.955966 7.358729 c +2.623580 7.411288 l +2.992186 8.685436 l +2.642755 9.421230 l +2.083096 8.828901 l +2.048295 7.503616 l +1.671874 7.563275 l +1.613635 7.574639 1.558237 7.532026 1.547584 7.473078 c +1.538351 7.414839 1.578125 7.359442 1.637784 7.349499 c +1.795455 7.325349 l +1.739347 7.293388 1.701704 7.267821 1.697443 7.264271 c +1.665482 7.241543 l +1.656959 7.202481 l +1.565340 6.830322 1.772726 6.477340 1.996448 6.319669 c +1.988636 6.272794 l +1.979404 6.215265 1.992186 6.159867 2.026987 6.112992 c +2.059658 6.065407 2.109375 6.036997 2.165483 6.027054 c +2.176846 6.024922 2.189630 6.024214 2.200283 6.024214 c +2.296874 6.024214 2.382102 6.090974 2.405540 6.188985 c +2.488636 6.179042 2.565339 6.176912 2.617186 6.176912 c +2.661222 6.176912 l +4.835227 5.784157 l +4.872158 5.809015 l +5.045453 5.929754 5.705256 6.411288 5.921876 6.570379 c +5.981535 6.519242 6.047584 6.473077 6.128550 6.434014 c +6.058238 6.198929 6.053979 5.837422 6.330967 5.551911 c +0.791903 5.551911 l +0.791903 8.748646 l +0.791903 9.058304 0.700994 9.369385 0.594460 9.657026 c +3.090198 9.657026 l +3.090198 9.656315 l +h +5.776280 6.731600 m +5.556820 6.569668 4.990766 6.156316 4.785510 6.012850 c +2.810368 6.367964 l +2.814629 6.385719 2.819601 6.403475 2.823862 6.420520 c +2.849431 6.522793 2.876420 6.662708 2.877841 6.827481 c +4.538352 6.801203 l +4.570311 6.833162 l +4.595169 6.858020 5.121450 7.366543 5.389916 7.659157 c +5.453837 7.578901 5.533381 7.502908 5.637785 7.436147 c +5.601563 7.241544 5.616479 6.965264 5.776280 6.731600 c +h +2.468749 7.073930 m +2.515624 6.975919 2.599432 6.910577 2.658381 6.873646 c +2.656250 6.782026 2.647728 6.639270 2.623580 6.513559 c +2.617898 6.485150 2.610795 6.459582 2.602983 6.434014 c +2.598722 6.417679 2.594459 6.404184 2.590908 6.393531 c +2.503550 6.393531 2.332386 6.404184 2.191761 6.455320 c +2.036931 6.512849 1.805397 6.796941 1.858664 7.110861 c +1.925425 7.152054 2.081675 7.239412 2.227272 7.239412 c +2.338778 7.239412 2.415482 7.186856 2.468749 7.073930 c +h +2.263494 7.468105 m +2.296875 8.740833 l +2.582386 9.042681 l +2.762073 8.666969 l +2.408379 7.445377 l +2.263494 7.468105 l +h +5.757813 0.872222 m +5.649859 0.872222 5.550428 0.870806 5.460939 0.867254 c +5.696024 1.599497 l +5.732956 1.701059 5.546873 1.831030 5.470168 1.945376 c +5.585935 1.872224 5.885652 1.713135 6.030539 1.649924 c +6.015624 1.625776 5.757813 0.872222 5.757813 0.872222 c +h +6.496448 1.703900 m +6.343040 0.902766 l +6.245029 0.889272 6.141334 0.882167 6.034800 0.877905 c +6.196733 1.647794 l +6.245029 1.876487 5.630683 1.948219 5.327416 2.397794 c +5.178978 2.230890 4.899857 2.181172 4.619317 2.181172 c +4.363635 2.181172 4.107955 2.222366 3.952415 2.252907 c +3.913352 2.259298 3.875709 2.263559 3.838067 2.263559 c +3.748578 2.263559 3.666903 2.235860 3.610085 2.140689 c +3.565340 2.065406 l +2.727981 2.262849 l +2.519885 1.917679 l +2.490766 1.861571 2.488635 1.814696 2.535510 1.762139 c +2.592330 1.700350 l +2.553267 1.578191 2.379261 1.394242 2.379261 1.394242 c +2.254972 1.549782 l +2.156250 1.659867 2.172585 1.861571 2.274858 2.048361 c +2.607244 2.608731 l +3.316760 2.506458 l +3.206676 2.757877 l +3.058239 3.090263 3.284090 3.512850 3.308238 3.755748 c +3.300426 3.681884 3.232243 3.665547 3.154118 3.665547 c +3.082385 3.665547 3.002841 3.679042 2.949574 3.679042 c +2.928977 3.679042 2.910510 3.676911 2.901277 3.669808 c +2.708806 3.553332 l +2.557527 3.687565 l +2.539061 3.713133 2.533380 3.773502 2.578124 3.818957 c +2.928977 4.212423 l +2.514204 4.696799 l +3.094459 4.405605 l +3.272016 4.620093 l +3.321021 4.572508 3.299716 4.447509 3.299716 4.447509 c +3.480824 4.443247 3.988635 4.162707 4.015624 3.506457 c +4.017044 3.486571 4.017045 3.463844 4.017045 3.442537 c +4.017045 3.442537 4.022017 3.434013 4.030540 3.421229 c +4.066051 3.371513 4.165482 3.245094 4.291193 3.233730 c +5.093749 3.154185 l +5.096592 3.154185 l +5.184660 3.154185 5.359376 3.257167 5.584518 3.257167 c +5.706677 3.257167 5.843040 3.225918 5.987926 3.134299 c +5.987926 3.134299 6.061080 3.191827 6.178978 3.198219 c +6.187500 3.199639 6.198155 3.199638 6.206678 3.199638 c +6.566053 3.199638 6.715908 2.874354 6.909089 2.604467 c +7.053976 2.398501 7.248580 2.093105 7.248580 2.093105 c +7.176847 2.007878 7.110085 1.961002 6.998579 1.961002 c +6.968039 1.961002 6.933240 1.963844 6.894888 1.970946 c +6.509235 2.041969 6.453126 2.835292 6.232956 2.897792 c +6.220882 2.900633 6.208805 2.902053 6.198151 2.902053 c +6.127128 2.902053 6.095882 2.838844 6.095882 2.838844 c +6.196735 2.568248 6.137785 2.458873 6.246450 2.250776 c +6.327416 2.095946 6.470882 1.968816 6.530541 1.909157 c +6.529831 1.908446 6.513493 1.791968 6.496448 1.703900 c +h +2.185369 2.461002 m +2.222300 2.368674 l +2.197442 2.287708 1.919744 2.173362 1.919744 2.173362 c +1.860086 2.304754 l +1.796165 2.444669 1.810369 2.681173 2.003551 2.825350 c +2.453835 3.099496 l +2.931818 2.997934 l +2.923296 2.846656 3.013494 2.733021 3.013494 2.733021 c +2.512783 2.829611 l +2.213067 2.622223 l +2.162640 2.587422 2.159090 2.522082 2.185369 2.461002 c +h +6.571731 0.946799 m +6.709516 1.663417 l +6.716618 1.705319 6.725851 1.755037 6.731533 1.796231 c +6.770595 1.779896 6.811788 1.766401 6.855822 1.758589 c +6.907669 1.748646 6.954544 1.743672 6.997868 1.743672 c +7.208095 1.743672 7.330256 1.854468 7.411932 1.948218 c +7.517755 2.071089 l +7.431820 2.206031 l +7.424007 2.219525 7.232953 2.521373 7.086646 2.728048 c +7.057527 2.768532 7.029828 2.809014 7.002129 2.852339 c +6.835226 3.102339 6.626422 3.415548 6.206678 3.415548 c +6.169034 3.414837 l +6.100142 3.410576 6.040484 3.397083 5.992898 3.378617 c +5.861506 3.440407 5.725142 3.472365 5.583807 3.472365 c +5.409801 3.472365 5.264915 3.424782 5.166904 3.391400 c +5.139205 3.383588 5.114346 3.374354 5.094460 3.370804 c +4.311079 3.447510 l +4.301136 3.449640 4.269176 3.468106 4.230114 3.514271 c +4.230114 3.517821 l +4.399857 3.586002 l +4.352272 4.150633 3.809658 4.497934 3.507812 4.615832 c +3.494317 4.672650 3.467330 4.728760 3.419744 4.774924 c +3.251421 4.934726 l +3.103692 4.757169 l +3.030539 4.666968 l +1.933239 5.117252 l +2.647017 4.220945 l +2.365767 3.794099 l +2.262784 3.684724 2.376420 3.574638 2.376420 3.574638 c +2.667614 3.374356 l +2.968750 3.487282 l +2.979403 3.487282 2.988637 3.484440 2.998580 3.483729 c +2.983665 3.437565 2.965198 3.257876 2.952413 3.208161 c +2.428976 3.311145 l +1.879261 3.000775 l +1.596590 2.793389 1.558237 2.449638 1.662640 2.214554 c +1.723721 2.081031 l +1.810369 1.892820 l +2.002840 1.972365 l +2.005681 1.973076 2.008522 1.974497 2.009943 1.975207 c +1.940340 1.754327 1.968750 1.544099 2.092329 1.406315 c +2.209516 1.259299 l +2.365056 1.062565 l +2.535510 1.245805 l +2.585226 1.295521 2.748579 1.478049 2.798295 1.634299 c +2.835226 1.753616 l +2.752131 1.845237 l +2.737926 1.861570 l +2.831676 2.016399 l +3.514915 1.855179 l +3.669033 1.819668 l +3.750710 1.954610 l +3.795455 2.027763 l +3.803978 2.043388 3.806108 2.046230 3.837358 2.046230 c +3.861506 2.046230 3.885653 2.043389 3.911931 2.037707 c +4.169744 1.989412 4.407671 1.964555 4.618608 1.964555 c +4.823154 1.964555 4.946023 1.972367 5.091620 2.020663 c +5.091620 2.020663 5.458805 1.603758 5.470879 1.588133 c +5.246449 0.894950 l +5.236505 0.853049 l +4.811079 0.818248 4.603693 0.725207 4.353693 0.475207 c +3.990056 0.836003 3.732243 0.874355 2.754970 0.874355 c +1.585226 0.874355 0.791903 1.560433 0.791903 2.655604 c +0.791903 5.333873 l +7.913352 5.333873 l +7.914773 2.655604 l +7.914773 1.768530 7.393465 1.148504 6.571731 0.946799 c +h +8.111504 9.656315 m +8.002839 9.368673 7.912641 9.057593 7.912641 8.747934 c +7.913352 6.749355 l +7.495738 6.819668 7.446734 7.269241 7.444603 7.288418 c +7.436788 7.380038 l +7.346592 7.387849 l +7.164773 7.405605 7.044745 7.481601 6.943183 7.580322 c +6.738638 7.784868 6.737927 8.117252 6.738637 8.120093 c +6.735796 8.103048 6.513493 7.791260 6.771305 7.451060 c +6.879970 7.307594 7.037643 7.219526 7.240768 7.184726 c +7.288354 6.935435 7.474431 6.583162 7.912641 6.529184 c +7.912641 5.551203 l +6.680398 5.551203 l +6.112216 5.867253 6.352982 6.424071 6.363635 6.447509 c +6.411930 6.553332 l +6.303267 6.594526 l +5.687500 6.822510 5.857243 7.436854 5.865765 7.463133 c +5.890626 7.552623 l +5.806819 7.592395 l +5.299007 7.828190 5.367187 8.462423 5.374289 8.488702 c +5.218039 8.361570 5.161932 8.103760 5.269177 7.850208 c +5.210938 7.783446 5.132813 7.703191 5.046875 7.614412 c +4.520597 7.748645 4.504261 8.231600 4.504261 8.254328 c +4.502841 8.328900 l +4.433238 8.355889 l +4.227982 8.431884 4.086648 8.546230 4.017045 8.699639 c +3.938921 8.869384 3.966619 9.046941 3.987926 9.132878 c +4.048295 9.119384 4.107955 9.109442 4.165483 9.105181 c +4.224432 9.098789 4.285511 9.095236 4.346590 9.095236 c +4.350142 9.095236 l +4.355113 9.095236 l +4.416192 9.095236 4.475852 9.098789 4.535511 9.105181 c +4.863636 9.137852 5.230112 9.278476 5.612925 9.657738 c +8.111504 9.657738 l +8.111504 9.656315 l +h +6.191761 11.676913 m +6.678266 11.394241 l +6.685370 11.394241 l +6.807528 11.323219 l +6.532670 11.247225 6.323153 11.109442 6.146306 10.929044 c +6.139914 10.923363 6.134231 10.916969 6.127128 10.909866 c +6.086645 10.866543 6.046874 10.820378 6.008522 10.772793 c +6.001419 10.763560 5.993606 10.754327 5.985794 10.743673 c +5.948152 10.695377 5.912640 10.645663 5.878549 10.593817 c +5.872867 10.585294 5.866475 10.576061 5.860793 10.567538 c +5.820310 10.507170 5.781960 10.443249 5.743608 10.376488 c +5.397017 9.779186 4.843750 9.422651 4.352273 9.421942 c +3.860796 9.422651 3.307527 9.779896 2.961647 10.376488 c +2.924005 10.441118 2.885652 10.504328 2.845879 10.564697 c +2.838067 10.576061 2.830966 10.588134 2.823154 10.597366 c +2.789063 10.647083 2.754971 10.695378 2.720170 10.741543 c +2.711647 10.754327 2.703125 10.763561 2.694603 10.774215 c +2.656961 10.820379 2.618607 10.865833 2.579544 10.908447 c +2.571021 10.914839 2.566051 10.923361 2.558238 10.929752 c +2.380681 11.110150 2.171875 11.246513 1.897017 11.322508 c +2.020596 11.393531 l +2.026278 11.393531 l +2.514204 11.676203 l +3.014205 11.962423 l +4.350142 11.235151 l +4.352982 11.237993 l +4.356534 11.235151 l +5.692470 11.962423 l +6.191761 11.676913 l +h +5.532669 12.279184 m +4.468038 11.718817 l +4.468038 13.990124 l +5.912642 14.480181 l +5.532669 12.279184 l +h +4.351562 14.239412 m +2.768465 14.865123 l +2.903408 15.184014 3.524147 15.455322 4.351562 15.456032 c +5.180398 15.455322 5.801847 15.184014 5.935370 14.865123 c +4.351562 14.239412 l +h +f +n +Q + +endstream +endobj + +3 0 obj + 57056 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 24.000000 21.436768 ] + /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 +0000057146 00000 n +0000057170 00000 n +0000057343 00000 n +0000057417 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +57476 +%%EOF \ No newline at end of file diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 6f039f9b9e..407dc489a1 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -295,6 +295,7 @@ 3D15ACEE2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D15ACED2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm */; }; 3D1958EB213804B6009A83EC /* libmetrics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D1958EA213804B6009A83EC /* libmetrics.a */; }; 3DB1C57122D5DDA60097EC4C /* PromoAfterBookingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3DB1C57022D5DDA60097EC4C /* PromoAfterBookingViewController.xib */; }; + 3DBD7B9F242363E500ED9FE8 /* PartnerBannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7B9E242363E500ED9FE8 /* PartnerBannerViewController.swift */; }; 3DE1762422D614B8000214FF /* PromoAfterBookingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DE1762322D614B8000214FF /* PromoAfterBookingViewController.swift */; }; 3DEE1AEB21F72CD300054A91 /* MWMPowerManagmentViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3DEE1AEA21F72CD300054A91 /* MWMPowerManagmentViewController.mm */; }; 3DF9C22B207CC14A00DA0793 /* taxi_places in Resources */ = {isa = PBXBuildFile; fileRef = 3DF9C22A207CC14A00DA0793 /* taxi_places */; }; @@ -367,9 +368,8 @@ 478F6FA423C447E500054A53 /* ReviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 478F6FA323C447E500054A53 /* ReviewView.swift */; }; 478F6FA623C4521F00054A53 /* MoreReviewsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 478F6FA523C4521F00054A53 /* MoreReviewsViewController.swift */; }; 478F6FA823C5067C00054A53 /* MyReviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 478F6FA723C5067C00054A53 /* MyReviewView.swift */; }; - 479D305722C627CB00D18278 /* MWMMegafonBannerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 479D305522C627CB00D18278 /* MWMMegafonBannerViewController.xib */; }; + 479D305722C627CB00D18278 /* PartnerBannerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 479D305522C627CB00D18278 /* PartnerBannerViewController.xib */; }; 479D305B22C62F4000D18278 /* MWMBookmarksBannerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 479D305922C62F4000D18278 /* MWMBookmarksBannerViewController.xib */; }; - 479D306122C6634900D18278 /* MWMMegafonBannerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 479D305F22C6634900D18278 /* MWMMegafonBannerViewController.m */; }; 479D306522C664CE00D18278 /* MWMDownloadBannerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 479D306422C664CE00D18278 /* MWMDownloadBannerViewController.m */; }; 479D306822C66C8F00D18278 /* MWMBookmarksBannerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 479D306722C66C8F00D18278 /* MWMBookmarksBannerViewController.m */; }; 479EE94A2292FB03009DEBA6 /* ActivityIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 479EE9492292FB03009DEBA6 /* ActivityIndicator.swift */; }; @@ -1368,6 +1368,7 @@ 3D15ACEF2155118800F725D5 /* MWMObjectsCategorySelectorDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMObjectsCategorySelectorDataSource.h; sourceTree = ""; }; 3D1958EA213804B6009A83EC /* libmetrics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmetrics.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3DB1C57022D5DDA60097EC4C /* PromoAfterBookingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PromoAfterBookingViewController.xib; sourceTree = ""; }; + 3DBD7B9E242363E500ED9FE8 /* PartnerBannerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartnerBannerViewController.swift; sourceTree = ""; }; 3DDB4BC31DAB98F000F4D021 /* libpartners_api.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpartners_api.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libpartners_api.a"; sourceTree = ""; }; 3DE1762322D614B8000214FF /* PromoAfterBookingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromoAfterBookingViewController.swift; sourceTree = ""; }; 3DEE1AE921F72CD300054A91 /* MWMPowerManagmentViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMPowerManagmentViewController.h; sourceTree = ""; }; @@ -1456,10 +1457,8 @@ 478F6FA323C447E500054A53 /* ReviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewView.swift; sourceTree = ""; }; 478F6FA523C4521F00054A53 /* MoreReviewsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreReviewsViewController.swift; sourceTree = ""; }; 478F6FA723C5067C00054A53 /* MyReviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyReviewView.swift; sourceTree = ""; }; - 479D305522C627CB00D18278 /* MWMMegafonBannerViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MWMMegafonBannerViewController.xib; sourceTree = ""; }; + 479D305522C627CB00D18278 /* PartnerBannerViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PartnerBannerViewController.xib; sourceTree = ""; }; 479D305922C62F4000D18278 /* MWMBookmarksBannerViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MWMBookmarksBannerViewController.xib; sourceTree = ""; }; - 479D305E22C6634900D18278 /* MWMMegafonBannerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMMegafonBannerViewController.h; sourceTree = ""; }; - 479D305F22C6634900D18278 /* MWMMegafonBannerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMMegafonBannerViewController.m; sourceTree = ""; }; 479D306322C664CE00D18278 /* MWMDownloadBannerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMDownloadBannerViewController.h; sourceTree = ""; }; 479D306422C664CE00D18278 /* MWMDownloadBannerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMDownloadBannerViewController.m; sourceTree = ""; }; 479D306622C66C8F00D18278 /* MWMBookmarksBannerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBookmarksBannerViewController.h; sourceTree = ""; }; @@ -3328,11 +3327,10 @@ 479D306622C66C8F00D18278 /* MWMBookmarksBannerViewController.h */, 479D306722C66C8F00D18278 /* MWMBookmarksBannerViewController.m */, 479D305922C62F4000D18278 /* MWMBookmarksBannerViewController.xib */, - 479D305E22C6634900D18278 /* MWMMegafonBannerViewController.h */, - 479D305F22C6634900D18278 /* MWMMegafonBannerViewController.m */, - 479D305522C627CB00D18278 /* MWMMegafonBannerViewController.xib */, + 479D305522C627CB00D18278 /* PartnerBannerViewController.xib */, 479D306322C664CE00D18278 /* MWMDownloadBannerViewController.h */, 479D306422C664CE00D18278 /* MWMDownloadBannerViewController.m */, + 3DBD7B9E242363E500ED9FE8 /* PartnerBannerViewController.swift */, ); path = Widgets; sourceTree = ""; @@ -5012,7 +5010,7 @@ F6E2FDFB1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */, 342639361EA0E60A0025EB89 /* local_ads_symbols.txt in Resources */, 4554B6EC1E55F0EF0084017F /* drules_proto_vehicle_clear.bin in Resources */, - 479D305722C627CB00D18278 /* MWMMegafonBannerViewController.xib in Resources */, + 479D305722C627CB00D18278 /* PartnerBannerViewController.xib in Resources */, 337F98A321D37B5800C8AC27 /* SearchHistoryViewController.xib in Resources */, F6E2FE761E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */, 34AB66351FC5AA330078E451 /* RouteManagerCell.xib in Resources */, @@ -5233,6 +5231,7 @@ 4767CDA420AAF66B00BD8166 /* NSAttributedString+HTML.swift in Sources */, 47B06DFE21B965950094CCAD /* Geo.swift in Sources */, 6741A9A91BF340DE002C974C /* MWMDefaultAlert.mm in Sources */, + 3DBD7B9F242363E500ED9FE8 /* PartnerBannerViewController.swift in Sources */, 99514BBA23E82B450085D3A7 /* ElevationProfileViewController.swift in Sources */, 340708781F2B5D6C00029ECC /* DimBackground.swift in Sources */, 99D363172358647700941BF4 /* SubscriptionGroup.swift in Sources */, @@ -5574,7 +5573,6 @@ 34AB668C1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */, 993DF12923F6BDB100AC231A /* ThemeManager.swift in Sources */, 337F98A621D37B7400C8AC27 /* SearchTabViewController.swift in Sources */, - 479D306122C6634900D18278 /* MWMMegafonBannerViewController.m in Sources */, 3488B0131E9D0AEC0068AFD8 /* AdBannerCell.swift in Sources */, 3404755F1E081A4600C92850 /* MWMLocationPredictor.mm in Sources */, 993DF11523F6BDB100AC231A /* UISearchBarRenderer.swift in Sources */, diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm index c25941a688..52c09647f7 100644 --- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm @@ -259,7 +259,7 @@ void registerCellsForTableView(std::vector const & cells, UIT auto & f = GetFramework(); auto const & featureID = m_mapObject.GetID(); NSDictionary * info = @{ - kStatEditorMWMName : @(featureID.GetMwmName().c_str()), + kStatMWMName : @(featureID.GetMwmName().c_str()), kStatEditorMWMVersion : @(featureID.GetMwmVersion()) }; BOOL const haveNote = self.note.length; @@ -952,7 +952,7 @@ void registerCellsForTableView(std::vector const & cells, UIT std::string const additional = additionalMessage.length ? additionalMessage.UTF8String : ""; [Statistics logEvent:kStatEditorProblemReport withParameters:@{ - kStatEditorMWMName : @(fid.GetMwmName().c_str()), + kStatMWMName : @(fid.GetMwmName().c_str()), kStatEditorMWMVersion : @(fid.GetMwmVersion()), kStatProblem : @(osm::Editor::kPlaceDoesNotExistMessage) } @@ -967,7 +967,7 @@ void registerCellsForTableView(std::vector const & cells, UIT auto revertAction = ^(BOOL isCreated) { [Statistics logEvent:isCreated ? kStatEditorAddCancel : kStatEditorEditCancel withParameters:@{ - kStatEditorMWMName : @(fid.GetMwmName().c_str()), + kStatMWMName : @(fid.GetMwmName().c_str()), kStatEditorMWMVersion : @(fid.GetMwmVersion()) } atLocation:location]; diff --git a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm index 2756d26798..bbcacc4ecf 100644 --- a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm +++ b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm @@ -96,7 +96,7 @@ NSString * const kToEditorSegue = @"CategorySelectorToEditorSegue"; withParameters:@{ kStatIsAuthenticated: @(AuthorizationHaveCredentials()), kStatIsOnline: Platform::IsConnected() ? kStatYes : kStatNo, - kStatEditorMWMName: @(featureID.GetMwmName().c_str()), + kStatMWMName: @(featureID.GetMwmName().c_str()), kStatEditorMWMVersion: @(featureID.GetMwmVersion()) }]; } diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index 2fa3719973..ac0b6a2303 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -93,6 +93,8 @@ 3DA5723320C195ED007BDE27 /* viewport_search_callback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DA5722F20C195EC007BDE27 /* viewport_search_callback.cpp */; }; 3DBD7B92240D523400ED9FE8 /* elevation_info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7B90240D523300ED9FE8 /* elevation_info.cpp */; }; 3DBD7B93240D523400ED9FE8 /* elevation_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7B91240D523300ED9FE8 /* elevation_info.hpp */; }; + 3DBD7BE124237FA600ED9FE8 /* download_on_map_ads_delegate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BDF24237FA500ED9FE8 /* download_on_map_ads_delegate.hpp */; }; + 3DBD7BE224237FA600ED9FE8 /* download_on_map_ads_delegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BE024237FA600ED9FE8 /* download_on_map_ads_delegate.cpp */; }; 3DD1166621888AAC007A2ED4 /* notification_queue_serdes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1165F21888AAC007A2ED4 /* notification_queue_serdes.cpp */; }; 3DD1166721888AAC007A2ED4 /* notification_queue.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DD1166021888AAC007A2ED4 /* notification_queue.hpp */; }; 3DD1166821888AAC007A2ED4 /* notification_queue_storage.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DD1166121888AAC007A2ED4 /* notification_queue_storage.hpp */; }; @@ -387,6 +389,8 @@ 3DA5722F20C195EC007BDE27 /* viewport_search_callback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = viewport_search_callback.cpp; sourceTree = ""; }; 3DBD7B90240D523300ED9FE8 /* elevation_info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = elevation_info.cpp; sourceTree = ""; }; 3DBD7B91240D523300ED9FE8 /* elevation_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = elevation_info.hpp; sourceTree = ""; }; + 3DBD7BDF24237FA500ED9FE8 /* download_on_map_ads_delegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = download_on_map_ads_delegate.hpp; sourceTree = ""; }; + 3DBD7BE024237FA600ED9FE8 /* download_on_map_ads_delegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = download_on_map_ads_delegate.cpp; sourceTree = ""; }; 3DD1165F21888AAC007A2ED4 /* notification_queue_serdes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = notification_queue_serdes.cpp; sourceTree = ""; }; 3DD1166021888AAC007A2ED4 /* notification_queue.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = notification_queue.hpp; sourceTree = ""; }; 3DD1166121888AAC007A2ED4 /* notification_queue_storage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = notification_queue_storage.hpp; sourceTree = ""; }; @@ -892,6 +896,8 @@ 675345BD1A4054AD00A0A8C3 /* map */ = { isa = PBXGroup; children = ( + 3DBD7BE024237FA600ED9FE8 /* download_on_map_ads_delegate.cpp */, + 3DBD7BDF24237FA500ED9FE8 /* download_on_map_ads_delegate.hpp */, BB1C0195241BF73C0067FD5C /* track_mark.cpp */, BB1C0194241BF73C0067FD5C /* track_mark.hpp */, 3DBD7B90240D523300ED9FE8 /* elevation_info.cpp */, @@ -1069,6 +1075,7 @@ 3D4E99821FB462B60025B48C /* everywhere_search_params.hpp in Headers */, 675346751A4054E800A0A8C3 /* mwm_url.hpp in Headers */, 6753464B1A4054E800A0A8C3 /* bookmark.hpp in Headers */, + 3DBD7BE124237FA600ED9FE8 /* download_on_map_ads_delegate.hpp in Headers */, 3D18DC3C22956DD100A583A6 /* framework_light_delegate.hpp in Headers */, 4564FA82209497A70043CCFB /* bookmark_catalog.hpp in Headers */, 3DA5714020B5CC80007BDE27 /* booking_filter_params.hpp in Headers */, @@ -1324,6 +1331,7 @@ 3D4F44BC21345D270005E765 /* tips_api.cpp in Sources */, F6D2CE7E1EDEB7F500636DFD /* routing_manager.cpp in Sources */, 3D74ABBE1EA76F1D0063A898 /* local_ads_supported_types.cpp in Sources */, + 3DBD7BE224237FA600ED9FE8 /* download_on_map_ads_delegate.cpp in Sources */, 45A2D9D51F7556EB003310A0 /* user.cpp in Sources */, 0C2B73DE1E92AB9900530BB8 /* local_ads_manager.cpp in Sources */, F6B283071C1B03320081957A /* gps_track_storage.cpp in Sources */, diff --git a/xcode/partners_api/partners_api.xcodeproj/project.pbxproj b/xcode/partners_api/partners_api.xcodeproj/project.pbxproj index e7ffed26a4..1a8ca4e2d4 100644 --- a/xcode/partners_api/partners_api.xcodeproj/project.pbxproj +++ b/xcode/partners_api/partners_api.xcodeproj/project.pbxproj @@ -7,15 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 3430643C1E9FBCF500DC7665 /* mopub_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3430643A1E9FBCF500DC7665 /* mopub_ads.cpp */; }; - 3430643D1E9FBCF500DC7665 /* mopub_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3430643B1E9FBCF500DC7665 /* mopub_ads.hpp */; }; - 346E88961E9D087400D4CE9B /* ads_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 346E888F1E9D087400D4CE9B /* ads_base.cpp */; }; - 346E88971E9D087400D4CE9B /* ads_base.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 346E88901E9D087400D4CE9B /* ads_base.hpp */; }; - 346E88981E9D087400D4CE9B /* ads_engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 346E88911E9D087400D4CE9B /* ads_engine.cpp */; }; - 346E88991E9D087400D4CE9B /* ads_engine.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 346E88921E9D087400D4CE9B /* ads_engine.hpp */; }; - 346E889A1E9D087400D4CE9B /* banner.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 346E88931E9D087400D4CE9B /* banner.hpp */; }; - 346E889B1E9D087400D4CE9B /* rb_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 346E88941E9D087400D4CE9B /* rb_ads.cpp */; }; - 346E889C1E9D087400D4CE9B /* rb_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 346E88951E9D087400D4CE9B /* rb_ads.hpp */; }; 3488B0371E9D11860068AFD8 /* ads_engine_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 346E889D1E9D088200D4CE9B /* ads_engine_tests.cpp */; }; 3488B0381E9D11890068AFD8 /* rb_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 346E889E1E9D088200D4CE9B /* rb_tests.cpp */; }; 3488B0391E9D118D0068AFD8 /* facebook_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBC1C501E4B14810016897F /* facebook_tests.cpp */; }; @@ -40,25 +31,51 @@ 3D18DC4422956E0900A583A6 /* promo_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D18DC4322956E0900A583A6 /* promo_tests.cpp */; }; 3D452AEF1EE6D202009EAB9B /* google_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AED1EE6D202009EAB9B /* google_tests.cpp */; }; 3D452AF01EE6D202009EAB9B /* mopub_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AEE1EE6D202009EAB9B /* mopub_tests.cpp */; }; - 3D452AF31EE6D20D009EAB9B /* google_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AF11EE6D20D009EAB9B /* google_ads.cpp */; }; - 3D452AF41EE6D20D009EAB9B /* google_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D452AF21EE6D20D009EAB9B /* google_ads.hpp */; }; 3D47B29A1F054C89000828D2 /* taxi_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D47B2961F054C89000828D2 /* taxi_base.cpp */; }; 3D47B2B11F14FA14000828D2 /* utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D47B2B01F14FA14000828D2 /* utils.hpp */; }; 3D4E997C1FB439260025B48C /* booking_availability_params.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D4E997A1FB439260025B48C /* booking_availability_params.hpp */; }; 3D4E997D1FB439260025B48C /* booking_availability_params.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4E997B1FB439260025B48C /* booking_availability_params.cpp */; }; 3D4E997F1FB439300025B48C /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4E997E1FB439300025B48C /* utils.cpp */; }; 3DA5713420B57358007BDE27 /* booking_params_base.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DA5713320B57358007BDE27 /* booking_params_base.hpp */; }; - 3DBC1C541E4B14920016897F /* facebook_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBC1C521E4B14920016897F /* facebook_ads.cpp */; }; - 3DBC1C551E4B14920016897F /* facebook_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBC1C531E4B14920016897F /* facebook_ads.hpp */; }; 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 */; }; + 3DBD7BFF24251BF000ED9FE8 /* bookmark_catalog_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BE624251BF000ED9FE8 /* bookmark_catalog_ads.cpp */; }; + 3DBD7C0024251BF000ED9FE8 /* google_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BE724251BF000ED9FE8 /* google_ads.hpp */; }; + 3DBD7C0124251BF000ED9FE8 /* banner.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BE824251BF000ED9FE8 /* banner.hpp */; }; + 3DBD7C0224251BF000ED9FE8 /* tinkoff_insurance_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BE924251BF000ED9FE8 /* tinkoff_insurance_ads.hpp */; }; + 3DBD7C0324251BF000ED9FE8 /* tinkoff_allairlines_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BEA24251BF000ED9FE8 /* tinkoff_allairlines_ads.hpp */; }; + 3DBD7C0424251BF000ED9FE8 /* mopub_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BEB24251BF000ED9FE8 /* mopub_ads.hpp */; }; + 3DBD7C0524251BF000ED9FE8 /* rb_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BEC24251BF000ED9FE8 /* rb_ads.cpp */; }; + 3DBD7C0624251BF000ED9FE8 /* ads_engine.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BED24251BF000ED9FE8 /* ads_engine.hpp */; }; + 3DBD7C0724251BF000ED9FE8 /* mts_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BEE24251BF000ED9FE8 /* mts_ads.cpp */; }; + 3DBD7C0824251BF000ED9FE8 /* skyeng_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BEF24251BF000ED9FE8 /* skyeng_ads.cpp */; }; + 3DBD7C0924251BF000ED9FE8 /* ads_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BF024251BF000ED9FE8 /* ads_utils.cpp */; }; + 3DBD7C0A24251BF000ED9FE8 /* ads_base.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BF124251BF000ED9FE8 /* ads_base.hpp */; }; + 3DBD7C0B24251BF000ED9FE8 /* facebook_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BF224251BF000ED9FE8 /* facebook_ads.hpp */; }; + 3DBD7C0C24251BF000ED9FE8 /* tinkoff_allairlines_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BF324251BF000ED9FE8 /* tinkoff_allairlines_ads.cpp */; }; + 3DBD7C0D24251BF000ED9FE8 /* mts_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BF424251BF000ED9FE8 /* mts_ads.hpp */; }; + 3DBD7C0E24251BF000ED9FE8 /* rb_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BF524251BF000ED9FE8 /* rb_ads.hpp */; }; + 3DBD7C0F24251BF000ED9FE8 /* mopub_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BF624251BF000ED9FE8 /* mopub_ads.cpp */; }; + 3DBD7C1024251BF000ED9FE8 /* ads_engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BF724251BF000ED9FE8 /* ads_engine.cpp */; }; + 3DBD7C1124251BF000ED9FE8 /* skyeng_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BF824251BF000ED9FE8 /* skyeng_ads.hpp */; }; + 3DBD7C1224251BF000ED9FE8 /* ads_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BF924251BF000ED9FE8 /* ads_utils.hpp */; }; + 3DBD7C1324251BF000ED9FE8 /* ads_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BFA24251BF000ED9FE8 /* ads_base.cpp */; }; + 3DBD7C1424251BF000ED9FE8 /* facebook_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BFB24251BF000ED9FE8 /* facebook_ads.cpp */; }; + 3DBD7C1524251BF000ED9FE8 /* bookmark_catalog_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7BFC24251BF000ED9FE8 /* bookmark_catalog_ads.hpp */; }; + 3DBD7C1624251BF000ED9FE8 /* google_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BFD24251BF000ED9FE8 /* google_ads.cpp */; }; + 3DBD7C1724251BF000ED9FE8 /* tinkoff_insurance_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BFE24251BF000ED9FE8 /* tinkoff_insurance_ads.cpp */; }; + 3DBD7C1E24251C1100ED9FE8 /* tinkoff_insurance_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7C1824251C1000ED9FE8 /* tinkoff_insurance_tests.cpp */; }; + 3DBD7C1F24251C1100ED9FE8 /* mts_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7C1924251C1000ED9FE8 /* mts_tests.cpp */; }; + 3DBD7C2024251C1100ED9FE8 /* download_on_map_container_delegate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBD7C1A24251C1000ED9FE8 /* download_on_map_container_delegate.hpp */; }; + 3DBD7C2124251C1100ED9FE8 /* skyeng_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7C1B24251C1000ED9FE8 /* skyeng_tests.cpp */; }; + 3DBD7C2224251C1100ED9FE8 /* bookmark_catalog_ads_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7C1C24251C1100ED9FE8 /* bookmark_catalog_ads_tests.cpp */; }; + 3DBD7C2324251C1100ED9FE8 /* tinkoff_airlines_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7C1D24251C1100ED9FE8 /* tinkoff_airlines_tests.cpp */; }; 3DCD415320DAB33700143533 /* booking_block_params.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DCD415120DAB33700143533 /* booking_block_params.cpp */; }; 3DCD415420DAB33700143533 /* booking_block_params.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DCD415220DAB33700143533 /* booking_block_params.hpp */; }; 3DF01C2D20652463005DDF8C /* taxi_places.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DF01C2A20652462005DDF8C /* taxi_places.cpp */; }; 3DF01C2E20652463005DDF8C /* taxi_places.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DF01C2B20652463005DDF8C /* taxi_places.hpp */; }; 3DF9C219207CAC3000DA0793 /* taxi_places_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9C218207CAC3000DA0793 /* taxi_places_tests.cpp */; }; - 3DFEBF861EF82BEA00317D5C /* viator_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DFEBF841EF82BEA00317D5C /* viator_api.hpp */; }; 3DFEBF9A1EFBFC1500317D5C /* taxi_base.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DFEBF941EFBFC1500317D5C /* taxi_base.hpp */; }; 3DFEBF9B1EFBFC1500317D5C /* taxi_engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DFEBF951EFBFC1500317D5C /* taxi_engine.cpp */; }; 3DFEBF9C1EFBFC1500317D5C /* taxi_engine.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DFEBF961EFBFC1500317D5C /* taxi_engine.hpp */; }; @@ -103,15 +120,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 3430643A1E9FBCF500DC7665 /* mopub_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mopub_ads.cpp; sourceTree = ""; }; - 3430643B1E9FBCF500DC7665 /* mopub_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mopub_ads.hpp; sourceTree = ""; }; - 346E888F1E9D087400D4CE9B /* ads_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ads_base.cpp; sourceTree = ""; }; - 346E88901E9D087400D4CE9B /* ads_base.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ads_base.hpp; sourceTree = ""; }; - 346E88911E9D087400D4CE9B /* ads_engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ads_engine.cpp; sourceTree = ""; }; - 346E88921E9D087400D4CE9B /* ads_engine.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ads_engine.hpp; sourceTree = ""; }; - 346E88931E9D087400D4CE9B /* banner.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = banner.hpp; sourceTree = ""; }; - 346E88941E9D087400D4CE9B /* rb_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rb_ads.cpp; sourceTree = ""; }; - 346E88951E9D087400D4CE9B /* rb_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = rb_ads.hpp; sourceTree = ""; }; 346E889D1E9D088200D4CE9B /* ads_engine_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ads_engine_tests.cpp; sourceTree = ""; }; 346E889E1E9D088200D4CE9B /* rb_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rb_tests.cpp; sourceTree = ""; }; 3475E0E11DBF581B004C7E69 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; @@ -137,8 +145,6 @@ 3D18DC4322956E0900A583A6 /* promo_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = promo_tests.cpp; sourceTree = ""; }; 3D452AED1EE6D202009EAB9B /* google_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = google_tests.cpp; sourceTree = ""; }; 3D452AEE1EE6D202009EAB9B /* mopub_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mopub_tests.cpp; sourceTree = ""; }; - 3D452AF11EE6D20D009EAB9B /* google_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = google_ads.cpp; sourceTree = ""; }; - 3D452AF21EE6D20D009EAB9B /* google_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = google_ads.hpp; sourceTree = ""; }; 3D47B2801F00F94D000828D2 /* mopub_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mopub_tests.cpp; sourceTree = ""; }; 3D47B2961F054C89000828D2 /* taxi_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = taxi_base.cpp; sourceTree = ""; }; 3D47B2B01F14FA14000828D2 /* utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = utils.hpp; sourceTree = ""; }; @@ -147,11 +153,40 @@ 3D4E997E1FB439300025B48C /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utils.cpp; sourceTree = ""; }; 3DA5713320B57358007BDE27 /* booking_params_base.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = booking_params_base.hpp; sourceTree = ""; }; 3DBC1C501E4B14810016897F /* facebook_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = facebook_tests.cpp; sourceTree = ""; }; - 3DBC1C521E4B14920016897F /* facebook_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = facebook_ads.cpp; sourceTree = ""; }; - 3DBC1C531E4B14920016897F /* facebook_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = facebook_ads.hpp; sourceTree = ""; }; 3DBD7B9624112DE000ED9FE8 /* freenow_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = freenow_api.cpp; sourceTree = ""; }; 3DBD7B9724112DE100ED9FE8 /* freenow_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = freenow_api.hpp; sourceTree = ""; }; 3DBD7B9A24112DEA00ED9FE8 /* freenow_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = freenow_tests.cpp; sourceTree = ""; }; + 3DBD7BE624251BF000ED9FE8 /* bookmark_catalog_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bookmark_catalog_ads.cpp; sourceTree = ""; }; + 3DBD7BE724251BF000ED9FE8 /* google_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = google_ads.hpp; sourceTree = ""; }; + 3DBD7BE824251BF000ED9FE8 /* banner.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = banner.hpp; sourceTree = ""; }; + 3DBD7BE924251BF000ED9FE8 /* tinkoff_insurance_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tinkoff_insurance_ads.hpp; sourceTree = ""; }; + 3DBD7BEA24251BF000ED9FE8 /* tinkoff_allairlines_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tinkoff_allairlines_ads.hpp; sourceTree = ""; }; + 3DBD7BEB24251BF000ED9FE8 /* mopub_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mopub_ads.hpp; sourceTree = ""; }; + 3DBD7BEC24251BF000ED9FE8 /* rb_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rb_ads.cpp; sourceTree = ""; }; + 3DBD7BED24251BF000ED9FE8 /* ads_engine.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ads_engine.hpp; sourceTree = ""; }; + 3DBD7BEE24251BF000ED9FE8 /* mts_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mts_ads.cpp; sourceTree = ""; }; + 3DBD7BEF24251BF000ED9FE8 /* skyeng_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skyeng_ads.cpp; sourceTree = ""; }; + 3DBD7BF024251BF000ED9FE8 /* ads_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ads_utils.cpp; sourceTree = ""; }; + 3DBD7BF124251BF000ED9FE8 /* ads_base.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ads_base.hpp; sourceTree = ""; }; + 3DBD7BF224251BF000ED9FE8 /* facebook_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = facebook_ads.hpp; sourceTree = ""; }; + 3DBD7BF324251BF000ED9FE8 /* tinkoff_allairlines_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinkoff_allairlines_ads.cpp; sourceTree = ""; }; + 3DBD7BF424251BF000ED9FE8 /* mts_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mts_ads.hpp; sourceTree = ""; }; + 3DBD7BF524251BF000ED9FE8 /* rb_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = rb_ads.hpp; sourceTree = ""; }; + 3DBD7BF624251BF000ED9FE8 /* mopub_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mopub_ads.cpp; sourceTree = ""; }; + 3DBD7BF724251BF000ED9FE8 /* ads_engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ads_engine.cpp; sourceTree = ""; }; + 3DBD7BF824251BF000ED9FE8 /* skyeng_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = skyeng_ads.hpp; sourceTree = ""; }; + 3DBD7BF924251BF000ED9FE8 /* ads_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ads_utils.hpp; sourceTree = ""; }; + 3DBD7BFA24251BF000ED9FE8 /* ads_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ads_base.cpp; sourceTree = ""; }; + 3DBD7BFB24251BF000ED9FE8 /* facebook_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = facebook_ads.cpp; sourceTree = ""; }; + 3DBD7BFC24251BF000ED9FE8 /* bookmark_catalog_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bookmark_catalog_ads.hpp; sourceTree = ""; }; + 3DBD7BFD24251BF000ED9FE8 /* google_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = google_ads.cpp; sourceTree = ""; }; + 3DBD7BFE24251BF000ED9FE8 /* tinkoff_insurance_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinkoff_insurance_ads.cpp; sourceTree = ""; }; + 3DBD7C1824251C1000ED9FE8 /* tinkoff_insurance_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinkoff_insurance_tests.cpp; sourceTree = ""; }; + 3DBD7C1924251C1000ED9FE8 /* mts_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mts_tests.cpp; sourceTree = ""; }; + 3DBD7C1A24251C1000ED9FE8 /* download_on_map_container_delegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = download_on_map_container_delegate.hpp; sourceTree = ""; }; + 3DBD7C1B24251C1000ED9FE8 /* skyeng_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skyeng_tests.cpp; sourceTree = ""; }; + 3DBD7C1C24251C1100ED9FE8 /* bookmark_catalog_ads_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bookmark_catalog_ads_tests.cpp; sourceTree = ""; }; + 3DBD7C1D24251C1100ED9FE8 /* tinkoff_airlines_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinkoff_airlines_tests.cpp; sourceTree = ""; }; 3DCD415120DAB33700143533 /* booking_block_params.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_block_params.cpp; sourceTree = ""; }; 3DCD415220DAB33700143533 /* booking_block_params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = booking_block_params.hpp; sourceTree = ""; }; 3DF01C2A20652462005DDF8C /* taxi_places.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = taxi_places.cpp; sourceTree = ""; }; @@ -159,9 +194,6 @@ 3DF9C218207CAC3000DA0793 /* taxi_places_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = taxi_places_tests.cpp; sourceTree = ""; }; 3DF9C21A207CAC3B00DA0793 /* taxi_places_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = taxi_places_loader.cpp; sourceTree = ""; }; 3DF9C21B207CAC3B00DA0793 /* taxi_places_loader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = taxi_places_loader.hpp; sourceTree = ""; }; - 3DFEBF831EF82BEA00317D5C /* viator_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = viator_api.cpp; sourceTree = ""; }; - 3DFEBF841EF82BEA00317D5C /* viator_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = viator_api.hpp; sourceTree = ""; }; - 3DFEBF871EF82C1300317D5C /* viator_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = viator_tests.cpp; sourceTree = ""; }; 3DFEBF941EFBFC1500317D5C /* taxi_base.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = taxi_base.hpp; sourceTree = ""; }; 3DFEBF951EFBFC1500317D5C /* taxi_engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = taxi_engine.cpp; sourceTree = ""; }; 3DFEBF961EFBFC1500317D5C /* taxi_engine.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = taxi_engine.hpp; sourceTree = ""; }; @@ -241,6 +273,38 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3DBD7BE524251BF000ED9FE8 /* ads */ = { + isa = PBXGroup; + children = ( + 3DBD7BE624251BF000ED9FE8 /* bookmark_catalog_ads.cpp */, + 3DBD7BE724251BF000ED9FE8 /* google_ads.hpp */, + 3DBD7BE824251BF000ED9FE8 /* banner.hpp */, + 3DBD7BE924251BF000ED9FE8 /* tinkoff_insurance_ads.hpp */, + 3DBD7BEA24251BF000ED9FE8 /* tinkoff_allairlines_ads.hpp */, + 3DBD7BEB24251BF000ED9FE8 /* mopub_ads.hpp */, + 3DBD7BEC24251BF000ED9FE8 /* rb_ads.cpp */, + 3DBD7BED24251BF000ED9FE8 /* ads_engine.hpp */, + 3DBD7BEE24251BF000ED9FE8 /* mts_ads.cpp */, + 3DBD7BEF24251BF000ED9FE8 /* skyeng_ads.cpp */, + 3DBD7BF024251BF000ED9FE8 /* ads_utils.cpp */, + 3DBD7BF124251BF000ED9FE8 /* ads_base.hpp */, + 3DBD7BF224251BF000ED9FE8 /* facebook_ads.hpp */, + 3DBD7BF324251BF000ED9FE8 /* tinkoff_allairlines_ads.cpp */, + 3DBD7BF424251BF000ED9FE8 /* mts_ads.hpp */, + 3DBD7BF524251BF000ED9FE8 /* rb_ads.hpp */, + 3DBD7BF624251BF000ED9FE8 /* mopub_ads.cpp */, + 3DBD7BF724251BF000ED9FE8 /* ads_engine.cpp */, + 3DBD7BF824251BF000ED9FE8 /* skyeng_ads.hpp */, + 3DBD7BF924251BF000ED9FE8 /* ads_utils.hpp */, + 3DBD7BFA24251BF000ED9FE8 /* ads_base.cpp */, + 3DBD7BFB24251BF000ED9FE8 /* facebook_ads.cpp */, + 3DBD7BFC24251BF000ED9FE8 /* bookmark_catalog_ads.hpp */, + 3DBD7BFD24251BF000ED9FE8 /* google_ads.cpp */, + 3DBD7BFE24251BF000ED9FE8 /* tinkoff_insurance_ads.cpp */, + ); + path = ads; + sourceTree = ""; + }; F6B5362B1DA5209F0067EEA5 = { isa = PBXGroup; children = ( @@ -266,15 +330,11 @@ F6B5363B1DA520B20067EEA5 /* partners_api */ = { isa = PBXGroup; children = ( + 3DBD7BE524251BF000ED9FE8 /* ads */, 3DBD7B9624112DE000ED9FE8 /* freenow_api.cpp */, 3DBD7B9724112DE100ED9FE8 /* freenow_api.hpp */, 3D1775A52318198600F8889C /* promo_catalog_types.cpp */, 3D1775A62318198700F8889C /* promo_catalog_types.hpp */, - 346E888F1E9D087400D4CE9B /* ads_base.cpp */, - 346E88901E9D087400D4CE9B /* ads_base.hpp */, - 346E88911E9D087400D4CE9B /* ads_engine.cpp */, - 346E88921E9D087400D4CE9B /* ads_engine.hpp */, - 346E88931E9D087400D4CE9B /* banner.hpp */, F6B5363C1DA520E40067EEA5 /* booking_api.cpp */, F6B5363D1DA520E40067EEA5 /* booking_api.hpp */, 3D4E997B1FB439260025B48C /* booking_availability_params.cpp */, @@ -284,26 +344,18 @@ 3DA5713320B57358007BDE27 /* booking_params_base.hpp */, 45BABC31229812820060FA53 /* downloader_promo.cpp */, 45BABC32229812830060FA53 /* downloader_promo.hpp */, - 3DBC1C521E4B14920016897F /* facebook_ads.cpp */, - 3DBC1C531E4B14920016897F /* facebook_ads.hpp */, - 3D452AF11EE6D20D009EAB9B /* google_ads.cpp */, - 3D452AF21EE6D20D009EAB9B /* google_ads.hpp */, BB1956E41F543D7B003ECE6C /* locals_api.cpp */, BB1956E51F543D7C003ECE6C /* locals_api.hpp */, 349CFD09204571FF00569949 /* maxim_api.cpp */, 349CFD08204571FF00569949 /* maxim_api.hpp */, 4566604E20D91FED0085E8C1 /* megafon_countries.cpp */, 4566604F20D91FEE0085E8C1 /* megafon_countries.hpp */, - 3430643A1E9FBCF500DC7665 /* mopub_ads.cpp */, - 3430643B1E9FBCF500DC7665 /* mopub_ads.hpp */, F67E75231DB8F06F00D6741F /* opentable_api.cpp */, F67E75241DB8F06F00D6741F /* opentable_api.hpp */, 45C380752094C5B400C18D81 /* partners.cpp */, 45C380762094C5B400C18D81 /* partners.hpp */, 3D18DC4022956DFA00A583A6 /* promo_api.cpp */, 3D18DC3F22956DFA00A583A6 /* promo_api.hpp */, - 346E88941E9D087400D4CE9B /* rb_ads.cpp */, - 346E88951E9D087400D4CE9B /* rb_ads.hpp */, 3D15ACE5214AA1B000F725D5 /* rutaxi_api.cpp */, 3D15ACE4214AA1B000F725D5 /* rutaxi_api.hpp */, 3D47B2961F054C89000828D2 /* taxi_base.cpp */, @@ -321,8 +373,6 @@ 3D4E997E1FB439300025B48C /* utils.cpp */, 3D47B2B01F14FA14000828D2 /* utils.hpp */, 45AC338E22C4F448004DC574 /* utm.hpp */, - 3DFEBF831EF82BEA00317D5C /* viator_api.cpp */, - 3DFEBF841EF82BEA00317D5C /* viator_api.hpp */, 3DFEBF981EFBFC1500317D5C /* yandex_api.cpp */, 3DFEBF991EFBFC1500317D5C /* yandex_api.hpp */, ); @@ -333,6 +383,12 @@ F6B536441DA521060067EEA5 /* partners_api_tests */ = { isa = PBXGroup; children = ( + 3DBD7C1C24251C1100ED9FE8 /* bookmark_catalog_ads_tests.cpp */, + 3DBD7C1A24251C1000ED9FE8 /* download_on_map_container_delegate.hpp */, + 3DBD7C1924251C1000ED9FE8 /* mts_tests.cpp */, + 3DBD7C1B24251C1000ED9FE8 /* skyeng_tests.cpp */, + 3DBD7C1D24251C1100ED9FE8 /* tinkoff_airlines_tests.cpp */, + 3DBD7C1824251C1000ED9FE8 /* tinkoff_insurance_tests.cpp */, 3DBD7B9A24112DEA00ED9FE8 /* freenow_tests.cpp */, 3D18DC4322956E0900A583A6 /* promo_tests.cpp */, 3D18DC3222953FF600A583A6 /* rutaxi_tests.cpp */, @@ -348,7 +404,6 @@ 3DF9C218207CAC3000DA0793 /* taxi_places_tests.cpp */, F6B536691DA523060067EEA5 /* testingmain.cpp */, F6B536461DA5213D0067EEA5 /* uber_tests.cpp */, - 3DFEBF871EF82C1300317D5C /* viator_tests.cpp */, 3DFEBFA11EFBFC2300317D5C /* yandex_tests.cpp */, 3D452AEE1EE6D202009EAB9B /* mopub_tests.cpp */, ); @@ -396,36 +451,42 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 3DBD7C0024251BF000ED9FE8 /* google_ads.hpp in Headers */, 3DA5713420B57358007BDE27 /* booking_params_base.hpp in Headers */, + 3DBD7C0224251BF000ED9FE8 /* tinkoff_insurance_ads.hpp in Headers */, 3D18DC4122956DFA00A583A6 /* promo_api.hpp in Headers */, 3D1775A82318198700F8889C /* promo_catalog_types.hpp in Headers */, - 346E88971E9D087400D4CE9B /* ads_base.hpp in Headers */, + 3DBD7C1524251BF000ED9FE8 /* bookmark_catalog_ads.hpp in Headers */, 3DCD415420DAB33700143533 /* booking_block_params.hpp in Headers */, F67E75261DB8F06F00D6741F /* opentable_api.hpp in Headers */, - 3D452AF41EE6D20D009EAB9B /* google_ads.hpp in Headers */, F6B536411DA520E40067EEA5 /* booking_api.hpp in Headers */, - 3430643D1E9FBCF500DC7665 /* mopub_ads.hpp in Headers */, + 3DBD7C1124251BF000ED9FE8 /* skyeng_ads.hpp in Headers */, + 3DBD7C0B24251BF000ED9FE8 /* facebook_ads.hpp in Headers */, 3D47B2B11F14FA14000828D2 /* utils.hpp in Headers */, + 3DBD7C0324251BF000ED9FE8 /* tinkoff_allairlines_ads.hpp in Headers */, + 3DBD7C0A24251BF000ED9FE8 /* ads_base.hpp in Headers */, + 3DBD7C0D24251BF000ED9FE8 /* mts_ads.hpp in Headers */, 3D15ACE7214AA1B000F725D5 /* rutaxi_api.hpp in Headers */, 45C380782094C5B400C18D81 /* partners.hpp in Headers */, - 3DFEBF861EF82BEA00317D5C /* viator_api.hpp in Headers */, - 346E889C1E9D087400D4CE9B /* rb_ads.hpp in Headers */, 45BABC34229812830060FA53 /* downloader_promo.hpp in Headers */, 3DBD7B9924112DE100ED9FE8 /* freenow_api.hpp in Headers */, 3D15ACE6214AA1B000F725D5 /* taxi_delegate.hpp in Headers */, 3DFEBF9A1EFBFC1500317D5C /* taxi_base.hpp in Headers */, - 346E889A1E9D087400D4CE9B /* banner.hpp in Headers */, 3DFEBF9F1EFBFC1500317D5C /* yandex_api.hpp in Headers */, 3DFEBF9D1EFBFC1500317D5C /* taxi_provider.hpp in Headers */, - 346E88991E9D087400D4CE9B /* ads_engine.hpp in Headers */, 349CFD0A2045720000569949 /* maxim_api.hpp in Headers */, 3D4E997C1FB439260025B48C /* booking_availability_params.hpp in Headers */, 3DFEBF9C1EFBFC1500317D5C /* taxi_engine.hpp in Headers */, + 3DBD7C0124251BF000ED9FE8 /* banner.hpp in Headers */, 45AC338F22C4F449004DC574 /* utm.hpp in Headers */, 4566605120D91FEE0085E8C1 /* megafon_countries.hpp in Headers */, F6B536431DA520E40067EEA5 /* uber_api.hpp in Headers */, - 3DBC1C551E4B14920016897F /* facebook_ads.hpp in Headers */, + 3DBD7C0424251BF000ED9FE8 /* mopub_ads.hpp in Headers */, + 3DBD7C1224251BF000ED9FE8 /* ads_utils.hpp in Headers */, + 3DBD7C0624251BF000ED9FE8 /* ads_engine.hpp in Headers */, + 3DBD7C2024251C1100ED9FE8 /* download_on_map_container_delegate.hpp in Headers */, 3DF01C2E20652463005DDF8C /* taxi_places.hpp in Headers */, + 3DBD7C0E24251BF000ED9FE8 /* rb_ads.hpp in Headers */, BB1956E71F543D7C003ECE6C /* locals_api.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -523,38 +584,49 @@ files = ( 3D18DC4222956DFA00A583A6 /* promo_api.cpp in Sources */, 349CFD0B2045720000569949 /* maxim_api.cpp in Sources */, + 3DBD7C1424251BF000ED9FE8 /* facebook_ads.cpp in Sources */, 3DFEBFA41EFBFC2300317D5C /* yandex_tests.cpp in Sources */, 3D1775A72318198700F8889C /* promo_catalog_types.cpp in Sources */, 3D452AEF1EE6D202009EAB9B /* google_tests.cpp in Sources */, 3D452AF01EE6D202009EAB9B /* mopub_tests.cpp in Sources */, 3D18DC3422953FF600A583A6 /* rutaxi_tests.cpp in Sources */, + 3DBD7C0924251BF000ED9FE8 /* ads_utils.cpp in Sources */, + 3DBD7C0824251BF000ED9FE8 /* skyeng_ads.cpp in Sources */, + 3DBD7BFF24251BF000ED9FE8 /* bookmark_catalog_ads.cpp in Sources */, 3D4E997F1FB439300025B48C /* utils.cpp in Sources */, 3D15ACE8214AA1B000F725D5 /* rutaxi_api.cpp in Sources */, - 3430643C1E9FBCF500DC7665 /* mopub_ads.cpp in Sources */, 3DBD7B9824112DE100ED9FE8 /* freenow_api.cpp in Sources */, + 3DBD7C0C24251BF000ED9FE8 /* tinkoff_allairlines_ads.cpp in Sources */, 45C380772094C5B400C18D81 /* partners.cpp in Sources */, - 346E88961E9D087400D4CE9B /* ads_base.cpp in Sources */, + 3DBD7C1E24251C1100ED9FE8 /* tinkoff_insurance_tests.cpp in Sources */, 3D4E997D1FB439260025B48C /* booking_availability_params.cpp in Sources */, 3DCD415320DAB33700143533 /* booking_block_params.cpp in Sources */, F6B536421DA520E40067EEA5 /* uber_api.cpp in Sources */, F6539537207FBED70057B97C /* taxi_places_loader.cpp in Sources */, 4566605020D91FEE0085E8C1 /* megafon_countries.cpp in Sources */, + 3DBD7C1024251BF000ED9FE8 /* ads_engine.cpp in Sources */, 3DFEBF9B1EFBFC1500317D5C /* taxi_engine.cpp in Sources */, - 346E889B1E9D087400D4CE9B /* rb_ads.cpp in Sources */, + 3DBD7C0F24251BF000ED9FE8 /* mopub_ads.cpp in Sources */, 3DF01C2D20652463005DDF8C /* taxi_places.cpp in Sources */, - 3DBC1C541E4B14920016897F /* facebook_ads.cpp in Sources */, - 3D452AF31EE6D20D009EAB9B /* google_ads.cpp in Sources */, - 346E88981E9D087400D4CE9B /* ads_engine.cpp in Sources */, + 3DBD7C0724251BF000ED9FE8 /* mts_ads.cpp in Sources */, F67E75251DB8F06F00D6741F /* opentable_api.cpp in Sources */, + 3DBD7C1F24251C1100ED9FE8 /* mts_tests.cpp in Sources */, 45BABC33229812830060FA53 /* downloader_promo.cpp in Sources */, 3D18DC4422956E0900A583A6 /* promo_tests.cpp in Sources */, + 3DBD7C2324251C1100ED9FE8 /* tinkoff_airlines_tests.cpp in Sources */, BB1956E61F543D7C003ECE6C /* locals_api.cpp in Sources */, 3DBD7B9B24112DEA00ED9FE8 /* freenow_tests.cpp in Sources */, + 3DBD7C0524251BF000ED9FE8 /* rb_ads.cpp in Sources */, + 3DBD7C2124251C1100ED9FE8 /* skyeng_tests.cpp in Sources */, + 3DBD7C1324251BF000ED9FE8 /* ads_base.cpp in Sources */, + 3DBD7C2224251C1100ED9FE8 /* bookmark_catalog_ads_tests.cpp in Sources */, + 3DBD7C1724251BF000ED9FE8 /* tinkoff_insurance_ads.cpp in Sources */, 3DFEBFA31EFBFC2300317D5C /* taxi_engine_tests.cpp in Sources */, F6B536401DA520E40067EEA5 /* booking_api.cpp in Sources */, 3D47B29A1F054C89000828D2 /* taxi_base.cpp in Sources */, 349CFD0D2045720700569949 /* maxim_tests.cpp in Sources */, 3DFEBF9E1EFBFC1500317D5C /* yandex_api.cpp in Sources */, + 3DBD7C1624251BF000ED9FE8 /* google_ads.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };