Review fixes.

1 files changed, 8 insertions, 6 deletions

diff --git a/indexer/altitude_loader.hpp b/indexer/altitude_loader.hpp
index cd2d1efbb4..4588e620c9 100644
--- a/indexer/altitude_loader.hpp
+++ b/indexer/altitude_loader.hpp
@@ -2,27 +2,29 @@
 #include "indexer/feature_altitude.hpp"
 #include "indexer/index.hpp"
 
-#include "3party/succinct/rs_bit_vector.hpp"
-
 #include "std/unique_ptr.hpp"
 #include "std/vector.hpp"
 
+#include "3party/succinct/rs_bit_vector.hpp"
+
 namespace feature
 {
 class AltitudeLoader
 {
 public:
-  explicit AltitudeLoader(MwmValue const * mwmValue);
+  explicit AltitudeLoader(MwmValue const & mwmValue);
 
-  TAltitudes GetAltitude(uint32_t featureId, size_t pointCount) const;
+  TAltitudes const & GetAltitudes(uint32_t featureId, size_t pointCount) const;
   bool IsAvailable() const;
 
 private:
   vector<char> m_altitudeAvailabilitBuf;
   vector<char> m_featureTableBuf;
-  unique_ptr<succinct::rs_bit_vector> m_altitudeAvailability;
-  unique_ptr<succinct::elias_fano> m_featureTable;
+  succinct::rs_bit_vector m_altitudeAvailability;
+  succinct::elias_fano m_featureTable;
   unique_ptr<FilesContainerR::TReader> m_reader;
+  mutable map<uint32_t, TAltitudes> m_cache;
+  TAltitudes const m_dummy;
   AltitudeHeader m_header;
 };
 } // namespace feature