diff options
| author | tatiana-yan <tatiana.kondakova@gmail.com> | 2019-09-04 13:42:32 +0300 |
|---|---|---|
| committer | mpimenov <mpimenov@users.noreply.github.com> | 2019-09-04 18:12:40 +0300 |
| commit | cd925ba45aed7ffc4cc86be005e925eab6042cbc (patch) | |
| tree | 58056865e2c96a18cedef6aa2c7330394eb02903 /indexer/mwm_set.cpp | |
| parent | 69c9c1e02e5f31ca1e0cc2436d46fa785204b955 (diff) | |
[indexer] Remove mwm version <=5 (July 2015) support.
Diffstat (limited to 'indexer/mwm_set.cpp')
| -rw-r--r-- | indexer/mwm_set.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/indexer/mwm_set.cpp b/indexer/mwm_set.cpp index c1130ee50e..8496c0c5b3 100644 --- a/indexer/mwm_set.cpp +++ b/indexer/mwm_set.cpp @@ -423,18 +423,14 @@ MwmValue::MwmValue(LocalCountryFile const & localFile) void MwmValue::SetTable(MwmInfoEx & info) { auto const version = GetHeader().GetFormat(); - if (version < version::Format::v5) - return; + CHECK_GREATER(version, version::Format::v5, ("Old maps should not be registered.")); m_table = info.m_table.lock(); - if (!m_table) - { - if (version == version::Format::v5) - m_table = feature::FeaturesOffsetsTable::CreateIfNotExistsAndLoad(m_file, m_cont); - else - m_table = feature::FeaturesOffsetsTable::Load(m_cont); - info.m_table = m_table; - } + if (m_table) + return; + + m_table = feature::FeaturesOffsetsTable::Load(m_cont); + info.m_table = m_table; } string DebugPrint(MwmSet::RegResult result) |