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

[storage] unused method and one liner are removed.

Browse source
This commit is contained in:
Arsentiy Milchakov 2019-09-20 11:08:59 +03:00 • committed by Roman Kuznetsov
parent 0dbc21adc4
commit 438bdb6375
2 changed files with 15 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
storage/storage.cpp
View file

@ -474,7 +474,21 @@ Status Storage::CountryStatus(CountryId const & countryId) const
Status Storage::CountryStatusEx(CountryId const & countryId) const
{
return CountryStatusFull(countryId, CountryStatus(countryId));
auto const status = CountryStatus(countryId);
if (status != Status::EUnknown)
return status;
LocalFilePtr localFile = GetLatestLocalFile(countryId);
if (!localFile || !localFile->OnDisk(MapOptions::Map))
return Status::ENotDownloaded;
CountryFile const & countryFile = GetCountryFile(countryId);
if (GetRemoteSize(countryFile, MapOptions::Map, GetCurrentDataVersion()) == 0)
return Status::EUnknown;
if (localFile->GetVersion() != GetCurrentDataVersion())
return Status::EOnDiskOutOfDate;
return Status::EOnDisk;
}
void Storage::CountryStatusEx(CountryId const & countryId, Status & status,
@ -1084,32 +1098,6 @@ void Storage::GetOutdatedCountries(vector<Country const *> & countries) const
}
}
Status Storage::CountryStatusWithoutFailed(CountryId const & countryId) const
{
// First, check if we already downloading this country or have in in the queue.
if (!IsCountryInQueue(countryId))
return CountryStatusFull(countryId, Status::EUnknown);
return IsCountryFirstInQueue(countryId) ? Status::EDownloading : Status::EInQueue;
}
Status Storage::CountryStatusFull(CountryId const & countryId, Status const status) const
{
if (status != Status::EUnknown)
return status;
LocalFilePtr localFile = GetLatestLocalFile(countryId);
if (!localFile || !localFile->OnDisk(MapOptions::Map))
return Status::ENotDownloaded;
CountryFile const & countryFile = GetCountryFile(countryId);
if (GetRemoteSize(countryFile, MapOptions::Map, GetCurrentDataVersion()) == 0)
return Status::EUnknown;
if (localFile->GetVersion() != GetCurrentDataVersion())
return Status::EOnDiskOutOfDate;
return Status::EOnDisk;
}
// @TODO(bykoianko) This method does nothing and should be removed.
MapOptions Storage::NormalizeDeleteFileSet(MapOptions options) const
{

3
storage/storage.hpp
View file

@ -605,9 +605,6 @@ private:
void SaveDownloadQueue();
void RestoreDownloadQueue();
Status CountryStatusWithoutFailed(CountryId const & countryId) const;
Status CountryStatusFull(CountryId const & countryId, Status const status) const;
// Modifies file set of file to deletion - always adds (marks for
// removal) a routing file when map file is marked for deletion.
MapOptions NormalizeDeleteFileSet(MapOptions options) const;