diff --git a/android/src/com/mapswithme/maps/search/CategoriesAdapter.java b/android/src/com/mapswithme/maps/search/CategoriesAdapter.java index 275d80ea63..96713460e1 100644 --- a/android/src/com/mapswithme/maps/search/CategoriesAdapter.java +++ b/android/src/com/mapswithme/maps/search/CategoriesAdapter.java @@ -78,8 +78,6 @@ class CategoriesAdapter extends RecyclerView.Adapter #include -extern NSString * const kLuggageCategory; - namespace { using Observer = id; diff --git a/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm b/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm index 8454c5cd0b..14a8070c34 100644 --- a/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm +++ b/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm @@ -6,8 +6,6 @@ #include "Framework.h" -extern NSString * const kLuggageCategory = @"luggagehero"; - @implementation MWMSearchCategoriesManager { vector m_categories; @@ -49,18 +47,6 @@ extern NSString * const kLuggageCategory = @"luggagehero"; #pragma mark - UITableViewDelegate -- (void)tableView:(UITableView *)tableView - willDisplayCell:(UITableViewCell *)cell - forRowAtIndexPath:(NSIndexPath *)indexPath -{ - NSString * string = @(m_categories[indexPath.row].c_str()); - if ([string isEqualToString:kLuggageCategory]) - { - [MRMyTracker trackEventWithName:@"Search_SponsoredCategory_shown_LuggageHero"]; - [Statistics logEvent:kStatSearchSponsoredShow withParameters:@{kStatProvider : kStatLuggageHero}]; - } -} - - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { NSString * string = @(m_categories[indexPath.row].c_str()); @@ -71,17 +57,6 @@ extern NSString * const kLuggageCategory = @"luggagehero"; id delegate = self.delegate; [delegate searchText:query forInputLocale:[[AppInfo sharedInfo] languageId]]; [delegate dismissKeyboard]; - - auto doWork = ^(NSString * param) { - if (!IPAD) - delegate.state = MWMSearchManagerStateMapSearch; - - [Statistics logEvent:kStatSearchSponsoredSelect withParameters:@{kStatProvider : param}]; - [MRMyTracker trackEventWithName:[kStatLuggageHero stringByAppendingFormat:@"_%@", param]]; - }; - - if ([string isEqualToString:kLuggageCategory]) - doWork(kStatLuggageHero); } @end diff --git a/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm b/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm index a3e95fdf56..5d5683b580 100644 --- a/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm +++ b/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm @@ -2,8 +2,6 @@ #import "MWMCommon.h" #import "UIImageView+Coloring.h" -extern NSString * const kLuggageCategory; - @interface MWMSearchCategoryCell () @property(weak, nonatomic) IBOutlet UIImageView * icon; @@ -29,17 +27,8 @@ extern NSString * const kLuggageCategory; UILabel * label = self.label; label.textColor = [UIColor blackPrimaryText]; self.icon.mwm_name = [NSString stringWithFormat:@"ic_%@", category]; - if ([category isEqualToString:kLuggageCategory]) - { - label.text = L(@"luggage_storage"); - self.adIcon.hidden = NO; - self.adIcon.image = [UIImage imageNamed:@"logo_luggage"]; - } - else - { - label.text = L(category); - self.adIcon.hidden = YES; - } + label.text = L(category); + self.adIcon.hidden = YES; } @end diff --git a/map/displayed_categories_modifiers.cpp b/map/displayed_categories_modifiers.cpp index 5665214c23..917d9bda6a 100644 --- a/map/displayed_categories_modifiers.cpp +++ b/map/displayed_categories_modifiers.cpp @@ -7,12 +7,7 @@ namespace { -std::unordered_set const kLuggageHeroesSupportedCities{"London", "New York", - "Copenhagen"}; - -std::string const kLuggageHeroCategory = "luggagehero"; - -std::vector const kSponsoredCategories = {kLuggageHeroCategory}; +std::vector const kSponsoredCategories = {}; search::DisplayedCategories::Keys::const_iterator FindInsertionPlace( search::DisplayedCategories::Keys & keys, uint32_t position) @@ -55,8 +50,3 @@ void SponsoredCategoryModifier::Modify(search::DisplayedCategories::Keys & keys) else if (!supported && contains) keys.erase(std::remove(keys.begin(), keys.end(), m_categoryName), keys.end()); } - -LuggageHeroModifier::LuggageHeroModifier(std::string const & currentCity) - : SponsoredCategoryModifier(currentCity, kLuggageHeroesSupportedCities, kLuggageHeroCategory, - 4 /* position */) -{} diff --git a/map/displayed_categories_modifiers.hpp b/map/displayed_categories_modifiers.hpp index 94026598a6..e961e0996c 100644 --- a/map/displayed_categories_modifiers.hpp +++ b/map/displayed_categories_modifiers.hpp @@ -24,9 +24,3 @@ private: std::string const m_categoryName; uint32_t const m_position; }; - -class LuggageHeroModifier : public SponsoredCategoryModifier -{ -public: - explicit LuggageHeroModifier(std::string const & currentCity); -}; diff --git a/map/framework.cpp b/map/framework.cpp index 29e0df178d..33e1aebbc7 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -1501,11 +1501,12 @@ search::DisplayedCategories const & Framework::GetDisplayedCategories() // Apply sponsored modifiers. if (m_subscription && !m_subscription->IsActive()) { - std::tuple modifiers(city); - my::for_each_in_tuple(modifiers, [&](size_t, SponsoredCategoryModifier & modifier) - { - m_displayedCategories->Modify(modifier); - }); + // Add Category modifiers here. + //std::tuple modifiers(city); + //my::for_each_in_tuple(modifiers, [&](size_t, SponsoredCategoryModifier & modifier) + //{ + // m_displayedCategories->Modify(modifier); + //}); } return *m_displayedCategories; diff --git a/partners_api/partners_list.hpp b/partners_api/partners_list.hpp index 5ff51b23d2..b6a897d1a1 100644 --- a/partners_api/partners_list.hpp +++ b/partners_api/partners_list.hpp @@ -6,25 +6,7 @@ std::vector const kPartners = { PartnerInfo(1, "McArthurGlen", true /* m_hasButton */, "https://localads.maps.me/redirects/mcarthurglen", 180705), - PartnerInfo(2, "LuggageHero"), PartnerInfo(3, "BurgerKing", true /* m_hasButton */), - PartnerInfo(4, "Adidas", true /* m_hasButton */), - PartnerInfo(6, "AdidasOriginal", true /* m_hasButton */), - PartnerInfo(7, "AdidasKids", true /* m_hasButton */), - PartnerInfo(8, "CostaCoffee", true /* m_hasButton */, - "https://localads.maps.me/redirects/costa_coffee"), - PartnerInfo(9, "TGIFridays", true /* m_hasButton */, - "https://localads.maps.me/redirects/tgi_fridays"), - PartnerInfo(10, "Sportmaster", true /* m_hasButton */, - "https://localads.maps.me/redirects/sportmaster"), - PartnerInfo(11, "KFC", true /* m_hasButton */), - PartnerInfo(12, "AzbukaVkusa", true /* m_hasButton */, - "https://localads.maps.me/redirects/azbuka_vkusa"), - PartnerInfo(13, "Shokoladnitsa", true /* m_hasButton */), - PartnerInfo(14, "Yakitoriya", true /* m_hasButton */), - PartnerInfo(15, "Menza", true /* m_hasButton */), - PartnerInfo(16, "YanPrimus", true /* m_hasButton */), - PartnerInfo(17, "GinNo", true /* m_hasButton */), PartnerInfo(18, "MegafonGreenDot", true /* m_hasButton */, "https://localads.maps.me/redirects/megafon_green"), PartnerInfo(19, "MegafonPurpleDot", true /* m_hasButton */,