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

[ios] Review fixes.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-03-18 13:42:32 +03:00 • committed by Sergey Yershov
parent 0fafd66da8
commit 57d75562ca
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageControllerDataSource.mm
View file

@ -4,7 +4,7 @@
@interface MWMPageControllerDataSource ()
@property (nonatomic) Class<MWMWelcomeControllerProtocol> welcomeClass;
@property (nonatomic) NSArray<MWMWelcomeController *> * controllers;
@property (copy, nonatomic) NSArray<MWMWelcomeController *> * controllers;
@end
@ -24,7 +24,7 @@
vc.pageController = pageController;
[controllers addObject:vc];
}
self.controllers = [controllers copy];
self.controllers = controllers;
}
return self;
}

12
iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderSearchDataSource.mm
View file

@ -10,7 +10,7 @@ extern NSString * const kPlaceCellIdentifier;
@interface MWMMapDownloaderSearchDataSource ()
@property (copy, nonatomic) NSArray<NSString *> * searchCoutryIds;
@property (copy, nonatomic) NSArray<NSString *> * searchCountryIds;
@property (copy, nonatomic) NSDictionary<NSString *, NSString *> * searchMatchedResults;
@end
@ -23,7 +23,7 @@ extern NSString * const kPlaceCellIdentifier;
if (self)
{
auto const & countryInfoGetter = GetFramework().CountryInfoGetter();
NSMutableOrderedSet<NSString *> * nsSearchCoutryIds = [NSMutableOrderedSet orderedSetWithCapacity:results.GetCount()];
NSMutableOrderedSet<NSString *> * nsSearchCountryIds = [NSMutableOrderedSet orderedSetWithCapacity:results.GetCount()];
NSMutableDictionary<NSString *, NSString *> * nsSearchResults = [@{} mutableCopy];
for (auto it = results.Begin(); it != results.End(); ++it)
{
@ -34,10 +34,10 @@ extern NSString * const kPlaceCellIdentifier;
if (countryId == kInvalidCountryId)
continue;
NSString * nsCountryId = @(countryId.c_str());
[nsSearchCoutryIds addObject:nsCountryId];
[nsSearchCountryIds addObject:nsCountryId];
nsSearchResults[nsCountryId] = @(it->GetString().c_str());
}
self.searchCoutryIds = [nsSearchCoutryIds array];
self.searchCountryIds = [nsSearchCountryIds array];
self.searchMatchedResults = nsSearchResults;
}
return self;
@ -47,7 +47,7 @@ extern NSString * const kPlaceCellIdentifier;
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return self.searchCoutryIds.count;
return self.searchCountryIds.count;
}
- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
@ -64,7 +64,7 @@ extern NSString * const kPlaceCellIdentifier;
- (TCountryId)countryIdForIndexPath:(NSIndexPath *)indexPath
{
return self.searchCoutryIds[indexPath.row].UTF8String;
return self.searchCountryIds[indexPath.row].UTF8String;
}
- (NSString *)cellIdentifierForIndexPath:(NSIndexPath *)indexPath