diff options
author | ExMix <rahuba.youri@mapswithme.com> | 2014-10-24 15:15:02 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:31:31 +0300 |
commit | bf964bf405abed523b6838f6d5583ce8d155b51b (patch) | |
tree | 3d4c3194d120705feffe7dfaaafc1204e95b174c /map/country_status_display.cpp | |
parent | 901928079d96bab401bb46dbf7f160950f0f7018 (diff) |
[core, android] reduce jni interface
Diffstat (limited to 'map/country_status_display.cpp')
-rw-r--r-- | map/country_status_display.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/map/country_status_display.cpp b/map/country_status_display.cpp index 8072728bb9..419ea1704b 100644 --- a/map/country_status_display.cpp +++ b/map/country_status_display.cpp @@ -346,16 +346,15 @@ void CountryStatusDisplay::SetContentForDownloadPropose() ASSERT(m_primaryButton->isVisible(), ()); ASSERT(m_secondaryButton->isVisible(), ()); - LocalAndRemoteSizeT mapOnlySize = m_activeMaps.GetCountrySize(m_countryIdx, TMapOptions::EMapOnly); - LocalAndRemoteSizeT withRouting = m_activeMaps.GetCountrySize(m_countryIdx, TMapOptions::EMapWithCarRouting); + LocalAndRemoteSizeT mapAndRoutingSize = m_activeMaps.GetRemoteCountrySizes(m_countryIdx); m_label->setText(m_displayMapName); uint64_t sizeToDownload; string units; - FormatMapSize(mapOnlySize.second, units, sizeToDownload); + FormatMapSize(mapAndRoutingSize.first, units, sizeToDownload); m_primaryButton->setText(FormatStatusMessage("country_status_download", &sizeToDownload, &units)); - FormatMapSize(withRouting.second, units, sizeToDownload); + FormatMapSize(mapAndRoutingSize.first + mapAndRoutingSize.second, units, sizeToDownload); m_secondaryButton->setText(FormatStatusMessage("country_status_download_routing", &sizeToDownload, &units)); } |