From 5ce1a89b05a2718b49295a55e4e98271a558e92b Mon Sep 17 00:00:00 2001 From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> Date: Sat, 28 Dec 2024 13:28:45 +0100 Subject: [PATCH] [styles] Add search result icons for water POIs Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> --- .../symbols/search-result-drinking-water-no.svg | 16 ++++++++++++++++ .../symbols/search-result-drinking-water.svg | 15 +++++++++++++++ .../symbols/search-result-drinking-water-no.svg | 16 ++++++++++++++++ .../symbols/search-result-drinking-water.svg | 15 +++++++++++++++ map/search_mark.cpp | 14 ++++++++++++++ 5 files changed, 76 insertions(+) create mode 100644 data/styles/default/dark/symbols/search-result-drinking-water-no.svg create mode 100644 data/styles/default/dark/symbols/search-result-drinking-water.svg create mode 100644 data/styles/default/light/symbols/search-result-drinking-water-no.svg create mode 100644 data/styles/default/light/symbols/search-result-drinking-water.svg diff --git a/data/styles/default/dark/symbols/search-result-drinking-water-no.svg b/data/styles/default/dark/symbols/search-result-drinking-water-no.svg new file mode 100644 index 0000000000..d32f00fe44 --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-drinking-water-no.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/search-result-drinking-water.svg b/data/styles/default/dark/symbols/search-result-drinking-water.svg new file mode 100644 index 0000000000..89f4976570 --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-drinking-water.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-drinking-water-no.svg b/data/styles/default/light/symbols/search-result-drinking-water-no.svg new file mode 100644 index 0000000000..d32f00fe44 --- /dev/null +++ b/data/styles/default/light/symbols/search-result-drinking-water-no.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-drinking-water.svg b/data/styles/default/light/symbols/search-result-drinking-water.svg new file mode 100644 index 0000000000..89f4976570 --- /dev/null +++ b/data/styles/default/light/symbols/search-result-drinking-water.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/map/search_mark.cpp b/map/search_mark.cpp index cdb4a6d417..317284ce6a 100644 --- a/map/search_mark.cpp +++ b/map/search_mark.cpp @@ -65,6 +65,8 @@ enum SearchMarkPoint::SearchMarkType : uint8_t Hospital, Clinic, Pharmacy, + DrinkingWater, + DrinkingWaterNo, NotFound, // Service value used in developer tools. Count @@ -128,6 +130,8 @@ std::array const kSymbols = { "search-result-hospital", // Hospital. "search-result-clinic", // Clinic. "search-result-pharmacy", // Pharmacy. + "search-result-drinking-water", // DrinkingWater. + "search-result-drinking-water-no", // DrinkingWaterNo. "non-found-search-result", // NotFound. @@ -240,6 +244,16 @@ private: {{"leisure", "sports_hall"}, SearchMarkType::Pitch}, {{"leisure", "swimming_pool"}, SearchMarkType::Swimming}, {{"leisure", "water_park"}, SearchMarkType::Swimming}, + {{"amenity", "drinking_water"}, SearchMarkType::DrinkingWater}, + {{"amenity", "water_point"}, SearchMarkType::DrinkingWater}, + {{"man_made", "water_tap"}, SearchMarkType::DrinkingWater}, + {{"man_made", "water_well"}, SearchMarkType::DrinkingWater}, + {{"natural", "spring"}, SearchMarkType::DrinkingWater}, + {{"natural", "hot_spring"}, SearchMarkType::DrinkingWater}, + {{"amenity", "water_point", "drinking_water_no"}, SearchMarkType::DrinkingWaterNo}, + {{"man_made", "water_tap", "drinking_water_no"}, SearchMarkType::DrinkingWaterNo}, + {{"man_made", "water_well", "drinking_water_no"}, SearchMarkType::DrinkingWaterNo}, + {{"natural", "spring", "drinking_water_no"}, SearchMarkType::DrinkingWaterNo}, }; m_searchMarkTypes.reserve(std::size(table));