diff --git a/indexer/data_header.cpp b/indexer/data_header.cpp index a4d3b3c1977..61a5dcc49ef 100644 --- a/indexer/data_header.cpp +++ b/indexer/data_header.cpp @@ -110,10 +110,8 @@ namespace feature ModelReaderPtr headerReader = cont.GetReader(HEADER_FILE_TAG); version::MwmVersion version; - if (version::ReadVersion(cont, version)) - Load(headerReader, version.GetFormat()); - else - LoadV1(headerReader); + CHECK(version::ReadVersion(cont, version), ()); + Load(headerReader, version.GetFormat()); } void DataHeader::Load(ModelReaderPtr const & r, version::Format format) @@ -140,24 +138,6 @@ namespace feature // Place all new serializable staff here. } - void DataHeader::LoadV1(ModelReaderPtr const & r) - { - ReaderSource src(r); - int64_t const base = ReadPrimitiveFromSource(src); - m_codingParams = serial::GeometryCodingParams(kPointCoordBits, base); - - m_bounds.first = ReadVarInt(src) + base; - m_bounds.second = ReadVarInt(src) + base; - - uint32_t const count = 4; - m_scales.resize(count); - src.Read(m_scales.data(), count); - - m_type = MapType::Country; - - m_format = version::Format::v1; - } - string DebugPrint(DataHeader::MapType type) { switch (type) diff --git a/indexer/data_header.hpp b/indexer/data_header.hpp index 764e7acbd54..dcfea3bc6b5 100644 --- a/indexer/data_header.hpp +++ b/indexer/data_header.hpp @@ -83,7 +83,6 @@ namespace feature /// Use lastFormat as a default value for indexes building. /// Pass the valid format from mwm in all other cases. void Load(ModelReaderPtr const & r, version::Format format); - void LoadV1(ModelReaderPtr const & r); version::Format m_format = version::Format::unknownFormat; MapType m_type = MapType::World;