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

Review fixes.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-04-04 12:04:12 +03:00
parent f4e9f87424
commit 3d4953ee79
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Classes/Storage/MWMStorage.mm
View file

@ -75,15 +75,13 @@ using namespace storage;
alertController:(MWMAlertViewController *)alertController
onSuccess:(TMWMVoidBlock)onSuccess
{
size_t requiredSize = accumulate(countryIds.begin(), countryIds.end(), 0,
size_t requiredSize = accumulate(countryIds.begin(), countryIds.end(), kMaxMwmSizeBytes,
[](size_t const & size, TCountryId const & countryId)
{
NodeAttrs nodeAttrs;
GetFramework().Storage().GetNodeAttrs(countryId, nodeAttrs);
return size + nodeAttrs.m_mwmSize - nodeAttrs.m_localMwmSize;
});
size_t constexpr kDownloadExtraSpaceSize = 100 * MB;
requiredSize += kDownloadExtraSpaceSize;
if (GetPlatform().GetWritableStorageStatus(requiredSize) == Platform::TStorageStatus::STORAGE_OK)
{
[self checkConnectionAndPerformAction:[countryIds, onSuccess]

3
map/framework.cpp
View file

@ -240,8 +240,7 @@ void Framework::StopLocationFollow()
bool Framework::IsEnoughSpaceForMigrate() const
{
uint64_t const kSpaceSize = 100 /*Mb*/ * 1024 * 1024;
return GetPlatform().GetWritableStorageStatus(kSpaceSize) == Platform::TStorageStatus::STORAGE_OK;
return GetPlatform().GetWritableStorageStatus(kMaxMwmSizeBytes) == Platform::TStorageStatus::STORAGE_OK;
}
TCountryId Framework::PreMigrate(ms::LatLon const & position,

9
storage/storage_helpers.cpp
View file

@ -24,12 +24,11 @@ bool IsEnoughSpaceForDownload(TCountryId const & countryId, Storage const & stor
{
NodeAttrs nodeAttrs;
storage.GetNodeAttrs(countryId, nodeAttrs);
// Mwm size is less than 100 MB. In case of map update at first we download updated map and only
// after that we do delete the obsolete map. So in such a case we might need up to 100 MB of extra
// space.
size_t constexpr kDownloadExtraSpaceSize = 100 /*Mb*/ * 1024 * 1024;
// Mwm size is less than kMaxMwmSizeBytes. In case of map update at first we download updated map
// and only after that we do delete the obsolete map. So in such a case we might need up to
// kMaxMwmSizeBytes of extra space.
size_t const downloadSpaceSize =
kDownloadExtraSpaceSize + nodeAttrs.m_mwmSize - nodeAttrs.m_localMwmSize;
kMaxMwmSizeBytes + nodeAttrs.m_mwmSize - nodeAttrs.m_localMwmSize;
return GetPlatform().GetWritableStorageStatus(downloadSpaceSize) ==
Platform::TStorageStatus::STORAGE_OK;
}

2
storage/storage_helpers.hpp
View file

@ -11,6 +11,8 @@ namespace storage
class CountryInfoGetter;
class Storage;
size_t constexpr kMaxMwmSizeBytes = 100 /*Mb*/ * 1024 * 1024;
/// \returns true if |position| is covered by a downloaded mwms and false otherwise.
/// \note |position| has coordinates in mercator.
/// \note This method takes into acount only maps enumerated in countries.txt.