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

build fixes + small renaming

Browse source
This commit is contained in:
Arsentiy Milchakov 2017-08-18 15:52:42 +03:00 • committed by Vladimir Byko-Ianko
parent 2e461cd292
commit 59bac12fa5
14 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/jni/Android.mk
View file

@ -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))))

1
map/map_tests/CMakeLists.txt
View file

@ -38,6 +38,7 @@ omim_link_libraries(
local_ads
platform
editor
mwm_diff
geometry
coding
base

1
openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt
View file

@ -44,6 +44,7 @@ omim_link_libraries(
local_ads
platform
editor
mwm_diff
geometry
coding
base

8
platform/local_country_file_utils.cpp
View file

@ -331,15 +331,15 @@ shared_ptr<LocalCountryFile> PreparePlaceForCountryFiles(int64_t version, string
return make_shared<LocalCountryFile>(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);

1
search/search_integration_tests/CMakeLists.txt
View file

@ -30,6 +30,7 @@ omim_link_libraries(
indexer
editor
platform
mwm_diff
geometry
coding
base

4
search/search_quality/assessment_tool/CMakeLists.txt
View file

@ -51,7 +51,9 @@ omim_link_libraries(
partners_api
local_ads
platform
editor geometry
editor
mwm_diff
geometry
coding
base
expat

3
search/search_quality/features_collector_tool/CMakeLists.txt
View file

@ -15,8 +15,9 @@ omim_link_libraries(
indexer
editor
platform
coding
mwm_diff
geometry
coding
base
oauthcpp
gflags

3
search/search_quality/search_quality_tool/CMakeLists.txt
View file

@ -16,8 +16,9 @@ omim_link_libraries(
indexer
editor
platform
coding
mwm_diff
geometry
coding
base
oauthcpp
gflags

4
storage/diff_scheme/diff_manager.cpp
View file

@ -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);
});
});
}

4
storage/queued_country.hpp
View file

@ -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; }

16
storage/storage.cpp
View file

@ -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<string> 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

1
storage/storage_integration_tests/CMakeLists.txt
View file

@ -36,6 +36,7 @@ omim_link_libraries(
platform
editor
opening_hours
mwm_diff
geometry
coding
base

1
storage/storage_tests/CMakeLists.txt
View file

@ -41,6 +41,7 @@ omim_link_libraries(
oauthcpp
platform
opening_hours
mwm_diff
geometry
coding
base

1
track_analyzing/track_analyzer/CMakeLists.txt
View file

@ -26,6 +26,7 @@ omim_link_libraries(
indexer
editor
platform
mwm_diff
geometry
coding
base