Skip to content

Commit 863ca99

Browse files
tatiana-yanmpimenov
authored andcommitted
[indexer] DataHeader: remove 2011 format support.
1 parent e089abd commit 863ca99

File tree

2 files changed

+2
-23
lines changed

2 files changed

+2
-23
lines changed

indexer/data_header.cpp

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,8 @@ namespace feature
110110
ModelReaderPtr headerReader = cont.GetReader(HEADER_FILE_TAG);
111111
version::MwmVersion version;
112112

113-
if (version::ReadVersion(cont, version))
114-
Load(headerReader, version.GetFormat());
115-
else
116-
LoadV1(headerReader);
113+
CHECK(version::ReadVersion(cont, version), ());
114+
Load(headerReader, version.GetFormat());
117115
}
118116

119117
void DataHeader::Load(ModelReaderPtr const & r, version::Format format)
@@ -140,24 +138,6 @@ namespace feature
140138
// Place all new serializable staff here.
141139
}
142140

143-
void DataHeader::LoadV1(ModelReaderPtr const & r)
144-
{
145-
ReaderSource<ModelReaderPtr> src(r);
146-
int64_t const base = ReadPrimitiveFromSource<int64_t>(src);
147-
m_codingParams = serial::GeometryCodingParams(kPointCoordBits, base);
148-
149-
m_bounds.first = ReadVarInt<int64_t>(src) + base;
150-
m_bounds.second = ReadVarInt<int64_t>(src) + base;
151-
152-
uint32_t const count = 4;
153-
m_scales.resize(count);
154-
src.Read(m_scales.data(), count);
155-
156-
m_type = MapType::Country;
157-
158-
m_format = version::Format::v1;
159-
}
160-
161141
string DebugPrint(DataHeader::MapType type)
162142
{
163143
switch (type)

indexer/data_header.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ namespace feature
8383
/// Use lastFormat as a default value for indexes building.
8484
/// Pass the valid format from mwm in all other cases.
8585
void Load(ModelReaderPtr const & r, version::Format format);
86-
void LoadV1(ModelReaderPtr const & r);
8786

8887
version::Format m_format = version::Format::unknownFormat;
8988
MapType m_type = MapType::World;

0 commit comments

Comments
 (0)