kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[generator] Fixed for current code.

Browse source
This commit is contained in:
Maksim Andrianov 2019-08-15 13:09:39 +03:00 • committed by gmoryes
parent 067ad8ef36
commit 5f08aa0daf
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
generator/osm_source.cpp
View file

@ -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);

2
generator/osm_source.hpp
View file

@ -47,7 +47,7 @@ public:
cache::IntermediateDataReader & GetReader();
private:
cache::IntermediateDataReader m_reader;
std::unique_ptr<cache::IntermediateData> m_reader;
};
class CacheLoader