Add type of map (country, world, world coasts) to mwm header.

2 files changed, 18 insertions, 10 deletions

diff --git a/indexer/data_header.cpp b/indexer/data_header.cpp
index 0c193981d2..5b1c822e32 100644
--- a/indexer/data_header.cpp
+++ b/indexer/data_header.cpp
@@ -46,13 +46,12 @@ namespace feature
   {
     m_codingParams.Save(w);
 
-    //int64_t const base = m_codingParams.GetBasePointInt64();
-    //WriteVarInt(w, m_bounds.first - base);
-    //WriteVarInt(w, m_bounds.second - base);
-    WriteToSink(w, m_bounds.first);
-    WriteToSink(w, m_bounds.second);
+    WriteVarInt(w, m_bounds.first);
+    WriteVarInt(w, m_bounds.second);
 
     w.Write(m_scales.data(), m_scales.size());
+
+    WriteVarInt(w, static_cast<int32_t>(m_type));
   }
 
   void DataHeader::Load(ModelReaderPtr const & r)
@@ -60,14 +59,13 @@ namespace feature
     ReaderSource<ModelReaderPtr> src(r);
     m_codingParams.Load(src);
 
-    //int64_t const base = m_codingParams.GetBasePointInt64();
-    //m_bounds.first = ReadVarInt<int64_t>(src) + base;
-    //m_bounds.second = ReadVarInt<int64_t>(src) + base;
-    m_bounds.first = ReadPrimitiveFromSource<int64_t>(src);
-    m_bounds.second = ReadPrimitiveFromSource<int64_t>(src);
+    m_bounds.first = ReadVarInt<int64_t>(src);
+    m_bounds.second = ReadVarInt<int64_t>(src);
 
     src.Read(m_scales.data(), m_scales.size());
 
+    m_type = static_cast<MapType>(ReadVarInt<int32_t>(src));
+
     m_ver = v2;
   }
 
diff --git a/indexer/data_header.hpp b/indexer/data_header.hpp
index 20680864f2..afca6ce7e8 100644
--- a/indexer/data_header.hpp
+++ b/indexer/data_header.hpp
@@ -50,7 +50,17 @@ namespace feature
     };
     inline Version GetVersion() const { return m_ver; }
 
+    enum MapType {
+      world,
+      worldcoasts,
+      country
+    };
+
+    inline void SetType(MapType t) { m_type = t; }
+    inline MapType GetType() const { return m_type; }
+
   private:
     Version m_ver;
+    MapType m_type;
   };
 }