diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 597bb7cd5f..d3159fc45f 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -26,8 +26,8 @@ define add_prebuild_static_lib endef prebuild_static_libs := map tracking routing traffic routing_common drape_frontend search storage -prebuild_static_libs += ugc indexer drape platform editor partners_api local_ads geometry coding base -prebuild_static_libs += opening_hours pugixml oauthcpp expat freetype minizip jansson +prebuild_static_libs += ugc indexer drape platform editor partners_api local_ads mwm_diff geometry +prebuild_static_libs += coding base opening_hours pugixml oauthcpp expat freetype minizip jansson prebuild_static_libs += protobuf osrm stats_client succinct stb_image sdf_image icu agg $(foreach item,$(prebuild_static_libs),$(eval $(call add_prebuild_static_lib,$(item)))) diff --git a/map/map_tests/CMakeLists.txt b/map/map_tests/CMakeLists.txt index cfdc528b2c..6f5752e391 100644 --- a/map/map_tests/CMakeLists.txt +++ b/map/map_tests/CMakeLists.txt @@ -38,6 +38,7 @@ omim_link_libraries( local_ads platform editor + mwm_diff geometry coding base diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt index 8b08732e31..549279852e 100644 --- a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt +++ b/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt @@ -44,6 +44,7 @@ omim_link_libraries( local_ads platform editor + mwm_diff geometry coding base diff --git a/platform/local_country_file_utils.cpp b/platform/local_country_file_utils.cpp index d1ebda1f1c..b25809a4a4 100644 --- a/platform/local_country_file_utils.cpp +++ b/platform/local_country_file_utils.cpp @@ -331,15 +331,15 @@ shared_ptr PreparePlaceForCountryFiles(int64_t version, string return make_shared(directory, countryFile, version); } -string GetFileDownloadPath(int64_t version, CountryFile const & countryFile, MapOptions file) +string GetFileDownloadPath(int64_t version, CountryFile const & countryFile, MapOptions options) { - return GetFileDownloadPath(version, string(), countryFile, file); + return GetFileDownloadPath(version, string(), countryFile, options); } string GetFileDownloadPath(int64_t version, string const & dataDir, - CountryFile const & countryFile, MapOptions file) + CountryFile const & countryFile, MapOptions options) { - string const readyFile = GetFileName(countryFile.GetName(), file, version) + READY_FILE_EXTENSION; + string const readyFile = GetFileName(countryFile.GetName(), options, version) + READY_FILE_EXTENSION; string const dir = GetDataDirFullPath(dataDir); if (version == 0) return my::JoinFoldersToPath(dir, readyFile); diff --git a/search/search_integration_tests/CMakeLists.txt b/search/search_integration_tests/CMakeLists.txt index 6461b8b283..cb782e4905 100644 --- a/search/search_integration_tests/CMakeLists.txt +++ b/search/search_integration_tests/CMakeLists.txt @@ -30,6 +30,7 @@ omim_link_libraries( indexer editor platform + mwm_diff geometry coding base diff --git a/search/search_quality/assessment_tool/CMakeLists.txt b/search/search_quality/assessment_tool/CMakeLists.txt index 9b5f214a99..c6ae15c9ce 100644 --- a/search/search_quality/assessment_tool/CMakeLists.txt +++ b/search/search_quality/assessment_tool/CMakeLists.txt @@ -51,7 +51,9 @@ omim_link_libraries( partners_api local_ads platform - editor geometry + editor + mwm_diff + geometry coding base expat diff --git a/search/search_quality/features_collector_tool/CMakeLists.txt b/search/search_quality/features_collector_tool/CMakeLists.txt index 452244462d..d4dfd98ab9 100644 --- a/search/search_quality/features_collector_tool/CMakeLists.txt +++ b/search/search_quality/features_collector_tool/CMakeLists.txt @@ -15,8 +15,9 @@ omim_link_libraries( indexer editor platform - coding + mwm_diff geometry + coding base oauthcpp gflags diff --git a/search/search_quality/search_quality_tool/CMakeLists.txt b/search/search_quality/search_quality_tool/CMakeLists.txt index ab3ab0e367..5d06e5353b 100644 --- a/search/search_quality/search_quality_tool/CMakeLists.txt +++ b/search/search_quality/search_quality_tool/CMakeLists.txt @@ -16,8 +16,9 @@ omim_link_libraries( indexer editor platform - coding + mwm_diff geometry + coding base oauthcpp gflags diff --git a/storage/diff_scheme/diff_manager.cpp b/storage/diff_scheme/diff_manager.cpp index bf64f62389..a8180c8f6b 100644 --- a/storage/diff_scheme/diff_manager.cpp +++ b/storage/diff_scheme/diff_manager.cpp @@ -38,10 +38,10 @@ void Manager::Load(LocalMapsInfo && info) m_status = Status::Available; } - auto const & observers = m_observers; + auto & observers = m_observers; GetPlatform().RunOnGuiThread([observers]() mutable { - //observers.ForEach(&Observer::OnDiffStatusReceived); + observers.ForEach(&Observer::OnDiffStatusReceived); }); }); } diff --git a/storage/queued_country.hpp b/storage/queued_country.hpp index 0747fe018d..7af9a31fb8 100644 --- a/storage/queued_country.hpp +++ b/storage/queued_country.hpp @@ -22,8 +22,8 @@ public: inline TCountryId const & GetCountryId() const { return m_countryId; } inline MapOptions GetInitOptions() const { return m_init; } - inline MapOptions GetCurrentFile() const { return m_current; } - inline MapOptions GetDownloadedFiles() const { return UnsetOptions(m_init, m_left); } + inline MapOptions GetCurrentFileOptions() const { return m_current; } + inline MapOptions GetDownloadedFilesOptions() const { return UnsetOptions(m_init, m_left); } inline bool operator==(TCountryId const & countryId) const { return m_countryId == countryId; } diff --git a/storage/storage.cpp b/storage/storage.cpp index bdb7530a65..7badee1d5f 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -358,7 +358,7 @@ TLocalAndRemoteSize Storage::CountrySizeInBytes(TCountryId const & countryId, Ma { sizes.first = m_downloader->GetDownloadingProgress().first + - GetRemoteSize(countryFile, queuedCountry->GetDownloadedFiles(), GetCurrentDataVersion()); + GetRemoteSize(countryFile, queuedCountry->GetDownloadedFilesOptions(), GetCurrentDataVersion()); } return sizes; } @@ -614,7 +614,7 @@ void Storage::DownloadNextFile(QueuedCountry const & country) TCountryId const & countryId = country.GetCountryId(); CountryFile const & countryFile = GetCountryFile(countryId); - string const filePath = GetFileDownloadPath(countryId, country.GetCurrentFile()); + string const filePath = GetFileDownloadPath(countryId, country.GetCurrentFileOptions()); uint64_t size; // It may happen that the file already was downloaded, so there're @@ -801,7 +801,7 @@ void Storage::OnServerListDownloaded(vector const & urls) fileUrls.push_back(GetFileDownloadUrl(url, queuedCountry)); string const filePath = - GetFileDownloadPath(queuedCountry.GetCountryId(), queuedCountry.GetCurrentFile()); + GetFileDownloadPath(queuedCountry.GetCountryId(), queuedCountry.GetCurrentFileOptions()); m_downloader->DownloadMapFile(fileUrls, filePath, GetDownloadSize(queuedCountry), bind(&Storage::OnMapFileDownloadFinished, this, _1, _2), bind(&Storage::OnMapFileDownloadProgress, this, _1)); @@ -941,7 +941,7 @@ string Storage::GetFileDownloadUrl(string const & baseUrl, auto const & countryId = queuedCountry.GetCountryId(); CountryFile const & countryFile = GetCountryFile(countryId); - auto const currentFileOpt = queuedCountry.GetCurrentFile(); + auto const currentFileOpt = queuedCountry.GetCurrentFileOptions(); string const fileName = GetFileName(countryFile.GetName(), currentFileOpt, GetCurrentDataVersion()); @@ -1164,7 +1164,7 @@ bool Storage::DeleteCountryFilesFromDownloader(TCountryId const & countryId, Map if (IsCountryFirstInQueue(countryId)) { // Abrupt downloading of the current file if it should be removed. - if (HasOptions(opt, queuedCountry->GetCurrentFile())) + if (HasOptions(opt, queuedCountry->GetCurrentFileOptions())) m_downloader->Reset(); // Remove all files downloader had been created for a country. @@ -1208,13 +1208,13 @@ uint64_t Storage::GetDownloadSize(QueuedCountry const & queuedCountry) const return m_diffManager.InfoFor(countryId).m_size; CountryFile const & file = GetCountryFile(countryId); - return GetRemoteSize(file, queuedCountry.GetCurrentFile(), GetCurrentDataVersion()); + return GetRemoteSize(file, queuedCountry.GetCurrentFileOptions(), GetCurrentDataVersion()); } -string Storage::GetFileDownloadPath(TCountryId const & countryId, MapOptions file) const +string Storage::GetFileDownloadPath(TCountryId const & countryId, MapOptions options) const { return platform::GetFileDownloadPath(GetCurrentDataVersion(), m_dataDir, - GetCountryFile(countryId), file); + GetCountryFile(countryId), options); } bool Storage::CheckFailedCountries(TCountriesVec const & countries) const diff --git a/storage/storage_integration_tests/CMakeLists.txt b/storage/storage_integration_tests/CMakeLists.txt index cf504745bc..505e5733f4 100644 --- a/storage/storage_integration_tests/CMakeLists.txt +++ b/storage/storage_integration_tests/CMakeLists.txt @@ -36,6 +36,7 @@ omim_link_libraries( platform editor opening_hours + mwm_diff geometry coding base diff --git a/storage/storage_tests/CMakeLists.txt b/storage/storage_tests/CMakeLists.txt index 1ecd39928f..be98bc6e3d 100644 --- a/storage/storage_tests/CMakeLists.txt +++ b/storage/storage_tests/CMakeLists.txt @@ -41,6 +41,7 @@ omim_link_libraries( oauthcpp platform opening_hours + mwm_diff geometry coding base diff --git a/track_analyzing/track_analyzer/CMakeLists.txt b/track_analyzing/track_analyzer/CMakeLists.txt index 16d79f4a59..367c9e8512 100644 --- a/track_analyzing/track_analyzer/CMakeLists.txt +++ b/track_analyzing/track_analyzer/CMakeLists.txt @@ -26,6 +26,7 @@ omim_link_libraries( indexer editor platform + mwm_diff geometry coding base