Implementation index for altitude data with the help of succinct strutures.

1 files changed, 17 insertions, 9 deletions

diff --git a/indexer/altitude_loader.hpp b/indexer/altitude_loader.hpp
index d792b28467..d7a27785de 100644
--- a/indexer/altitude_loader.hpp
+++ b/indexer/altitude_loader.hpp
@@ -2,24 +2,32 @@
 #include "indexer/feature_altitude.hpp"
 #include "indexer/index.hpp"
 
-#include "coding/dd_vector.hpp"
+#include "3party/succinct/rs_bit_vector.hpp"
+
+#include "std/unique_ptr.hpp"
+#include "std/vector.hpp"
 
 namespace feature
 {
+using TAltitudeSectionVersion = uint16_t;
+using TAltitudeSectionOffset = uint32_t;
+
 class AltitudeLoader
 {
 public:
   AltitudeLoader(MwmValue const * mwmValue);
-  Altitudes GetAltitudes(uint32_t featureId) const;
+
+  TAltitudes GetAltitude(uint32_t featureId, size_t pointCount) const;
 
 private:
-  struct TAltitudeIndexEntry
-  {
-    uint32_t featureId;
-    feature::TAltitude beginAlt;
-    feature::TAltitude endAlt;
-  };
+  void DeserializeHeader(ReaderSource<FilesContainerR::TReader> & rs);
 
-  unique_ptr<DDVector<TAltitudeIndexEntry, FilesContainerR::TReader>> m_idx;
+  vector<char> m_altitudeAvailabilitBuf;
+  vector<char> m_featureTableBuf;
+  unique_ptr<succinct::rs_bit_vector> m_altitudeAvailability;
+  unique_ptr<succinct::elias_fano> m_featureTable;
+  FilesContainerR::TReader reader;
+  TAltitudeSectionOffset m_altitudeInfoOffset;
+  TAltitude m_minAltitude;
 };
 } // namespace feature