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

[old map downloader] Corrections after colleagues comments.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-01-26 14:24:42 +03:00 • committed by Sergey Yershov
parent 897691541b
commit d51e5e2f25
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/MapViewController.mm
View file

@ -561,7 +561,7 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue";
LocalAndRemoteSizeT sizes = layout.GetRemoteCountrySizes(idx);
uint64_t sizeToDownload = sizes.first;
MapOptions options = static_cast<MapOptions>(opt);
if(HasOptions(options, MapOptions::CarRouting))
if (HasOptions(options, MapOptions::CarRouting))
sizeToDownload += sizes.second;
NSString * name = @(layout.GetCountryName(idx).c_str());

4
storage/storage_tests/storage_tests.cpp
View file

@ -383,13 +383,13 @@ UNIT_TEST(StorageTest_TwoCountriesDownloading)
TIndex const index1 = storage.FindIndexByFile("Yemen");
TEST(index1.IsValid(), ());
storage.DeleteCountry(index1, MapOptions::Map);
MY_SCOPE_GUARD(cleanupUruguayFiles,
MY_SCOPE_GUARD(cleanupFiles1,
bind(&Storage::DeleteCountry, &storage, index1, MapOptions::Map));
TIndex const index2 = storage.FindIndexByFile("Angola");
TEST(index2.IsValid(), ());
storage.DeleteCountry(index2, MapOptions::MapWithCarRouting);
MY_SCOPE_GUARD(cleanupVenezuelaFiles, bind(&Storage::DeleteCountry, &storage, index2,
MY_SCOPE_GUARD(cleanupFiles2, bind(&Storage::DeleteCountry, &storage, index2,
MapOptions::MapWithCarRouting));
unique_ptr<CountryDownloaderChecker> uruguayChecker =