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

[storage] got rid using MapOptions::MapWithCarRouting option

Browse source
This commit is contained in:
Arsentiy Milchakov 2019-10-02 14:41:41 +03:00 • committed by mpimenov
parent a256d38b6d
commit 6da0a8568f
8 changed files with 16 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/srtm_coverage_checker/srtm_coverage_checker.cpp
View file

@ -59,7 +59,7 @@ int main(int argc, char * argv[])
for (auto & file : localFiles)
{
file.SyncWithDisk();
if (!file.OnDisk(MapOptions::MapWithCarRouting))
if (!file.OnDisk(MapOptions::Map))
{
LOG(LINFO, ("Warning! Routing file not found for:", file.GetCountryName()));
continue;

2
generator/utils.cpp
View file

@ -23,7 +23,7 @@ SingleMwmDataSource::SingleMwmDataSource(std::string const & mwmPath)
{
m_countryFile = platform::LocalCountryFile::MakeTemporary(mwmPath);
m_countryFile.SyncWithDisk();
CHECK(m_countryFile.OnDisk(MapOptions::MapWithCarRouting),
CHECK(m_countryFile.OnDisk(MapOptions::Map),
("No correct mwm corresponding to local country file:", m_countryFile, ". Path:", mwmPath));
auto const result = m_dataSource.Register(m_countryFile);

1
platform/country_file.cpp
View file

@ -20,7 +20,6 @@ string GetNameWithExt(string const & countryFile, MapOptions file)
switch (file)
{
case MapOptions::Map:
case MapOptions::MapWithCarRouting:
return countryFile + DATA_FILE_EXTENSION;
case MapOptions::Diff:
return countryFile + DIFF_FILE_EXTENSION;

2
platform/platform_tests/country_file_tests.cpp
View file

@ -30,7 +30,7 @@ UNIT_TEST(CountryFile_SmokeOneComponentMwm)
{
CountryFile countryFile("TestCountryOneComponent");
TEST_EQUAL("TestCountryOneComponent", countryFile.GetName(), ());
string const mapFileName = GetFileName(countryFile.GetName(), MapOptions::MapWithCarRouting,
string const mapFileName = GetFileName(countryFile.GetName(), MapOptions::Map,
version::FOR_TESTING_SINGLE_MWM1);
TEST_EQUAL("TestCountryOneComponent" DATA_FILE_EXTENSION, mapFileName, ());

7
platform/platform_tests/local_country_file_tests.cpp
View file

@ -79,12 +79,11 @@ UNIT_TEST(LocalCountryFile_Smoke)
TEST(!localFile.OnDisk(MapOptions::Map), ());
TEST(!localFile.OnDisk(MapOptions::Diff), ());
TEST(!localFile.OnDisk(MapOptions::MapWithCarRouting), ());
TEST_EQUAL("/test-dir", localFile.GetDirectory(), ());
TEST_EQUAL(0, localFile.GetSize(MapOptions::Map), ());
TEST_EQUAL(0, localFile.GetSize(MapOptions::MapWithCarRouting), ());
TEST_EQUAL(0, localFile.GetSize(MapOptions::Diff), ());
TEST_EQUAL(150309, localFile.GetVersion(), ());
}
@ -102,7 +101,7 @@ UNIT_TEST(LocalCountryFile_DiskFiles)
{
LocalCountryFile localFile(platform.WritableDir(), countryFile, version);
TEST(!localFile.OnDisk(MapOptions::Map), ());
TEST(!localFile.OnDisk(MapOptions::MapWithCarRouting), ());
TEST(!localFile.OnDisk(MapOptions::Diff), ());
string const mapFileName = GetFileName(countryFile.GetName(), MapOptions::Map,
version::FOR_TESTING_TWO_COMPONENT_MWM1);
@ -112,7 +111,7 @@ UNIT_TEST(LocalCountryFile_DiskFiles)
localFile.SyncWithDisk();
TEST(localFile.OnDisk(MapOptions::Map), ());
TEST(!localFile.OnDisk(MapOptions::MapWithCarRouting), ());
TEST(!localFile.OnDisk(MapOptions::Diff), ());
TEST_EQUAL(mapFileContents.size(), localFile.GetSize(MapOptions::Map), ());
localFile.SyncWithDisk();

7
storage/storage.cpp
View file

@ -154,7 +154,7 @@ void Storage::DeleteAllLocalMaps(CountriesVec * existedCountries /* = nullptr */
if (existedCountries)
existedCountries->push_back(localFiles.first);
localFile->SyncWithDisk();
DeleteFromDiskWithIndexes(*localFile, MapOptions::MapWithCarRouting);
DeleteFromDiskWithIndexes(*localFile, MapOptions::Map);
DeleteFromDiskWithIndexes(*localFile, MapOptions::Diff);
}
}
@ -1380,8 +1380,7 @@ void Storage::DownloadNode(CountryId const & countryId, bool isUpdate /* = false
if (descendantNode.ChildrenCount() == 0 &&
GetNodeStatus(descendantNode).status != NodeStatus::OnDisk)
{
DownloadCountry(descendantNode.Value().Name(),
isUpdate ? MapOptions::Diff : MapOptions::MapWithCarRouting);
DownloadCountry(descendantNode.Value().Name(), isUpdate ? MapOptions::Diff : MapOptions::Map);
}
};
@ -1400,7 +1399,7 @@ void Storage::DeleteNode(CountryId const & countryId)
auto deleteAction = [this](CountryTree::Node const & descendantNode) {
bool onDisk = m_localFiles.find(descendantNode.Value().Name()) != m_localFiles.end();
if (descendantNode.ChildrenCount() == 0 && onDisk)
this->DeleteCountry(descendantNode.Value().Name(), MapOptions::MapWithCarRouting);
this->DeleteCountry(descendantNode.Value().Name(), MapOptions::Map);
};
node->ForEachInSubtree(deleteAction);
}

2
storage/storage_integration_tests/download_calc_size_test.cpp
View file

@ -46,7 +46,7 @@ UNIT_TEST(DownloadingTests_CalcOverallProgress)
for (auto const &country : kTestCountries)
{
baseProgress.second += s.CountrySizeInBytes(country, MapOptions::MapWithCarRouting).second;
baseProgress.second += s.CountrySizeInBytes(country, MapOptions::Map).second;
}
auto progressChanged = [&s, &kTestCountries, &baseProgress](CountryId const & id,

23
storage/storage_tests/storage_tests.cpp
View file

@ -404,17 +404,6 @@ unique_ptr<CountryDownloaderChecker> AbsentCountryDownloaderChecker(Storage & st
vector<Status>{Status::ENotDownloaded, Status::EDownloading, Status::EOnDisk});
}
// Checks following state transitions:
// OnDisk -> Downloading -> OnDisk.
unique_ptr<CountryDownloaderChecker> PresentCountryDownloaderChecker(Storage & storage,
CountryId const & countryId,
MapOptions files)
{
return make_unique<CountryDownloaderChecker>(
storage, countryId, files,
vector<Status>{Status::EOnDisk, Status::EDownloading, Status::EOnDisk});
}
// Checks following state transitions:
// NotDownloaded -> InQueue -> Downloading -> OnDisk.
unique_ptr<CountryDownloaderChecker> QueuedCountryDownloaderChecker(Storage & storage,
@ -773,26 +762,26 @@ UNIT_CLASS_TEST(TwoComponentStorageTest, DownloadTwoCountriesAndDelete)
CountryId const uruguayCountryId = storage.FindCountryIdByFile("Uruguay");
TEST(IsCountryIdValid(uruguayCountryId), ());
storage.DeleteCountry(uruguayCountryId, MapOptions::MapWithCarRouting);
storage.DeleteCountry(uruguayCountryId, MapOptions::Map);
SCOPE_GUARD(cleanupUruguayFiles, bind(&Storage::DeleteCountry, &storage, uruguayCountryId,
MapOptions::MapWithCarRouting));
MapOptions::Map));
CountryId const venezuelaCountryId = storage.FindCountryIdByFile("Venezuela");
TEST(IsCountryIdValid(venezuelaCountryId), ());
storage.DeleteCountry(venezuelaCountryId, MapOptions::MapWithCarRouting);
storage.DeleteCountry(venezuelaCountryId, MapOptions::Map);
SCOPE_GUARD(cleanupVenezuelaFiles, bind(&Storage::DeleteCountry, &storage, venezuelaCountryId,
MapOptions::MapWithCarRouting));
MapOptions::Map));
{
// Map file will be deleted for Uruguay, thus, routing file should also be deleted. Therefore,
// Uruguay should pass through following states: NotDownloaded -> Downloading -> NotDownloaded.
unique_ptr<CountryDownloaderChecker> uruguayChecker = make_unique<CountryDownloaderChecker>(
storage, uruguayCountryId, MapOptions::MapWithCarRouting,
storage, uruguayCountryId, MapOptions::Map,
vector<Status>{Status::ENotDownloaded, Status::EDownloading, Status::ENotDownloaded});
// Venezuela should pass through the following states:
// NotDownloaded -> InQueue (Venezuela is added after Uruguay) -> Downloading -> NotDownloaded.
unique_ptr<CountryDownloaderChecker> venezuelaChecker = make_unique<CountryDownloaderChecker>(
storage, venezuelaCountryId, MapOptions::MapWithCarRouting,
storage, venezuelaCountryId, MapOptions::Map,
vector<Status>{Status::ENotDownloaded, Status::EInQueue, Status::EDownloading,
Status::ENotDownloaded});
uruguayChecker->StartDownload();