From 533eaba1dbd2be12fc0128cabb3981f1b50503b5 Mon Sep 17 00:00:00 2001 From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> Date: Sun, 13 Oct 2024 10:36:07 +0200 Subject: [PATCH] [styles] Improve information icons and add search and bookmark icons Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> --- .../dark/symbols/bookmark-information-m.svg | 17 ++++++++++++ .../default/dark/symbols/information-m.svg | 27 ++++++------------- .../dark/symbols/information-office-m.svg | 17 ++++++------ .../symbols/search-result-information.svg | 20 ++++++++++++++ .../light/symbols/bookmark-information-m.svg | 17 ++++++++++++ .../default/light/symbols/information-m.svg | 27 ++++++------------- .../light/symbols/information-office-m.svg | 17 ++++++------ .../symbols/search-result-information.svg | 20 ++++++++++++++ kml/types.hpp | 2 ++ map/bookmark.cpp | 1 + map/bookmark_helpers.cpp | 4 +++ map/search_mark.cpp | 5 ++++ 12 files changed, 120 insertions(+), 54 deletions(-) create mode 100644 data/styles/default/dark/symbols/bookmark-information-m.svg create mode 100644 data/styles/default/dark/symbols/search-result-information.svg create mode 100644 data/styles/default/light/symbols/bookmark-information-m.svg create mode 100644 data/styles/default/light/symbols/search-result-information.svg diff --git a/data/styles/default/dark/symbols/bookmark-information-m.svg b/data/styles/default/dark/symbols/bookmark-information-m.svg new file mode 100644 index 0000000000..245649f2aa --- /dev/null +++ b/data/styles/default/dark/symbols/bookmark-information-m.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/information-m.svg b/data/styles/default/dark/symbols/information-m.svg index eff420857a..5f9579ecfa 100644 --- a/data/styles/default/dark/symbols/information-m.svg +++ b/data/styles/default/dark/symbols/information-m.svg @@ -1,20 +1,9 @@ - - - - information-m - - + + + + + + + + diff --git a/data/styles/default/dark/symbols/information-office-m.svg b/data/styles/default/dark/symbols/information-office-m.svg index 81783fea13..329c186fec 100644 --- a/data/styles/default/dark/symbols/information-office-m.svg +++ b/data/styles/default/dark/symbols/information-office-m.svg @@ -1,10 +1,11 @@ - - information-m - - - - - - + + + + + + + + + diff --git a/data/styles/default/dark/symbols/search-result-information.svg b/data/styles/default/dark/symbols/search-result-information.svg new file mode 100644 index 0000000000..e6354768d8 --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-information.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/bookmark-information-m.svg b/data/styles/default/light/symbols/bookmark-information-m.svg new file mode 100644 index 0000000000..3d1e855d62 --- /dev/null +++ b/data/styles/default/light/symbols/bookmark-information-m.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/information-m.svg b/data/styles/default/light/symbols/information-m.svg index d1f761df5f..f611ff64c5 100644 --- a/data/styles/default/light/symbols/information-m.svg +++ b/data/styles/default/light/symbols/information-m.svg @@ -1,20 +1,9 @@ - - - - information-m - - + + + + + + + + diff --git a/data/styles/default/light/symbols/information-office-m.svg b/data/styles/default/light/symbols/information-office-m.svg index 66f7336094..3cd13a96c2 100644 --- a/data/styles/default/light/symbols/information-office-m.svg +++ b/data/styles/default/light/symbols/information-office-m.svg @@ -1,10 +1,11 @@ - - information-m - - - - - - + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-information.svg b/data/styles/default/light/symbols/search-result-information.svg new file mode 100644 index 0000000000..e6354768d8 --- /dev/null +++ b/data/styles/default/light/symbols/search-result-information.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/kml/types.hpp b/kml/types.hpp index 1ee800dc67..5ef7ab7958 100644 --- a/kml/types.hpp +++ b/kml/types.hpp @@ -182,6 +182,7 @@ enum class BookmarkIcon : uint16_t Pharmacy, Stadium, Theatre, + Information, Count }; @@ -223,6 +224,7 @@ inline std::string ToString(BookmarkIcon icon) case Pharmacy: return "Pharmacy"; case Stadium: return "Stadium"; case Theatre: return "Theatre"; + case Information: return "Information"; case Count: return {}; } UNREACHABLE(); diff --git a/map/bookmark.cpp b/map/bookmark.cpp index 1569b32bbb..18f84303ba 100644 --- a/map/bookmark.cpp +++ b/map/bookmark.cpp @@ -46,6 +46,7 @@ std::string GetBookmarkIconType(kml::BookmarkIcon const & icon) case kml::BookmarkIcon::Pharmacy: return "pharmacy"; case kml::BookmarkIcon::Stadium: return "stadium"; case kml::BookmarkIcon::Theatre: return "theatre"; + case kml::BookmarkIcon::Information: return "information"; case kml::BookmarkIcon::Count: ASSERT(false, ("Invalid bookmark icon type")); return {}; diff --git a/map/bookmark_helpers.cpp b/map/bookmark_helpers.cpp index cae39ffc30..465425bff5 100644 --- a/map/bookmark_helpers.cpp +++ b/map/bookmark_helpers.cpp @@ -160,6 +160,10 @@ std::map const kFeatureTypeToBookmarkMatchInfo = {"tourism-attraction", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}}, {"waterway-waterfall", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}}, + {"tourism-information", {kml::BookmarkIcon::Information, BookmarkBaseType::Sights}}, + {"tourism-information-office", {kml::BookmarkIcon::Information, BookmarkBaseType::Sights}}, + {"tourism-information-visitor_centre", {kml::BookmarkIcon::Information, BookmarkBaseType::Sights}}, + {"leisure-fitness_centre", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}}, {"leisure-skiing", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}}, {"leisure-sports_centre-climbing", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}}, diff --git a/map/search_mark.cpp b/map/search_mark.cpp index 60ecc64c0c..439442f37e 100644 --- a/map/search_mark.cpp +++ b/map/search_mark.cpp @@ -37,6 +37,7 @@ enum SearchMarkPoint::SearchMarkType : uint8_t Stadium, Museum, Art, + Information, Marketplace, Nightclub, Playground, @@ -100,6 +101,7 @@ std::array const kSymbols = { "search-result-stadium", // Stadium. "search-result-museum", // Museum. "search-result-art", // Art. + "search-result-information", // Information. "search-result-marketplace", // Marketplace. "search-result-nightclub", // Nightclub. "search-result-playground", // Playground. @@ -182,6 +184,9 @@ private: {{"tourism", "museum"}, SearchMarkType::Museum}, {{"amenity", "arts_centre"}, SearchMarkType::Art}, {{"tourism", "gallery"}, SearchMarkType::Art}, + {{"tourism", "information"}, SearchMarkType::Information}, + {{"tourism", "information", "office"}, SearchMarkType::Information}, + {{"tourism", "information", "visitor_centre"}, SearchMarkType::Information}, {{"amenity", "marketplace"}, SearchMarkType::Marketplace}, {{"amenity", "nightclub"}, SearchMarkType::Nightclub}, {{"leisure", "playground"}, SearchMarkType::Playground},