@@ -110,10 +110,8 @@ namespace feature
110
110
ModelReaderPtr headerReader = cont.GetReader (HEADER_FILE_TAG);
111
111
version::MwmVersion version;
112
112
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 ());
117
115
}
118
116
119
117
void DataHeader::Load (ModelReaderPtr const & r, version::Format format)
@@ -140,24 +138,6 @@ namespace feature
140
138
// Place all new serializable staff here.
141
139
}
142
140
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
-
161
141
string DebugPrint (DataHeader::MapType type)
162
142
{
163
143
switch (type)
0 commit comments