Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-02-03 10:44:23 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:21:34 +0300
commitaaf72a9864498fa04324e64c804cfff1f8445cdb (patch)
tree8d27213ca2304cc0869074501c3bd5a4b1bcccb0 /platform
parent73e84d9c8b5eb091b1ee19aa4731881c3eb17efb (diff)
[new downloader] Fixing routing tests. Compatability local_country_files with two components mwms.
Diffstat (limited to 'platform')
-rw-r--r--platform/local_country_file.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/platform/local_country_file.cpp b/platform/local_country_file.cpp
index 87ecc94cca..b643df6540 100644
--- a/platform/local_country_file.cpp
+++ b/platform/local_country_file.cpp
@@ -33,12 +33,14 @@ void LocalCountryFile::SyncWithDisk()
m_files = MapOptions::Nothing;
m_mapSize = 0;
m_routingSize = 0;
-
Platform & platform = GetPlatform();
if (platform.GetFileSizeByFullPath(GetPath(MapOptions::Map), m_mapSize))
m_files = SetOptions(m_files, MapOptions::Map);
+ if (version::IsSingleMwm(GetVersion()))
+ return;
+
string const routingPath = GetPath(MapOptions::CarRouting);
if (platform.GetFileSizeByFullPath(routingPath, m_routingSize))
m_files = SetOptions(m_files, MapOptions::CarRouting);
@@ -69,8 +71,9 @@ uint32_t LocalCountryFile::GetSize(MapOptions filesMask) const
uint64_t size64 = 0;
if (HasOptions(filesMask, MapOptions::Map))
size64 += m_mapSize;
- if (HasOptions(filesMask, MapOptions::CarRouting))
+ if (!version::IsSingleMwm(GetVersion()) && HasOptions(filesMask, MapOptions::CarRouting))
size64 += m_routingSize;
+
uint32_t const size32 = static_cast<uint32_t>(size64);
ASSERT_EQUAL(size32, size64, ());
return size32;