Print mwm scales in benchmark_tool.

1 files changed, 12 insertions, 24 deletions

diff --git a/indexer/data_factory.cpp b/indexer/data_factory.cpp
index 3b0d466cf5..6ae76cfe8a 100644
--- a/indexer/data_factory.cpp
+++ b/indexer/data_factory.cpp
@@ -12,22 +12,24 @@
 #include "../base/start_mem_debug.hpp"
 
 
-namespace
+void LoadMapHeader(FilesContainerR const & cont, feature::DataHeader & header)
 {
-  void LoadHeader(FilesContainerR const & cont, feature::DataHeader & header)
-  {
-    ModelReaderPtr r = cont.GetReader(HEADER_FILE_TAG);
+  ModelReaderPtr r = cont.GetReader(HEADER_FILE_TAG);
 
-    if (cont.IsReaderExist(VERSION_FILE_TAG))
-      header.Load(r);
-    else
-      header.LoadVer1(r);
-  }
+  if (cont.IsReaderExist(VERSION_FILE_TAG))
+    header.Load(r);
+  else
+    header.LoadVer1(r);
+}
+
+void LoadMapHeader(ModelReader * pReader, feature::DataHeader & header)
+{
+  LoadMapHeader(FilesContainerR(pReader), header);
 }
 
 void IndexFactory::Load(FilesContainerR const & cont)
 {
-  LoadHeader(cont, m_header);
+  LoadMapHeader(cont, m_header);
 }
 
 IntervalIndexIFace * IndexFactory::CreateIndex(ModelReaderPtr reader)
@@ -49,17 +51,3 @@ IntervalIndexIFace * IndexFactory::CreateIndex(ModelReaderPtr reader)
 
   return p;
 }
-
-m2::RectD GetMapBounds(FilesContainerR const & cont)
-{
-  feature::DataHeader header;
-  LoadHeader(cont, header);
-  return header.GetBounds();
-}
-
-pair<int, int> GetMapScaleRange(FilesContainerR const & cont)
-{
-  feature::DataHeader header;
-  LoadHeader(cont, header);
-  return header.GetScaleRange();
-}