CityRank and PopRank was removed as obsolete

5 files changed, 0 insertions, 28 deletions

diff --git a/render/cpu_drawer.cpp b/render/cpu_drawer.cpp
index 1d49de868e..54fd15f6f9 100644
--- a/render/cpu_drawer.cpp
+++ b/render/cpu_drawer.cpp
@@ -615,21 +615,16 @@ void CPUDrawer::CallTextRendererFn(TextShape const * shape, TTextRendererCall co
   ASSERT(shape->m_drawRule.m_rule->GetCaption(0) != nullptr, ());
   di::FeatureStyler const & fs = GetInfo(shape->m_geomID, m_stylers);
 
-  if (fs.m_popRank < 0.0)
-    return; // do not draw
-
   CaptionDefProto const * primCaption = shape->m_drawRule.m_rule->GetCaption(0);
   CaptionDefProto const * secCaption = shape->m_drawRule.m_rule->GetCaption(1);
 
   graphics::FontDesc primFont, secFont;
   m2::PointD primOffset, secOffset;
   ConvertStyle(primCaption, VisualScale(), primFont, primOffset);
-  primFont.SetRank(fs.m_popRank);
   CorrectFont(primFont);
   if (secCaption != nullptr)
   {
     ConvertStyle(secCaption, VisualScale(), secFont, secOffset);
-    secFont.SetRank(fs.m_popRank);
     CorrectFont(secFont);
   }
 
diff --git a/render/drawer.cpp b/render/drawer.cpp
index 8c997ebafd..ef380ff017 100644
--- a/render/drawer.cpp
+++ b/render/drawer.cpp
@@ -64,12 +64,6 @@ void Drawer::GenerateRoadNumbers(di::PathInfo const & path, graphics::FontDesc c
 
 void Drawer::Draw(di::FeatureInfo const & fi)
 {
-  // [STYLES_HARDCODE] If city population rank is less than zero then
-  // do not draw node name and node point
-  if (fi.m_styler.m_geometryType == feature::GEOM_POINT &&
-      fi.m_styler.m_popRank < 0.0)
-    return;
-
   DrawFeatureStart(fi.m_id);
 
   buffer_vector<di::DrawRule, 8> const & rules = fi.m_styler.m_rules;
diff --git a/render/feature_styler.cpp b/render/feature_styler.cpp
index 368afb33bf..041be2abde 100644
--- a/render/feature_styler.cpp
+++ b/render/feature_styler.cpp
@@ -110,14 +110,6 @@ namespace di
 
     uint32_t const population = ftypes::GetPopulation(f);
 
-    // [STYLE_HARDCODE] Calculate population rank for cities and towns only.
-    // It affects font size. If population rank is less than zero, feature is not drawn.
-    ftypes::Type const localityType = ftypes::IsLocalityChecker::Instance().GetType(f);
-    if (localityType == ftypes::CITY || localityType == ftypes::TOWN)
-      m_popRank = drule::rules().GetCityRank(zoom, population);
-    else
-      m_popRank = 0.0;
-
     double area = 0.0;
     if (m_geometryType != feature::GEOM_POINT)
     {
diff --git a/render/feature_styler.hpp b/render/feature_styler.hpp
index 0bfcd52424..842b014746 100644
--- a/render/feature_styler.hpp
+++ b/render/feature_styler.hpp
@@ -62,8 +62,6 @@ namespace di
     ScreenBase const * m_convertor;
     m2::RectD const * m_rect;
 
-    double m_popRank;
-
     bool IsEmpty() const;
 
     string const GetPathName() const;
diff --git a/render/gpu_drawer.cpp b/render/gpu_drawer.cpp
index c334fac56b..9e3efec2b4 100644
--- a/render/gpu_drawer.cpp
+++ b/render/gpu_drawer.cpp
@@ -196,21 +196,14 @@ void GPUDrawer::DrawText(m2::PointD const & pt,
                          di::FeatureStyler const & fs,
                          di::DrawRule const & rule)
 {
-  if (fs.m_popRank < 0.0)
-    return; // do not draw
-
   graphics::FontDesc primaryFont;
   m2::PointD primaryOffset;
   ConvertStyle(rule.m_rule->GetCaption(0), VisualScale(), primaryFont, primaryOffset);
-  primaryFont.SetRank(fs.m_popRank);
 
   graphics::FontDesc secondaryFont;
   m2::PointD secondaryOffset;
   if (rule.m_rule->GetCaption(1))
-  {
     ConvertStyle(rule.m_rule->GetCaption(1), VisualScale(), secondaryFont, secondaryOffset);
-    secondaryFont.SetRank(fs.m_popRank);
-  }
 
   graphics::StraightTextElement::Params params;
   params.m_depth = rule.m_depth;