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

IsEnoughSpaceForDownload() refactoring.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2017-05-11 14:46:24 +03:00 • committed by r.kuznetsov
parent c0099b86ce
commit 08a4c26a6e
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
storage/storage_helpers.cpp
View file

@ -20,25 +20,25 @@ bool IsDownloadFailed(Status status)
status == Status::EUnknown;
}
bool IsEnoughSpaceForDownload(TMwmSize mwmSize, TMwmSize maxMwmSize)
bool IsEnoughSpaceForDownload(TMwmSize mwmSize)
{
return GetPlatform().GetWritableStorageStatus(mwmSize) ==
Platform::TStorageStatus::STORAGE_OK;
}
bool IsEnoughSpaceForDownload(TMwmSize mwmSizeDiff, TMwmSize maxMwmSize)
{
// Mwm size is less than |maxMwmSize|. 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.
return GetPlatform().GetWritableStorageStatus(mwmSize + maxMwmSize) ==
Platform::TStorageStatus::STORAGE_OK;
// |maxMwmSize| of extra space.
return IsEnoughSpaceForDownload(mwmSizeDiff + maxMwmSize);
}
bool IsEnoughSpaceForDownload(TCountryId const & countryId, Storage const & storage)
{
NodeAttrs nodeAttrs;
storage.GetNodeAttrs(countryId, nodeAttrs);
// The type of nodeAttrs.m_mwmSize and nodeAttrs.m_localMwmSize is TMwmSize (uint64_t).
// The condition below is necessary to prevent passing a big positive number as the first
// parameter of IsEnoughSpaceForDownload().
return IsEnoughSpaceForDownload(nodeAttrs.m_mwmSize > nodeAttrs.m_localMwmSize
? nodeAttrs.m_mwmSize - nodeAttrs.m_localMwmSize
: 0, storage.GetMaxMwmSizeBytes());
return IsEnoughSpaceForDownload(nodeAttrs.m_mwmSize);
}
bool IsEnoughSpaceForUpdate(TCountryId const & countryId, Storage const & storage)

4
storage/storage_helpers.hpp
View file

@ -22,11 +22,11 @@ bool IsPointCoveredByDownloadedMaps(m2::PointD const & position,
bool IsDownloadFailed(Status status);
bool IsEnoughSpaceForDownload(TMwmSize mwmSize, TMwmSize maxMwmSize);
bool IsEnoughSpaceForDownload(TMwmSize mwmSize);
bool IsEnoughSpaceForDownload(TMwmSize mwmSizeDiff, TMwmSize maxMwmSize);
bool IsEnoughSpaceForDownload(TCountryId const & countryId, Storage const & storage);
bool IsEnoughSpaceForUpdate(TCountryId const & countryId, Storage const & storage);
/// \brief Calculates limit rect for |countryId| (expandable or not).
/// \returns bounding box in mercator coordinates.
m2::RectD CalcLimitRect(TCountryId const & countryId,