diff --git a/data/styles/default/dark/symbols/search-result-art.svg b/data/styles/default/dark/symbols/search-result-art.svg new file mode 100644 index 0000000000..c302289ce2 --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-art.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/search-result-bank.svg b/data/styles/default/dark/symbols/search-result-bank.svg new file mode 100644 index 0000000000..867cea6d71 --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-bank.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/search-result-clinic.svg b/data/styles/default/dark/symbols/search-result-clinic.svg new file mode 100644 index 0000000000..a5edb21f0a --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-clinic.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/search-result-fuel.svg b/data/styles/default/dark/symbols/search-result-fuel.svg new file mode 100644 index 0000000000..00b31b2b42 --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-fuel.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/search-result-hospital.svg b/data/styles/default/dark/symbols/search-result-hospital.svg new file mode 100644 index 0000000000..b38559615d --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-hospital.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/search-result-museum.svg b/data/styles/default/dark/symbols/search-result-museum.svg new file mode 100644 index 0000000000..5023857d64 --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-museum.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/search-result-pharmacy.svg b/data/styles/default/dark/symbols/search-result-pharmacy.svg new file mode 100644 index 0000000000..b8c5607025 --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-pharmacy.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/search-result-pitch.svg b/data/styles/default/dark/symbols/search-result-pitch.svg new file mode 100644 index 0000000000..944ff00b9f --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-pitch.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/search-result-stadium.svg b/data/styles/default/dark/symbols/search-result-stadium.svg new file mode 100644 index 0000000000..c1306e9e9e --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-stadium.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/search-result-theatre.svg b/data/styles/default/dark/symbols/search-result-theatre.svg new file mode 100644 index 0000000000..1b6e4521c7 --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-theatre.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-art.svg b/data/styles/default/light/symbols/search-result-art.svg new file mode 100644 index 0000000000..c302289ce2 --- /dev/null +++ b/data/styles/default/light/symbols/search-result-art.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-bank.svg b/data/styles/default/light/symbols/search-result-bank.svg new file mode 100644 index 0000000000..867cea6d71 --- /dev/null +++ b/data/styles/default/light/symbols/search-result-bank.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-clinic.svg b/data/styles/default/light/symbols/search-result-clinic.svg new file mode 100644 index 0000000000..a5edb21f0a --- /dev/null +++ b/data/styles/default/light/symbols/search-result-clinic.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-fuel.svg b/data/styles/default/light/symbols/search-result-fuel.svg new file mode 100644 index 0000000000..00b31b2b42 --- /dev/null +++ b/data/styles/default/light/symbols/search-result-fuel.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-hospital.svg b/data/styles/default/light/symbols/search-result-hospital.svg new file mode 100644 index 0000000000..b38559615d --- /dev/null +++ b/data/styles/default/light/symbols/search-result-hospital.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-museum.svg b/data/styles/default/light/symbols/search-result-museum.svg new file mode 100644 index 0000000000..5023857d64 --- /dev/null +++ b/data/styles/default/light/symbols/search-result-museum.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-pharmacy.svg b/data/styles/default/light/symbols/search-result-pharmacy.svg new file mode 100644 index 0000000000..b8c5607025 --- /dev/null +++ b/data/styles/default/light/symbols/search-result-pharmacy.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-pitch.svg b/data/styles/default/light/symbols/search-result-pitch.svg new file mode 100644 index 0000000000..944ff00b9f --- /dev/null +++ b/data/styles/default/light/symbols/search-result-pitch.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-stadium.svg b/data/styles/default/light/symbols/search-result-stadium.svg new file mode 100644 index 0000000000..c1306e9e9e --- /dev/null +++ b/data/styles/default/light/symbols/search-result-stadium.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-theatre.svg b/data/styles/default/light/symbols/search-result-theatre.svg new file mode 100644 index 0000000000..1b6e4521c7 --- /dev/null +++ b/data/styles/default/light/symbols/search-result-theatre.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/map/search_mark.cpp b/map/search_mark.cpp index b3b5e6916b..60ecc64c0c 100644 --- a/map/search_mark.cpp +++ b/map/search_mark.cpp @@ -33,9 +33,15 @@ enum SearchMarkPoint::SearchMarkType : uint8_t Casino, Lottery, Cinema, + Theatre, + Stadium, + Museum, + Art, Marketplace, Nightclub, Playground, + Bank, + Fuel, ShopAlcohol, ShopButcher, ShopClothes, @@ -52,8 +58,12 @@ enum SearchMarkPoint::SearchMarkType : uint8_t ShopSupermarket, ShopToys, ThemePark, - Swimming, Zoo, + Pitch, + Swimming, + Hospital, + Clinic, + Pharmacy, NotFound, // Service value used in developer tools. Count @@ -86,9 +96,15 @@ std::array const kSymbols = { "search-result-casino", // Casino. "search-result-lottery", // Lottery. "search-result-cinema", // Cinema. + "search-result-theatre", // Theatre. + "search-result-stadium", // Stadium. + "search-result-museum", // Museum. + "search-result-art", // Art. "search-result-marketplace", // Marketplace. "search-result-nightclub", // Nightclub. "search-result-playground", // Playground. + "search-result-bank", // Bank. + "search-result-fuel", // Fuel. "search-result-shop-alcohol", // ShopAlcohol. "search-result-shop-butcher", // ShopButcher. "search-result-shop-clothes", // ShopClothes. @@ -105,8 +121,13 @@ std::array const kSymbols = { "search-result-shop-supermarket", // ShopSupermarket. "search-result-shop-toys", // ShopToys. "search-result-theme-park", // ThemePark. - "search-result-swimming", // Swimming. "search-result-zoo", // Zoo. + "search-result-pitch", // Pitch. + "search-result-swimming", // Swimming. + "search-result-hospital", // Hospital. + "search-result-clinic", // Clinic. + "search-result-pharmacy", // Pharmacy. + "non-found-search-result", // NotFound. }; @@ -156,9 +177,17 @@ private: {{"shop", "bookmaker"}, SearchMarkType::Lottery}, {{"shop", "lottery"}, SearchMarkType::Lottery}, {{"amenity", "cinema"}, SearchMarkType::Cinema}, + {{"amenity", "theatre"}, SearchMarkType::Theatre}, + {{"leisure", "stadium"}, SearchMarkType::Stadium}, + {{"tourism", "museum"}, SearchMarkType::Museum}, + {{"amenity", "arts_centre"}, SearchMarkType::Art}, + {{"tourism", "gallery"}, SearchMarkType::Art}, {{"amenity", "marketplace"}, SearchMarkType::Marketplace}, {{"amenity", "nightclub"}, SearchMarkType::Nightclub}, {{"leisure", "playground"}, SearchMarkType::Playground}, + {{"amenity", "bank"}, SearchMarkType::Bank}, + {{"shop", "money_lender"}, SearchMarkType::Bank}, + {{"amenity", "fuel"}, SearchMarkType::Fuel}, {{"shop", "alcohol"}, SearchMarkType::ShopAlcohol}, {{"shop", "beverages"}, SearchMarkType::ShopAlcohol}, {{"shop", "wine"}, SearchMarkType::ShopAlcohol}, @@ -185,8 +214,6 @@ private: {{"shop", "supermarket"}, SearchMarkType::ShopSupermarket}, {{"shop", "toys"}, SearchMarkType::ShopToys}, {{"tourism", "theme_park"}, SearchMarkType::ThemePark}, - {{"leisure", "swimming_pool"}, SearchMarkType::Swimming}, - {{"leisure", "water_park"}, SearchMarkType::Swimming}, {{"tourism", "zoo"}, SearchMarkType::Zoo}, {{"tourism", "chalet"}, SearchMarkType::Chalet}, {{"tourism", "alpine_hut"}, SearchMarkType::Chalet}, @@ -199,6 +226,16 @@ private: {{"tourism", "guest_house"}, SearchMarkType::Apartment}, {{"tourism", "camp_site"}, SearchMarkType::Campsite}, {{"tourism", "caravan_site"}, SearchMarkType::CaravanSite}, + {{"amenity", "hospital"}, SearchMarkType::Hospital}, + {{"amenity", "clinic"}, SearchMarkType::Clinic}, + {{"amenity", "doctors"}, SearchMarkType::Clinic}, + {{"amenity", "pharmacy"}, SearchMarkType::Pharmacy}, + {{"leisure", "pitch"}, SearchMarkType::Pitch}, + {{"leisure", "ice_rink"}, SearchMarkType::Pitch}, + {{"leisure", "sports_centre"}, SearchMarkType::Pitch}, + {{"leisure", "sports_hall"}, SearchMarkType::Pitch}, + {{"leisure", "swimming_pool"}, SearchMarkType::Swimming}, + {{"leisure", "water_park"}, SearchMarkType::Swimming}, }; m_searchMarkTypes.reserve(std::size(table));