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

[new downloader][ios] Fixed build.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-02-15 16:16:55 +03:00 • committed by Sergey Yershov
parent 68e3d3207c
commit 9763a68b95
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderDataSource.mm
View file

@ -29,7 +29,10 @@ using namespace storage;
else if ([cell isKindOfClass:[MWMMapDownloaderPlaceTableViewCell class]])
{
MWMMapDownloaderPlaceTableViewCell * tCell = (MWMMapDownloaderPlaceTableViewCell *)cell;
NSString * areaText = self.isParentRoot ? @(nodeAttrs.m_parentLocalName.c_str()) : @"";
BOOL const isSingleParent = (nodeAttrs.m_parentInfo.size() == 1);
NSString * areaText = (self.isParentRoot && isSingleParent)
? @(nodeAttrs.m_parentInfo[0].m_localName.c_str())
: @"";
[tCell setAreaText:areaText];
if ([cell isKindOfClass:[MWMMapDownloaderSubplaceTableViewCell class]])
{

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

@ -68,7 +68,7 @@ extern NSString * const kPlaceCellIdentifier;
NSString * matchedResult = [self searchMatchedResultForCountryId:countryId];
if (![nodeLocalName isEqualToString:matchedResult])
return kSubplaceCellIdentifier;
if (nodeAttrs.m_parentCountryId == s.GetRootId())
if (nodeAttrs.m_parentInfo.size() == 1 && nodeAttrs.m_parentInfo[0].m_id == s.GetRootId())
return kCountryCellIdentifier;
return kPlaceCellIdentifier;
}

8
iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm
View file

@ -119,8 +119,12 @@ using namespace storage;
BOOL const needsUpdate = (nodeAttrs.m_status == NodeStatus::OnDiskOutOfDate);
BOOL const isDownloaded = (needsUpdate || nodeAttrs.m_status == NodeStatus::OnDisk);
NSString * title = @(nodeAttrs.m_nodeLocalName.c_str());
NSString * message = self.dataSource.isParentRoot ? nil : @(nodeAttrs.m_parentLocalName.c_str());
NSString * downloadActionTitle = [NSString stringWithFormat:@"%@, %@", kDownloadActionTitle, formattedSize(nodeAttrs.m_mwmSize)];
BOOL const isMultiParent = (nodeAttrs.m_parentInfo.size() > 1);
NSString * message = (self.dataSource.isParentRoot || isMultiParent)
? nil
: @(nodeAttrs.m_parentInfo[0].m_localName.c_str());
NSString * downloadActionTitle = [NSString
stringWithFormat:@"%@, %@", kDownloadActionTitle, formattedSize(nodeAttrs.m_mwmSize)];
if (isIOS7)
{
UIActionSheet * actionSheet = [[UIActionSheet alloc] initWithTitle:title