From 6da0a8568f9537f524df418fb013c0a234915df4 Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Wed, 2 Oct 2019 14:41:41 +0300 Subject: [PATCH] [storage] got rid using MapOptions::MapWithCarRouting option --- .../srtm_coverage_checker.cpp | 2 +- generator/utils.cpp | 2 +- platform/country_file.cpp | 1 - .../platform_tests/country_file_tests.cpp | 2 +- .../local_country_file_tests.cpp | 7 +++--- storage/storage.cpp | 7 +++--- .../download_calc_size_test.cpp | 2 +- storage/storage_tests/storage_tests.cpp | 23 +++++-------------- 8 files changed, 16 insertions(+), 30 deletions(-) diff --git a/generator/srtm_coverage_checker/srtm_coverage_checker.cpp b/generator/srtm_coverage_checker/srtm_coverage_checker.cpp index 496e8b0915..4eba5c5194 100644 --- a/generator/srtm_coverage_checker/srtm_coverage_checker.cpp +++ b/generator/srtm_coverage_checker/srtm_coverage_checker.cpp @@ -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; diff --git a/generator/utils.cpp b/generator/utils.cpp index 34aef7aa08..49ead94f6c 100644 --- a/generator/utils.cpp +++ b/generator/utils.cpp @@ -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); diff --git a/platform/country_file.cpp b/platform/country_file.cpp index 3903a827e8..0427cc6914 100644 --- a/platform/country_file.cpp +++ b/platform/country_file.cpp @@ -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; diff --git a/platform/platform_tests/country_file_tests.cpp b/platform/platform_tests/country_file_tests.cpp index 4883b6d2c9..8513e9fb84 100644 --- a/platform/platform_tests/country_file_tests.cpp +++ b/platform/platform_tests/country_file_tests.cpp @@ -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, ()); diff --git a/platform/platform_tests/local_country_file_tests.cpp b/platform/platform_tests/local_country_file_tests.cpp index df43bcbaf6..78e442ab99 100644 --- a/platform/platform_tests/local_country_file_tests.cpp +++ b/platform/platform_tests/local_country_file_tests.cpp @@ -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(); diff --git a/storage/storage.cpp b/storage/storage.cpp index 3b6fb959ed..37156e2f32 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -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); } diff --git a/storage/storage_integration_tests/download_calc_size_test.cpp b/storage/storage_integration_tests/download_calc_size_test.cpp index 9c4284dad9..62b64e3c3d 100644 --- a/storage/storage_integration_tests/download_calc_size_test.cpp +++ b/storage/storage_integration_tests/download_calc_size_test.cpp @@ -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, diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp index 653e22e73a..019dc0bcf1 100644 --- a/storage/storage_tests/storage_tests.cpp +++ b/storage/storage_tests/storage_tests.cpp @@ -404,17 +404,6 @@ unique_ptr AbsentCountryDownloaderChecker(Storage & st vector{Status::ENotDownloaded, Status::EDownloading, Status::EOnDisk}); } -// Checks following state transitions: -// OnDisk -> Downloading -> OnDisk. -unique_ptr PresentCountryDownloaderChecker(Storage & storage, - CountryId const & countryId, - MapOptions files) -{ - return make_unique( - storage, countryId, files, - vector{Status::EOnDisk, Status::EDownloading, Status::EOnDisk}); -} - // Checks following state transitions: // NotDownloaded -> InQueue -> Downloading -> OnDisk. unique_ptr 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 uruguayChecker = make_unique( - storage, uruguayCountryId, MapOptions::MapWithCarRouting, + storage, uruguayCountryId, MapOptions::Map, vector{Status::ENotDownloaded, Status::EDownloading, Status::ENotDownloaded}); // Venezuela should pass through the following states: // NotDownloaded -> InQueue (Venezuela is added after Uruguay) -> Downloading -> NotDownloaded. unique_ptr venezuelaChecker = make_unique( - storage, venezuelaCountryId, MapOptions::MapWithCarRouting, + storage, venezuelaCountryId, MapOptions::Map, vector{Status::ENotDownloaded, Status::EInQueue, Status::EDownloading, Status::ENotDownloaded}); uruguayChecker->StartDownload();