- Don't store names for features with invisible texts.

- Try to make better rank for drawing text font.

indexer/feature.cpp

@@ -148,6 +148,10 @@ bool FeatureBuilder1::PreSerialize()
     return false;
   }
 
+  // Clear name for features with invisible texts.
+  if (!m_Params.name.IsEmpty() && feature::MinDrawableScaleForText(GetFeatureBase()) == -1)
+    m_Params.name.Clear();
+
   return true;
 }
 
@@ -984,22 +988,25 @@ string FeatureType::GetPreferredDrawableName(char const * priorities) const
   return res;
 }
 
-uint8_t FeatureType::GetRank() const
+uint32_t FeatureType::GetPopulation() const
 {
   if (!m_bCommonParsed)
     ParseCommon();
 
-  /// @todo Move this check to generator (don't store rank for countries).
-  if (m_Params.rank > 0 && feature::IsCountry(m_Types[0]))
-    return 0;
-
-  return m_Params.rank;
-}
-
-uint32_t FeatureType::GetPopulation() const
-{
-  uint8_t const rank = GetRank();
-  if (rank == 0)
+  if (m_Params.rank == 0)
     return 1;
-  return static_cast<uint32_t>(min(double(uint32_t(-1)), pow(1.1, rank)));
+
+  return static_cast<uint32_t>(min(double(uint32_t(-1)), pow(1.1, m_Params.rank)));
+}
+
+double FeatureType::GetPopulationDrawRank() const
+{
+  uint32_t const n = GetPopulation();
+  if (n == 1) return 0.0;
+
+  // Do not return rank for countries.
+  if (feature::IsCountry(m_Types, m_Types + GetTypesCount()))
+    return 0.5;
+  else
+    return min(3.0E6, static_cast<double>(n)) / 3.0E6;
 }

indexer/feature.hpp

@@ -376,8 +376,8 @@ public:
   /// For test cases only.
   string DebugString(int scale) const;
 
-  uint8_t GetRank() const;
   uint32_t GetPopulation() const;
+  double GetPopulationDrawRank() const;
 
   /// @name Statistic functions.
   //@{

indexer/feature_visibility.hpp

@@ -23,5 +23,16 @@ namespace feature
   int GetDrawRule(FeatureBase const & f, int level, vector<drule::Key> & keys, string & names);
 
   bool IsHighway(vector<uint32_t> const & types);
+
   bool IsCountry(uint32_t type);
+  template <class IterT>
+  inline bool IsCountry(IterT beg, IterT end)
+  {
+    while (beg != end)
+    {
+      if (IsCountry(*beg++))
+        return true;
+    }
+    return false;
+  }
 }

map/drawer_yg.hpp

@@ -32,14 +32,14 @@ namespace di
   class DrawInfo
   {
   public:
-    DrawInfo(string const & name, uint8_t rank) : m_name(name), m_rank(rank) {}
+    DrawInfo(string const & name, double rank) : m_name(name), m_rank(rank) {}
 
     list<di::PathInfo> m_pathes;
     list<di::AreaInfo> m_areas;
     m2::PointD m_point;
 
     string m_name;
-    uint8_t m_rank;
+    double m_rank;
   };
 
   struct DrawRule

map/framework.cpp

@@ -163,7 +163,7 @@ namespace fwork
 
     shared_ptr<di::DrawInfo> ptr(
           new di::DrawInfo(f.GetPreferredDrawableName(languages::GetCurrentPriorities()),
-                            f.GetRank()));
+                            f.GetPopulationDrawRank()));
 
     DrawerYG * pDrawer = GetDrawer();
 

yg/font_desc.cpp

@@ -16,12 +16,10 @@ namespace yg
                        m_isMasked(isMasked), m_maskColor(maskColor)
   {}
 
-  void FontDesc::SetRank(uint8_t rank)
+  void FontDesc::SetRank(double rank)
   {
     if (rank > 0)
-      m_size += static_cast<int>(min(4.0E6, std::pow(1.1, double(rank))) / 2.0E6 * m_size);
-    //m_size += static_cast<int>((double(rank) / 200.0) * m_size);
-    //m_size += (rank / 20);
+      m_size += static_cast<int>(rank * m_size);
   }
 
   bool FontDesc::operator ==(FontDesc const & src) const

yg/font_desc.hpp

@@ -15,7 +15,7 @@ namespace yg
     FontDesc(bool isStatic = true, int size = 10, yg::Color const & color = yg::Color(0, 0, 0, 255),
              bool isMasked = true, yg::Color const & maskColor = yg::Color(255, 255, 255, 255));
 
-    void SetRank(uint8_t rank);
+    void SetRank(double rank);
 
     bool operator != (FontDesc const & src) const;
     bool operator == (FontDesc const & src) const;