diff options
author | vng <viktor.govako@gmail.com> | 2014-10-08 19:23:23 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:29:46 +0300 |
commit | 6defa5228a6768d54824460c1582da71371783e1 (patch) | |
tree | 9f31d129dfd787e1e0136b8cd629d1d563f0df04 /map/active_maps_layout.cpp | |
parent | b7c53102fb0e32ca343a7e782ceb1c2b2a26bf0a (diff) |
[storage] Do download .routing file.
Diffstat (limited to 'map/active_maps_layout.cpp')
-rw-r--r-- | map/active_maps_layout.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/map/active_maps_layout.cpp b/map/active_maps_layout.cpp index 036ac5bed1..02c913a115 100644 --- a/map/active_maps_layout.cpp +++ b/map/active_maps_layout.cpp @@ -146,10 +146,7 @@ TStatus ActiveMapsLayout::GetCountryStatus(TIndex const & index) const if (item != nullptr) return item->m_status; - TStatus status; - TMapOptions options; - GetStorage().CountryStatusEx(index, status, options); - return status; + return GetStorage().CountryStatusEx(index); } TMapOptions ActiveMapsLayout::GetCountryOptions(TGroup const & group, int position) const @@ -172,14 +169,14 @@ TMapOptions ActiveMapsLayout::GetCountryOptions(TIndex const & index) const LocalAndRemoteSizeT const ActiveMapsLayout::GetDownloadableCountrySize(TGroup const & group, int position) const { Item const & item = GetItemInGroup(group, position); - return GetStorage().CountrySizeInBytesEx(item.m_index, item.m_downloadRequest); + return GetStorage().CountrySizeInBytes(item.m_index, item.m_downloadRequest); } LocalAndRemoteSizeT const ActiveMapsLayout::GetDownloadableCountrySize(TIndex const & index) const { Item const * item = FindItem(index); ASSERT(item, ()); - return GetStorage().CountrySizeInBytesEx(index, item->m_downloadRequest); + return GetStorage().CountrySizeInBytes(index, item->m_downloadRequest); } LocalAndRemoteSizeT const ActiveMapsLayout::GetCountrySize(TGroup const & group, int position, @@ -190,7 +187,7 @@ LocalAndRemoteSizeT const ActiveMapsLayout::GetCountrySize(TGroup const & group, LocalAndRemoteSizeT const ActiveMapsLayout::GetCountrySize(TIndex const & index, TMapOptions const & options) const { - return GetStorage().CountrySizeInBytesEx(index, options); + return GetStorage().CountrySizeInBytes(index, options); } int ActiveMapsLayout::AddListener(ActiveMapsListener * listener) |