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

[ios] remove unused search::ProductInfo from the search

Browse source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2025-01-21 20:15:01 +04:00 • committed by Kiryl Kaveryn
parent 868b538435
commit 69953c2b12
5 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Core/Search/MWMSearch.h
View file

@ -5,7 +5,6 @@
namespace search {
class Result;
struct ProductInfo;
} // namespace search
@interface MWMSearch : NSObject
@ -21,7 +20,6 @@ struct ProductInfo;
+ (MWMSearchItemType)resultTypeWithRow:(NSUInteger)row;
+ (NSUInteger)containerIndexWithRow:(NSUInteger)row;
+ (search::Result const &)resultWithContainerIndex:(NSUInteger)index;
+ (search::ProductInfo const &)productInfoWithContainerIndex:(NSUInteger)index;
+ (void)clear;

6
iphone/Maps/Core/Search/MWMSearch.mm
View file

@ -35,7 +35,6 @@ using Observers = NSHashTable<Observer>;
bool m_isCategory;
search::Results m_everywhereResults;
search::Results m_viewportResults;
std::vector<search::ProductInfo> m_productInfo;
}
#pragma mark - Instance
@ -74,7 +73,6 @@ using Observers = NSHashTable<Observer>;
{
self.suggestionsCount = results.GetSuggestsCount();
self->m_everywhereResults = std::move(results);
self->m_productInfo = std::move(productInfo);
[self onSearchResultsUpdated];
}
@ -170,10 +168,6 @@ using Observers = NSHashTable<Observer>;
return [MWMSearch manager]->m_everywhereResults[index];
}
+ (search::ProductInfo const &)productInfoWithContainerIndex:(NSUInteger)index {
return [MWMSearch manager]->m_productInfo[index];
}
+ (MWMSearchItemType)resultTypeWithRow:(NSUInteger)row {
auto itemsIndex = [MWMSearch manager].itemsIndex;
return [itemsIndex resultTypeWithRow:row];

4
iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.h
View file

@ -6,8 +6,6 @@
@interface MWMSearchCommonCell : MWMSearchCell
- (void)config:(search::Result const &)result
productInfo:(search::ProductInfo const &)productInfo
localizedTypeName:(NSString *)localizedTypeName;
- (void)config:(search::Result const &)result localizedTypeName:(NSString *)localizedTypeName;
@end

4
iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm
View file

@ -23,9 +23,7 @@
@implementation MWMSearchCommonCell
- (void)config:(search::Result const &)result
productInfo:(search::ProductInfo const &)productInfo
localizedTypeName:(NSString *)localizedTypeName
- (void)config:(search::Result const &)result localizedTypeName:(NSString *)localizedTypeName
{
[super config:result localizedTypeName:localizedTypeName];

3
iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm
View file

@ -89,8 +89,7 @@ NSString *GetLocalizedTypeName(search::Result const &result) {
{
auto cell = static_cast<MWMSearchCommonCell *>(
[tableView dequeueReusableCellWithCellClass:[MWMSearchCommonCell class] indexPath:indexPath]);
auto const & productInfo = [MWMSearch productInfoWithContainerIndex:containerIndex];
[cell config:result productInfo:productInfo localizedTypeName:GetLocalizedTypeName(result)];
[cell config:result localizedTypeName:GetLocalizedTypeName(result)];
return cell;
}
case MWMSearchItemTypeSuggestion: