diff options
| author | vng <viktor.govako@gmail.com> | 2011-03-14 11:10:19 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:13:34 +0300 |
| commit | 221d3d99da351bddd4c82f9fc553737eb458025f (patch) | |
| tree | c45c9981941fec357f910fd7dae65d0ec484f1fd /indexer/index.hpp | |
| parent | 25ea1267b48898b89681b93a5f371232fc79b711 (diff) | |
Refactoring of feature::DataHeader.
Added base point and scales array to header.
World and country generation now have different scale ranges.
Diffstat (limited to 'indexer/index.hpp')
| -rw-r--r-- | indexer/index.hpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indexer/index.hpp b/indexer/index.hpp index 549e9421aa..70a0a9f125 100644 --- a/indexer/index.hpp +++ b/indexer/index.hpp @@ -2,7 +2,6 @@ #include "cell_id.hpp" #include "covering.hpp" #include "data_header.hpp" -#include "data_header_reader.hpp" #include "features_vector.hpp" #include "scale_index.hpp" #include "scales.hpp" @@ -12,7 +11,6 @@ #include "../geometry/rect2d.hpp" #include "../coding/file_container.hpp" -//#include "../coding/varint.hpp" #include "../base/base.hpp" #include "../base/macros.hpp" @@ -220,8 +218,8 @@ private: { // TODO: If path is cellid-style-square, make rect from cellid and don't open the file. feature::DataHeader header; - feature::ReadDataHeader(path, header); - m_Rect = header.Bounds(); + header.Load(FilesContainerR(path).GetReader(HEADER_FILE_TAG)); + m_Rect = header.GetBounds(); } // TODO: GetIndex(), Open() and Close() make Index single-threaded! |