From f968f9ab8e50436fad6259b39e45f3739394cf54 Mon Sep 17 00:00:00 2001
From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
Date: Sat, 13 Jan 2024 12:44:32 +0100
Subject: [PATCH] [core] Add toilets checker functions

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
---
 indexer/feature_utils.cpp  | 6 ++++++
 indexer/feature_utils.hpp  | 3 +++
 indexer/ftypes_matcher.cpp | 7 +++++++
 indexer/ftypes_matcher.hpp | 8 ++++++++
 indexer/map_object.cpp     | 5 +++++
 indexer/map_object.hpp     | 3 +++
 6 files changed, 32 insertions(+)

diff --git a/indexer/feature_utils.cpp b/indexer/feature_utils.cpp
index 2bdb3830a2..9cae8f0a2f 100644
--- a/indexer/feature_utils.cpp
+++ b/indexer/feature_utils.cpp
@@ -444,4 +444,10 @@ bool HasAtm(TypesHolder const & types)
     return isAtmType(types);
 }
 
+bool HasToilets(TypesHolder const & types)
+{
+  auto const & isToiletsType = ftypes::IsToiletsChecker::Instance();
+  return isToiletsType(types);
+}
+
 } // namespace feature
diff --git a/indexer/feature_utils.hpp b/indexer/feature_utils.hpp
index 5988733a5c..b2e12de225 100644
--- a/indexer/feature_utils.hpp
+++ b/indexer/feature_utils.hpp
@@ -132,4 +132,7 @@ namespace feature
   /// Returns true if feature has ATM type.
   bool HasAtm(TypesHolder const & types);
 
+  /// Returns true if feature has Toilets type.
+  bool HasToilets(TypesHolder const & types);
+
 }  // namespace feature
diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index 8c0f8223af..5286a295fe 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -758,6 +758,13 @@ IsFeeTypeChecker::IsFeeTypeChecker() : BaseChecker(1 /* level */)
   m_types.push_back(c.GetTypeByPath({"fee"}));
 }
 
+IsToiletsChecker::IsToiletsChecker() : BaseChecker(2 /* level */)
+{
+  Classificator const & c = classif();
+  m_types.push_back(c.GetTypeByPath({"amenity", "toilets"}));
+  m_types.push_back(c.GetTypeByPath({"toilets", "yes"}));
+}
+
 IsCityChecker::IsCityChecker()
 {
   m_types.push_back(classif().GetTypeByPath({"place", "city"}));
diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp
index 086d8a0dd6..1a4a824758 100644
--- a/indexer/ftypes_matcher.hpp
+++ b/indexer/ftypes_matcher.hpp
@@ -466,6 +466,14 @@ class IsFeeTypeChecker : public BaseChecker
 public:
   DECLARE_CHECKER_INSTANCE(IsFeeTypeChecker);
 };
+    
+class IsToiletsChecker : public BaseChecker
+{
+  IsToiletsChecker();
+
+public:
+  DECLARE_CHECKER_INSTANCE(IsToiletsChecker);
+};
 
 class IsCityChecker : public BaseChecker
 {
diff --git a/indexer/map_object.cpp b/indexer/map_object.cpp
index b36655463b..2ec297becf 100644
--- a/indexer/map_object.cpp
+++ b/indexer/map_object.cpp
@@ -171,6 +171,11 @@ bool MapObject::HasAtm() const
   return feature::HasAtm(m_types);
 }
 
+bool MapObject::HasToilets() const
+{
+  return feature::HasToilets(m_types);
+}
+
 string MapObject::FormatCuisines() const
 {
   return strings::JoinStrings(GetLocalizedCuisines(), kFieldsSeparator);
diff --git a/indexer/map_object.hpp b/indexer/map_object.hpp
index 3f60468db7..6cdaa6d226 100644
--- a/indexer/map_object.hpp
+++ b/indexer/map_object.hpp
@@ -104,6 +104,9 @@ public:
   /// @returns true if feature has ATM type.
   bool HasAtm() const;
 
+  /// @returns true if feature has Toilets type.
+  bool HasToilets() const;
+
   /// @returns formatted elevation in feet or meters, or empty string.
   std::string GetElevationFormatted() const;
   /// @}