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

[new downloader] Storage::GetChildrenInGroups(). iOS build fix.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-02-24 10:24:39 +03:00 • committed by Sergey Yershov
parent c12ffc6e64
commit 7198b60d65
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
View file

@ -316,8 +316,8 @@ extern NSString * const kSearchStateKey = @"SearchStateKey";
{
using namespace storage;
auto & s = GetFramework().Storage();
TCountriesVec downloadedCountries;
s.GetDownloadedChildren(s.GetRootId(), downloadedCountries);
TCountriesVec downloadedCountries, availCountries;
s.GetChildrenInGroups(s.GetRootId(), downloadedCountries, availCountries);
BOOL const haveMap = (downloadedCountries.size() != 0);
return haveMap ? self.tabbedController : self.downloadController;
}

4
iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderExtendedDataSource.mm
View file

@ -55,8 +55,8 @@ using namespace storage;
self.downloadedCoutryIds = nil;
self.downloadedCountriesSection = NSNotFound;
auto const & s = GetFramework().Storage();
TCountriesVec downloadedCoutryIds;
s.GetDownloadedChildren(self.parentCountryId, downloadedCoutryIds);
TCountriesVec downloadedCoutryIds, availableCountryIds;
s.GetChildrenInGroups(self.parentCountryId, downloadedCoutryIds, availableCountryIds);
NSMutableArray<NSString *> * nsDownloadedCoutryIds = [@[] mutableCopy];
for (auto const & countryId : downloadedCoutryIds)
[nsDownloadedCoutryIds addObject:@(countryId.c_str())];