From 3c8ef18ba86e69549245981388155eba3412198f Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Tue, 17 Dec 2024 22:49:21 +0300
Subject: [PATCH] [search] Make peaks, saddles and towers more searchable

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 indexer/ftypes_matcher.cpp                     | 7 +++++--
 search/search_integration_tests/smoke_test.cpp | 1 -
 search/types_skipper.cpp                       | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index 1d254f5c56..d74d22512a 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -442,7 +442,7 @@ OneLevelPOIChecker::OneLevelPOIChecker() : ftypes::BaseChecker(1 /* level */)
   Classificator const & c = classif();
 
   for (auto const * path : {"amenity",  "craft", "healthcare", "historic", "leisure", "office", "railway",
-                            "shop", "sport", "tourism"})
+                            "shop", "sport", "tourism", "mountain_pass"})
     m_types.push_back(c.GetTypeByPath({path}));
 }
 
@@ -468,8 +468,11 @@ TwoLevelPOIChecker::TwoLevelPOIChecker() : ftypes::BaseChecker(2 /* level */)
       {"man_made", "water_tap"},
       {"man_made", "water_well"},
       {"natural", "beach"},
-      {"natural", "geyser"},
       {"natural", "cave_entrance"},
+      {"natural", "geyser"},
+      {"natural", "hot_spring"},
+      {"natural", "peak"},
+      {"natural", "saddle"},
       {"natural", "spring"},
       {"natural", "volcano"},
       {"waterway", "waterfall"}
diff --git a/search/search_integration_tests/smoke_test.cpp b/search/search_integration_tests/smoke_test.cpp
index c766fe2fd9..0143cc1299 100644
--- a/search/search_integration_tests/smoke_test.cpp
+++ b/search/search_integration_tests/smoke_test.cpp
@@ -251,7 +251,6 @@ UNIT_CLASS_TEST(SmokeTest, CategoriesTest)
       {"man_made", "chimney"},
       {"man_made", "flagpole"},
       {"man_made", "mast"},
-      {"man_made", "tower"},
       {"man_made", "water_tower"},
       {"natural"},
       {"office"},
diff --git a/search/types_skipper.cpp b/search/types_skipper.cpp
index 832d2e1acf..d0686fc366 100644
--- a/search/types_skipper.cpp
+++ b/search/types_skipper.cpp
@@ -29,7 +29,6 @@ TypesSkipper::TypesSkipper()
     {"man_made", "chimney"},
     {"man_made", "flagpole"},
     {"man_made", "mast"},
-    {"man_made", "tower"},
     {"man_made", "water_tower"},
   };
   for (auto const & e : arrSkipEmptyName2)