Simplified feature::DataHeader routine.

1 files changed, 4 insertions, 13 deletions

diff --git a/indexer/features_vector.cpp b/indexer/features_vector.cpp
index a070f6286b..32bdab3adc 100644
--- a/indexer/features_vector.cpp
+++ b/indexer/features_vector.cpp
@@ -3,6 +3,8 @@
 #include "mwm_version.hpp"
 #include "data_factory.hpp"
 
+#include "platform/constants.hpp"
+
 
 void FeaturesVector::GetByIndex(uint32_t ind, FeatureType & ft) const
 {
@@ -13,23 +15,12 @@ void FeaturesVector::GetByIndex(uint32_t ind, FeatureType & ft) const
 
 
 FeaturesVectorTest::FeaturesVectorTest(string const & filePath)
-  : m_cont(filePath), m_initializer(this), m_vector(m_cont, m_header, 0)
+  : FeaturesVectorTest((FilesContainerR(filePath, READER_CHUNK_LOG_SIZE, READER_CHUNK_LOG_COUNT)))
 {
-  Init();
 }
 
 FeaturesVectorTest::FeaturesVectorTest(FilesContainerR const & cont)
-  : m_cont(cont), m_initializer(this), m_vector(m_cont, m_header, 0)
-{
-  Init();
-}
-
-FeaturesVectorTest::Initializer::Initializer(FeaturesVectorTest * p)
-{
-  LoadMapHeader(p->m_cont, p->m_header);
-}
-
-void FeaturesVectorTest::Init()
+  : m_cont(cont), m_header(m_cont), m_vector(m_cont, m_header, 0)
 {
   if (m_header.GetFormat() >= version::v5)
     m_vector.m_table = feature::FeaturesOffsetsTable::CreateIfNotExistsAndLoad(m_cont).release();