Refactoring of feature structure:

- multilanguage names
- separate house numbers
- point feature rank
- refs for linear features

1 files changed, 163 insertions, 0 deletions

diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp
new file mode 100644
index 0000000000..8686666940
--- /dev/null
+++ b/indexer/feature_data.hpp
@@ -0,0 +1,163 @@
+#pragma once
+
+#include "../coding/multilang_utf8_string.hpp"
+#include "../coding/value_opt_string.hpp"
+
+#include "../std/string.hpp"
+#include "../std/vector.hpp"
+
+
+namespace feature
+{
+  enum EGeomType
+  {
+    GEOM_UNDEFINED = -1,
+    GEOM_POINT = 0,
+    GEOM_LINE = 1,
+    GEOM_AREA = 2
+  };
+
+  enum EHeaderMask
+  {
+    HEADER_TYPE_MASK = 7U,
+    HEADER_HAS_NAME = 1U << 3,
+    HEADER_HAS_LAYER = 1U << 4,
+    HEADER_GEOTYPE_MASK = 3U << 5,
+    HEADER_HAS_ADDINFO = 1U << 7
+  };
+
+  enum EHeaderTypeMask
+  {
+    HEADER_GEOM_POINT = 0,
+    HEADER_GEOM_LINE = 1U << 5,
+    HEADER_GEOM_AREA = 1U << 6
+  };
+}
+
+/// Feature description struct.
+struct FeatureParamsBase
+{
+  StringUtf8Multilang name;
+  StringNumericOptimal house;
+  string ref;
+  int8_t layer;
+  uint8_t rank;
+
+  FeatureParamsBase() : layer(0), rank(0) {}
+
+  bool operator == (FeatureParamsBase const & rhs) const;
+
+  bool CheckValid() const;
+
+  string DebugString() const;
+
+  template <class TSink>
+  void Write(TSink & sink, uint8_t header, feature::EGeomType type) const
+  {
+    if (header & HEADER_HAS_NAME)
+      name.Write(sink);
+
+    if (header & HEADER_HAS_LAYER)
+      WriteToSink(sink, layer);
+
+    if (header & HEADER_HAS_ADDINFO)
+    {
+      switch (type)
+      {
+      case GEOM_POINT:
+        WriteToSink(sink, rank);
+        break;
+      case GEOM_LINE:
+        utils::WriteString(sink, ref);
+        break;
+      case GEOM_AREA:
+        house.Write(sink);
+        break;
+      }
+    }
+  }
+
+  template <class TSrc>
+  void Read(TSrc & src, uint8_t header, feature::EGeomType type)
+  {
+    if (header & HEADER_HAS_NAME)
+      name.Read(src);
+
+    if (header & HEADER_HAS_LAYER)
+      layer = ReadPrimitiveFromSource<int8_t>(src);
+
+    if (header & HEADER_HAS_ADDINFO)
+    {
+      switch (type)
+      {
+      case GEOM_POINT:
+        rank = ReadPrimitiveFromSource<uint8_t>(src);
+        break;
+      case GEOM_LINE:
+        utils::ReadString(src, ref);
+        break;
+      case GEOM_AREA:
+        house.Read(src);
+        break;
+      }
+    }
+  }
+};
+
+class FeatureParams : public FeatureParamsBase
+{
+  feature::EGeomType m_Geom;
+
+public:
+  typedef vector<uint32_t> types_t;
+  types_t m_Types;
+
+  FeatureParams(FeatureParamsBase const & rhs)
+    : FeatureParamsBase(rhs), m_Geom(feature::GEOM_UNDEFINED)
+  {
+  }
+  FeatureParams() : m_Geom(feature::GEOM_UNDEFINED) {}
+
+  bool IsValid() const;
+  uint32_t KeyType() const;
+
+  inline void SetGeomType(feature::EGeomType t) { m_Geom = t; }
+  inline void RemoveGeomType(feature::EGeomType t)
+  {
+    if (m_Geom == t) m_Geom = feature::GEOM_UNDEFINED;
+  }
+  inline feature::EGeomType GetGeomType() const { return m_Geom; }
+
+  void AddType(uint32_t t);
+  void AddTypes(FeatureParams const & v);
+  void SetType(uint32_t t);
+
+  void FinishAddingTypes();
+
+  template <class TIter> 
+  void AssignTypes(TIter b, TIter e)
+  {
+    m_Types.assign(b, e);
+  }
+
+  bool IsTypeExist(uint32_t t) const;
+  bool AssignType_SetDifference(vector<uint32_t> const & diffTypes);
+
+  bool operator == (FeatureParams const & rhs) const;
+
+  bool CheckValid() const;
+
+  uint8_t GetHeader() const;
+
+  template <class TSink> void Write(TSink & sink) const
+  {
+    uint8_t const header = GetHeader();
+
+    WriteToSink(sink, header);
+
+    for (size_t i = 0; i < m_Types.size(); ++i)
+      WriteVarUint(sink, m_Types[i]);
+
+    FeatureParamsBase::Write(sink, header, m_Geom);
+  }
+};