From 5f08aa0daffcddff865607068c085205f5c0b594 Mon Sep 17 00:00:00 2001
From: Maksim Andrianov <maksimandrianov1@gmail.com>
Date: Thu, 15 Aug 2019 13:09:39 +0300
Subject: [PATCH] [generator] Fixed for current code.

---
 generator/osm_source.cpp | 9 +++------
 generator/osm_source.hpp | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp
index 542cbbd109..4f7488c8e7 100644
--- a/generator/osm_source.cpp
+++ b/generator/osm_source.cpp
@@ -232,14 +232,11 @@ bool GenerateRaw(feature::GenerateInfo & info, TranslatorInterface & translators
 }
 
 LoaderWrapper::LoaderWrapper(feature::GenerateInfo & info)
-  : m_reader(cache::CreatePointStorageReader(info.m_nodeStorageType, info.GetIntermediateFileName(NODES_FILE)), info)
-{
-  m_reader.LoadIndex();
-}
+  : m_reader(std::make_unique<cache::IntermediateData>(info, true /* forceReload */)) {}
 
 cache::IntermediateDataReader & LoaderWrapper::GetReader()
 {
-  return m_reader;
+  return *m_reader->GetCache();
 }
 
 CacheLoader::CacheLoader(feature::GenerateInfo & info) : m_info(info) {}
@@ -258,7 +255,7 @@ bool GenerateIntermediateData(feature::GenerateInfo & info)
   {
     auto nodes = cache::CreatePointStorageWriter(info.m_nodeStorageType,
                                                  info.GetIntermediateFileName(NODES_FILE));
-    cache::IntermediateDataWriter cache(nodes, info);
+    cache::IntermediateDataWriter cache(*nodes, info);
     TownsDumper towns;
     SourceReader reader = info.m_osmFileName.empty() ? SourceReader() : SourceReader(info.m_osmFileName);
 
diff --git a/generator/osm_source.hpp b/generator/osm_source.hpp
index 4c9f436058..913b287367 100644
--- a/generator/osm_source.hpp
+++ b/generator/osm_source.hpp
@@ -47,7 +47,7 @@ public:
   cache::IntermediateDataReader & GetReader();
 
 private:
-  cache::IntermediateDataReader m_reader;
+  std::unique_ptr<cache::IntermediateData> m_reader;
 };
 
 class CacheLoader