AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Add scales printing to --calc_statistics.

Browse source
This commit is contained in:
vng 2011-10-17 16:44:02 +03:00 • committed by Alex Zolotarev
parent 57b754ae45
commit 6c7afadd95
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
generator/statistics.cpp
View file

@ -5,6 +5,7 @@
#include "../indexer/feature_processor.hpp"
#include "../indexer/classificator.hpp"
#include "../indexer/feature_impl.hpp"
#include "../indexer/data_factory.hpp"
#include "../base/string_utils.hpp"
@ -19,23 +20,30 @@ using namespace feature;
namespace stats
{
void FileContainerStatistic(string const & fPath)
{
FilesContainerR cont(fPath);
{
feature::DataHeader header;
ModelReaderPtr reader(new FileReader(fPath));
LoadMapHeader(reader, header);
vector<string> tags;
tags.push_back(VERSION_FILE_TAG);
tags.push_back(HEADER_FILE_TAG);
tags.push_back(DATA_FILE_TAG);
for (int i = 0; i < ARRAY_SIZE(feature::g_arrCountryScales); ++i)
for (size_t i = 0; i < header.GetScalesCount(); ++i)
{
cout << header.GetScale(i) << " ";
tags.push_back(feature::GetTagForIndex(GEOMETRY_FILE_TAG, i));
tags.push_back(feature::GetTagForIndex(TRIANGLE_FILE_TAG, i));
}
cout << endl;
tags.push_back(INDEX_FILE_TAG);
tags.push_back(SEARCH_INDEX_FILE_TAG);
FilesContainerR cont(reader);
for (size_t i = 0; i < tags.size(); ++i)
{
cout << setw(7) << tags[i] << " : ";

4
indexer/data_factory.cpp
View file

@ -22,9 +22,9 @@ void LoadMapHeader(FilesContainerR const & cont, feature::DataHeader & header)
header.LoadVer1(r);
}
void LoadMapHeader(ModelReader * pReader, feature::DataHeader & header)
void LoadMapHeader(ModelReaderPtr const & reader, feature::DataHeader & header)
{
LoadMapHeader(FilesContainerR(pReader), header);
LoadMapHeader(FilesContainerR(reader), header);
}
void IndexFactory::Load(FilesContainerR const & cont)

2
indexer/data_factory.hpp
View file

@ -19,4 +19,4 @@ public:
IntervalIndexIFace * CreateIndex(ModelReaderPtr reader);
};
void LoadMapHeader(ModelReader * pReader, feature::DataHeader & header);
void LoadMapHeader(ModelReaderPtr const & reader, feature::DataHeader & header);