[metadata] Renaming (refactoring) according to code style.

6 files changed, 40 insertions, 47 deletions

diff --git a/indexer/categories_holder.cpp b/indexer/categories_holder.cpp
index 293a620d0e..e573e2a0ea 100644
--- a/indexer/categories_holder.cpp
+++ b/indexer/categories_holder.cpp
@@ -192,17 +192,13 @@ bool CategoriesHolder::IsTypeExist(uint32_t type) const
   return range.first != range.second;
 }
 
-namespace
-{
-struct Mapping
-{
-  char const * m_name;
-  int8_t m_code;
-};
-} // namespace
-
 int8_t CategoriesHolder::MapLocaleToInteger(string const & locale)
 {
+  struct Mapping
+  {
+    char const * m_name;
+    int8_t m_code;
+  };
   static const Mapping mapping[] = {
     {"en", 1 },
     {"ru", 2 },
@@ -237,11 +233,9 @@ int8_t CategoriesHolder::MapLocaleToInteger(string const & locale)
     string lower = locale;
     strings::AsciiToLower(lower);
 
-    if (lower.find("hant") != string::npos
-        || lower.find("tw") != string::npos
-        || lower.find("hk") != string::npos
-        || lower.find("mo") != string::npos)
-      return 12; // Traditional Chinese
+    for (auto s : {"hant", "tw", "hk", "mo"})
+      if (lower.find(s) != string::npos)
+        return 12; // Traditional Chinese
 
     return 17; // Simplified Chinese by default for all other cases
   }
diff --git a/indexer/feature.hpp b/indexer/feature.hpp
index b74721f221..a96882f344 100644
--- a/indexer/feature.hpp
+++ b/indexer/feature.hpp
@@ -263,8 +263,8 @@ public:
   string GetRoadNumber() const;
   bool HasInternet() const;
 
-  inline feature::FeatureMetadata const & GetMetadata() const { return m_metadata; }
-  inline feature::FeatureMetadata & GetMetadata() { return m_metadata; }
+  inline feature::Metadata const & GetMetadata() const { return m_metadata; }
+  inline feature::Metadata & GetMetadata() { return m_metadata; }
 
   double GetDistance(m2::PointD const & pt, int scale) const;
 
@@ -320,7 +320,7 @@ private:
 
   typedef buffer_vector<m2::PointD, static_buffer> points_t;
   mutable points_t m_points, m_triangles;
-  mutable feature::FeatureMetadata m_metadata;
+  mutable feature::Metadata m_metadata;
 
   mutable bool m_bHeader2Parsed, m_bPointsParsed, m_bTrianglesParsed, m_bMetadataParsed;
 
diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp
index fdaf0d69ce..6ae9f73e21 100644
--- a/indexer/feature_data.hpp
+++ b/indexer/feature_data.hpp
@@ -202,7 +202,7 @@ class FeatureParams : public FeatureParamsBase
   /// We use it now only for search unit tests
   string m_street;
 
-  feature::FeatureMetadata m_metadata;
+  feature::Metadata m_metadata;
 
 public:
 
@@ -261,8 +261,8 @@ public:
 
   uint8_t GetHeader() const;
 
-  feature::FeatureMetadata const & GetMetadata() const { return m_metadata; }
-  feature::FeatureMetadata & GetMetadata() { return m_metadata; }
+  feature::Metadata const & GetMetadata() const { return m_metadata; }
+  feature::Metadata & GetMetadata() { return m_metadata; }
 
   template <class SinkT> void Write(SinkT & sink, bool needStoreMetadata = true) const
   {
diff --git a/indexer/feature_loader.cpp b/indexer/feature_loader.cpp
index 579324f09f..ccb60d3d7d 100644
--- a/indexer/feature_loader.cpp
+++ b/indexer/feature_loader.cpp
@@ -271,7 +271,7 @@ void LoaderCurrent::ParseMetadata()
       m_pF->GetMetadata().DeserializeFromMWM(reader);
     }
   }
-  catch(Reader::OpenException & e)
+  catch (Reader::OpenException const &)
   {
     // now ignore exception because not all mwm have needed sections
   }
diff --git a/indexer/feature_meta.hpp b/indexer/feature_meta.hpp
index 99b2f8e2ef..bd0dfe578d 100644
--- a/indexer/feature_meta.hpp
+++ b/indexer/feature_meta.hpp
@@ -11,13 +11,13 @@
 
 namespace feature
 {
-  class FeatureMetadata
+  class Metadata
   {
-    typedef map<uint8_t, string> MetadataT;
-    MetadataT m_metadata;
+    map<uint8_t, string> m_metadata;
 
   public:
-    enum EMetadataType {
+    enum EType
+    {
       FMD_CUISINE = 1,
       FMD_OPEN_HOURS = 2,
       FMD_PHONE_NUMBER = 3,
@@ -35,35 +35,32 @@ namespace feature
       FMD_POSTCODE = 15
     };
 
-    bool Add(EMetadataType type, string const & s)
+    bool Add(EType type, string const & s)
     {
-      if (m_metadata[type].empty())
-      {
-        m_metadata[type] = s;
-      }
+      string & val = m_metadata[type];
+      if (val.empty())
+        val = s;
       else
-      {
-        m_metadata[type] = m_metadata[type] + ", " + s;
-      }
+        val = val + ", " + s;
       return true;
     }
 
-    string Get(EMetadataType type) const
+    string Get(EType type) const
     {
       auto it = m_metadata.find(type);
       return (it == m_metadata.end()) ? string() : it->second;
     }
 
-    vector<EMetadataType> GetPresentTypes() const
+    vector<EType> GetPresentTypes() const
     {
-      vector<EMetadataType> types;
-      for (auto item: m_metadata)
-        types.push_back(static_cast<EMetadataType>(item.first));
+      vector<EType> types;
+      for (auto item : m_metadata)
+        types.push_back(static_cast<EType>(item.first));
 
       return types;
     }
 
-    void Drop(EMetadataType type)
+    void Drop(EType type)
     {
       m_metadata.erase(type);
     }
@@ -76,11 +73,13 @@ namespace feature
       for (auto const & e: m_metadata)
       {
         uint8_t last_key_mark = (&e == &(*m_metadata.crbegin())) << 7; /// set high bit (0x80) if it last element
-        uint8_t elem[2] = {static_cast<uint8_t>(e.first | last_key_mark), static_cast<uint8_t>(min(e.second.size(), (size_t)numeric_limits<uint8_t>::max()))};
+        uint8_t elem[2] = {static_cast<uint8_t>(e.first | last_key_mark),
+                           static_cast<uint8_t>(min(e.second.size(), (size_t)numeric_limits<uint8_t>::max()))};
         ar.Write(elem, sizeof(elem));
         ar.Write(e.second.data(), elem[1]);
       }
     }
+
     template <class ArchiveT> void DeserializeFromMWM(ArchiveT & ar)
     {
       uint8_t header[2] = {0};
@@ -95,11 +94,11 @@ namespace feature
 
     template <class ArchiveT> void Serialize(ArchiveT & ar) const
     {
-      uint8_t const metadata_size = m_metadata.size();
-      WriteToSink(ar, metadata_size);
-      if (metadata_size)
+      uint8_t const sz = m_metadata.size();
+      WriteToSink(ar, sz);
+      if (sz)
       {
-        for(auto & it: m_metadata)
+        for (auto const & it : m_metadata)
         {
           WriteToSink(ar, static_cast<uint8_t>(it.first));
           utils::WriteString(ar, it.second);
@@ -109,15 +108,14 @@ namespace feature
 
     template <class ArchiveT> void Deserialize(ArchiveT & ar)
     {
-      uint8_t const metadata_size = ReadPrimitiveFromSource<uint8_t>(ar);
-      for (size_t i=0; i < metadata_size; ++i)
+      uint8_t const sz = ReadPrimitiveFromSource<uint8_t>(ar);
+      for (size_t i = 0; i < sz; ++i)
       {
         uint8_t const key = ReadPrimitiveFromSource<uint8_t>(ar);
         string value;
         utils::ReadString(ar, value);
         m_metadata.insert(make_pair(key, value));
       }
-
     }
   };
 }
diff --git a/indexer/indexer.pro b/indexer/indexer.pro
index 4b07e8682d..b56055175a 100644
--- a/indexer/indexer.pro
+++ b/indexer/indexer.pro
@@ -67,6 +67,7 @@ HEADERS += \
     feature_impl.hpp \
     feature_loader.hpp \
     feature_loader_base.hpp \
+    feature_meta.hpp \
     feature_processor.hpp \
     feature_utils.hpp \
     feature_visibility.hpp \