From 3f81ad6f30babc13477b1bfa58e12c313a4de3be Mon Sep 17 00:00:00 2001
From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
Date: Thu, 21 Dec 2023 19:03:40 +0100
Subject: [PATCH] [search] Get hotel's search mark using SetFromType

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
---
 map/framework.cpp   |  6 +-----
 map/search_mark.cpp | 15 +++++++++------
 map/search_mark.hpp |  1 -
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/map/framework.cpp b/map/framework.cpp
index 766f868003..e11a5fa94d 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1418,11 +1418,7 @@ void Framework::FillSearchResultsMarks(SearchResultsIterT beg, SearchResultsIter
     {
       auto const fID = r.GetFeatureID();
       mark->SetFoundFeature(fID);
-
-      if (r.m_details.m_isHotel)
-        mark->SetHotelType();
-      else
-        mark->SetFromType(r.GetFeatureType());
+      mark->SetFromType(r.GetFeatureType());
       mark->SetVisited(m_searchMarks.IsVisited(fID));
       mark->SetSelected(m_searchMarks.IsSelected(fID));
     }
diff --git a/map/search_mark.cpp b/map/search_mark.cpp
index f2573eda8e..348808154b 100644
--- a/map/search_mark.cpp
+++ b/map/search_mark.cpp
@@ -167,7 +167,15 @@ private:
       {{"shop", "toys"},             SearchMarkType::ShopToys},
       {{"tourism", "theme_park"},    SearchMarkType::ThemePark},
       {{"leisure", "water_park"},    SearchMarkType::WaterPark},
-      {{"tourism", "zoo"},           SearchMarkType::Zoo}
+      {{"tourism", "zoo"},           SearchMarkType::Zoo},
+      {{"tourism", "hotel"},         SearchMarkType::Hotel},
+      {{"tourism", "apartment"},     SearchMarkType::Hotel},
+      {{"tourism", "camp_site"},     SearchMarkType::Hotel},
+      {{"tourism", "chalet"},        SearchMarkType::Hotel},
+      {{"tourism", "guest_house"},   SearchMarkType::Hotel},
+      {{"tourism", "hostel"},        SearchMarkType::Hotel},
+      {{"tourism", "motel"},         SearchMarkType::Hotel},
+      {{"tourism", "resort"},        SearchMarkType::Hotel}
     };
 
     m_searchMarkTypes.reserve(table.size());
@@ -271,11 +279,6 @@ void SearchMarkPoint::SetFromType(uint32_t type)
   SetAttributeValue(m_type, GetSearchMarkType(type));
 }
 
-void SearchMarkPoint::SetHotelType()
-{
-  SetAttributeValue(m_type, SearchMarkType::Hotel);
-}
-
 void SearchMarkPoint::SetNotFoundType()
 {
   SetAttributeValue(m_type, SearchMarkType::NotFound);
diff --git a/map/search_mark.hpp b/map/search_mark.hpp
index b12d2f70f2..1ad9830ae9 100644
--- a/map/search_mark.hpp
+++ b/map/search_mark.hpp
@@ -48,7 +48,6 @@ public:
   void SetMatchedName(std::string const & name);
 
   void SetFromType(uint32_t type);
-  void SetHotelType();
   void SetNotFoundType();
 
   void SetPreparing(bool isPreparing);