[core] Delete unused types-related code

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

drape_frontend/stylist.cpp

@@ -367,24 +367,4 @@ bool InitStylist(FeatureType & f, int8_t deviceLang, int const zoomLevel, bool b
   return true;
 }
 
-double GetFeaturePriority(FeatureType & f, int const zoomLevel)
-{
-  feature::TypesHolder types(f);
-  drule::KeysT keys;
-  feature::GetDrawRule(types, zoomLevel, keys);
-
-  feature::FilterRulesByRuntimeSelector(f, zoomLevel, keys);
-
-  Aggregator aggregator(f, types.GetGeomType(), zoomLevel, keys.size());
-  aggregator.AggregateKeys(keys);
-
-  float maxPriority = kMinPriority;
-  for (auto const & rule : aggregator.m_rules)
-  {
-    if (rule.m_depth > maxPriority)
-      maxPriority = rule.m_depth;
-  }
-
-  return maxPriority;
-}
 }  // namespace df

drape_frontend/stylist.hpp

@@ -89,6 +89,4 @@ private:
 
 bool InitStylist(FeatureType & f, int8_t deviceLang, int const zoomLevel, bool buildings3d,
                  Stylist & s);
-
-double GetFeaturePriority(FeatureType & f, int const zoomLevel);
 }  // namespace df

indexer/classificator.cpp

@@ -51,11 +51,11 @@ ClassifObject * ClassifObject::Find(string const & s)
 
 void ClassifObject::AddDrawRule(drule::Key const & k)
 {
-  auto i = lower_bound(m_drawRule.begin(), m_drawRule.end(), k.m_scale, less_scales());
-  for (; i != m_drawRule.end() && i->m_scale == k.m_scale; ++i)
+  auto i = lower_bound(m_drawRules.begin(), m_drawRules.end(), k.m_scale, less_scales());
+  for (; i != m_drawRules.end() && i->m_scale == k.m_scale; ++i)
     if (k == *i)
       return; // already exists
-  m_drawRule.insert(i, k);
+  m_drawRules.insert(i, k);
 }
 
 ClassifObjectPtr ClassifObject::BinaryFind(std::string_view const s) const
@@ -84,7 +84,7 @@ void ClassifObject::LoadPolicy::EndChilds()
 
 void ClassifObject::Sort()
 {
-  sort(m_drawRule.begin(), m_drawRule.end(), less_scales());
+  sort(m_drawRules.begin(), m_drawRules.end(), less_scales());
   sort(m_objs.begin(), m_objs.end(), LessName());
   for (auto & obj : m_objs)
     obj.Sort();
@@ -93,7 +93,7 @@ void ClassifObject::Sort()
 void ClassifObject::Swap(ClassifObject & r)
 {
   swap(m_name, r.m_name);
-  swap(m_drawRule, r.m_drawRule);
+  swap(m_drawRules, r.m_drawRules);
   swap(m_objs, r.m_objs);
   swap(m_visibility, r.m_visibility);
 }
@@ -237,6 +237,7 @@ namespace
     void add_rule(int ft, iter_t i)
     {
       static const int visible[3][drule::count_of_rules] = {
+        //{ line, area, symbol, caption, circle, pathtext, waymarker, shield }
         { 0, 0, 1, 1, 1, 0, 0, 0 },   // fpoint
         { 1, 0, 0, 0, 0, 1, 0, 1 },   // fline
         { 1, 1, 1, 1, 1, 0, 0, 0 }    // farea
@@ -270,7 +271,7 @@ void ClassifObject::GetSuitable(int scale, feature::GeomType gt, drule::KeysT &
     return;
 
   // find rules for 'scale'
-  suitable_getter rulesGetter(m_drawRule, keys);
+  suitable_getter rulesGetter(m_drawRules, keys);
   rulesGetter.find(static_cast<int>(gt), scale);
 }
 
@@ -281,7 +282,7 @@ bool ClassifObject::IsDrawable(int scale) const
 
 bool ClassifObject::IsDrawableAny() const
 {
-  return (m_visibility != VisibleMask() && !m_drawRule.empty());
+  return (m_visibility != VisibleMask() && !m_drawRules.empty());
 }
 
 bool ClassifObject::IsDrawableLike(feature::GeomType gt, bool emptyName) const
@@ -293,12 +294,13 @@ bool ClassifObject::IsDrawableLike(feature::GeomType gt, bool emptyName) const
     return false;
 
   static const int visible[3][drule::count_of_rules] = {
+    //{ line, area, symbol, caption, circle, pathtext, waymarker, shield }
     {0, 0, 1, 1, 1, 0, 0, 0},   // fpoint
     {1, 0, 0, 0, 0, 1, 0, 1},   // fline
     {0, 1, 0, 0, 0, 0, 0, 0}    // farea (!!! key difference with GetSuitable !!!)
   };
 
-  for (auto const & k : m_drawRule)
+  for (auto const & k : m_drawRules)
   {
     ASSERT_LESS(k.m_type, drule::count_of_rules, ());
 

indexer/classificator.hpp

@@ -158,7 +158,7 @@ public:
 
 private:
   std::string m_name;
-  std::vector<drule::Key> m_drawRule;
+  std::vector<drule::Key> m_drawRules;
   std::vector<ClassifObject> m_objs;
   VisibleMask m_visibility;
 };

indexer/map_object.cpp

@@ -111,7 +111,7 @@ string MapObject::GetLocalizedType() const
   feature::TypesHolder copy(m_types);
   copy.SortBySpec();
 
-  return platform::GetLocalizedTypeName(classif().GetReadableObjectName(*copy.begin()));
+  return platform::GetLocalizedTypeName(classif().GetReadableObjectName(copy.GetBestType()));
 }
 
 std::string_view MapObject::GetMetadata(MetadataID type) const

map/place_page_info.cpp

@@ -49,8 +49,6 @@ void Info::SetFromFeatureType(FeatureType & ft)
                                true /* allowTranslit */} , out);
   }
 
-  m_sortedTypes = m_types;
-  m_sortedTypes.SortBySpec();
   m_primaryFeatureName = out.GetPrimary();
   if (IsBookmark())
   {

map/place_page_info.hpp

@@ -274,8 +274,6 @@ private:
   /// Feature status
   FeatureStatus m_featureStatus = FeatureStatus::Untouched;
 
-  feature::TypesHolder m_sortedTypes;
-
   std::optional<ftypes::IsHotelChecker::Type> m_hotelType;
 
   uint8_t m_popularity = 0;