[map][indexer] Add recycling types to subtitle.

indexer/feature_utils.cpp

@@ -19,6 +19,7 @@
 #include <unordered_map>
 #include <utility>
 
+using namespace feature;
 using namespace std;
 
 namespace
@@ -153,6 +154,35 @@ void GetReadableNameImpl(feature::RegionData const & regionData, StringUtf8Multi
 
   GetMwmLangName(regionData, src, out);
 }
+
+// Filters types with |checker|, returns vector of raw type second components.
+// For example for types {"cuisine-sushi", "cuisine-pizza", "cuisine-seafood"} vector
+// of second components is {"sushi", "pizza", "seafood"}.
+vector<string> GetRawTypeSecond(ftypes::BaseChecker const & checker, TypesHolder const & types)
+{
+  vector<string> res;
+  for (auto const t : types)
+  {
+    if (!checker(t))
+      continue;
+    auto const path = classif().GetFullObjectNamePath(t);
+    CHECK_EQUAL(path.size(), 2, (path));
+    res.push_back(path[1]);
+  }
+  return res;
+}
+
+vector<string> GetLocalizedTypes(ftypes::BaseChecker const & checker, TypesHolder const & types)
+{
+  vector<string> localized;
+  for (auto const t : types)
+  {
+    if (!checker(t))
+      continue;
+    localized.push_back(platform::GetLocalizedTypeName(classif().GetReadableObjectName(t)));
+  }
+  return localized;
+}
 }  // namespace
 
 namespace feature
@@ -378,30 +408,26 @@ vector<int8_t> GetDescriptionLangPriority(RegionData const & regionData, int8_t
 
 vector<string> GetCuisines(TypesHolder const & types)
 {
-  vector<string> cuisines;
   auto const & isCuisine = ftypes::IsCuisineChecker::Instance();
-  for (auto const t : types)
-  {
-    if (!isCuisine(t))
-      continue;
-    auto const cuisine = classif().GetFullObjectNamePath(t);
-    CHECK_EQUAL(cuisine.size(), 2, (cuisine));
-    cuisines.push_back(cuisine[1]);
-  }
-  return cuisines;
+  return GetRawTypeSecond(isCuisine, types);
 }
 
 vector<string> GetLocalizedCuisines(TypesHolder const & types)
 {
-  vector<string> localized;
   auto const & isCuisine = ftypes::IsCuisineChecker::Instance();
-  for (auto const t : types)
-  {
-    if (!isCuisine(t))
-      continue;
-    localized.push_back(platform::GetLocalizedTypeName(classif().GetReadableObjectName(t)));
-  }
-  return localized;
+  return GetLocalizedTypes(isCuisine, types);
+}
+
+vector<string> GetRecyclingTypes(TypesHolder const & types)
+{
+  auto const & isRecyclingType = ftypes::IsRecyclingTypeChecker::Instance();
+  return GetRawTypeSecond(isRecyclingType, types);
+}
+
+vector<string> GetLocalizedRecyclingTypes(TypesHolder const & types)
+{
+  auto const & isRecyclingType = ftypes::IsRecyclingTypeChecker::Instance();
+  return GetLocalizedTypes(isRecyclingType, types);
 }
 
 vector<string> GetRoadShieldsNames(string const & rawRoadNumber)

indexer/feature_utils.hpp

@@ -84,6 +84,12 @@ namespace feature
   // Returns vector of cuisines names localized by platform.
   std::vector<std::string> GetLocalizedCuisines(TypesHolder const & types);
 
+  // Returns vector of recycling types readable names from classificator.
+  std::vector<std::string> GetRecyclingTypes(TypesHolder const & types);
+
+  // Returns vector of recycling types localized by platform.
+  std::vector<std::string> GetLocalizedRecyclingTypes(TypesHolder const & types);
+
   // Returns names of feature road shields. Applicable for road features.
   std::vector<std::string> GetRoadShieldsNames(std::string const & rawRoadNumber);
 }  // namespace feature

indexer/ftypes_matcher.cpp

@@ -692,6 +692,12 @@ IsCuisineChecker::IsCuisineChecker() : BaseChecker(1 /* level */)
   m_types.push_back(c.GetTypeByPath({"cuisine"}));
 }
 
+IsRecyclingTypeChecker::IsRecyclingTypeChecker() : BaseChecker(1 /* level */)
+{
+  Classificator const & c = classif();
+  m_types.push_back(c.GetTypeByPath({"recycling"}));
+}
+
 IsCityChecker::IsCityChecker()
 {
   m_types.push_back(classif().GetTypeByPath({"place", "city"}));

indexer/ftypes_matcher.hpp

@@ -386,6 +386,14 @@ public:
   DECLARE_CHECKER_INSTANCE(IsCuisineChecker);
 };
 
+class IsRecyclingTypeChecker : public BaseChecker
+{
+  IsRecyclingTypeChecker();
+
+public:
+  DECLARE_CHECKER_INSTANCE(IsRecyclingTypeChecker);
+};
+
 class IsCityChecker : public BaseChecker
 {
   IsCityChecker();

indexer/map_object.cpp

@@ -178,6 +178,13 @@ vector<string> MapObject::GetLocalizedCuisines() const
   return feature::GetLocalizedCuisines(m_types);
 }
 
+vector<string> MapObject::GetRecyclingTypes() const { return feature::GetRecyclingTypes(m_types); }
+
+vector<string> MapObject::GetLocalizedRecyclingTypes() const
+{
+  return feature::GetLocalizedRecyclingTypes(m_types);
+}
+
 string MapObject::FormatCuisines() const
 {
   return strings::JoinStrings(GetLocalizedCuisines(), kFieldsSeparator);

indexer/map_object.hpp

@@ -79,10 +79,14 @@ public:
   std::string GetEmail() const;
   std::string GetWebsite() const;
   Internet GetInternet() const;
-  /// @returns not localized cuisines keys.
+  /// @returns non-localized cuisines keys.
   std::vector<std::string> GetCuisines() const;
   /// @returns translated cuisine(s).
   std::vector<std::string> GetLocalizedCuisines() const;
+  /// @returns non-localized recycling type(s).
+  std::vector<std::string> GetRecyclingTypes() const;
+  /// @returns translated recycling type(s).
+  std::vector<std::string> GetLocalizedRecyclingTypes() const;
   /// @returns translated and formatted cuisines.
   std::string FormatCuisines() const;
   std::vector<std::string> GetRoadShields() const;

map/place_page_info.cpp

@@ -113,6 +113,10 @@ std::string Info::FormatSubtitle(bool withType) const
   for (std::string const & cuisine : GetLocalizedCuisines())
     subtitle.push_back(cuisine);
 
+  // Recycling types.
+  for (std::string const & recycling : GetLocalizedRecyclingTypes())
+    subtitle.push_back(recycling);
+
   // Airport IATA code.
   std::string const iata = GetAirportIata();
   if (!iata.empty())