From a6a35b16e95bb9a1184e475251fe1f620a11807d Mon Sep 17 00:00:00 2001 From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> Date: Sat, 28 Dec 2024 14:00:21 +0100 Subject: [PATCH] [styles] Add search result icons for tourism POIs Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> --- .../search-result-archaeological-site.svg | 15 +++++++++++ .../dark/symbols/search-result-attraction.svg | 15 +++++++++++ .../dark/symbols/search-result-remains.svg | 15 +++++++++++ .../dark/symbols/search-result-viewpoint.svg | 15 +++++++++++ .../search-result-archaeological-site.svg | 15 +++++++++++ .../symbols/search-result-attraction.svg | 15 +++++++++++ .../light/symbols/search-result-remains.svg | 15 +++++++++++ .../light/symbols/search-result-viewpoint.svg | 15 +++++++++++ map/search_mark.cpp | 25 +++++++++++++++++++ 9 files changed, 145 insertions(+) create mode 100644 data/styles/default/dark/symbols/search-result-archaeological-site.svg create mode 100644 data/styles/default/dark/symbols/search-result-attraction.svg create mode 100644 data/styles/default/dark/symbols/search-result-remains.svg create mode 100644 data/styles/default/dark/symbols/search-result-viewpoint.svg create mode 100644 data/styles/default/light/symbols/search-result-archaeological-site.svg create mode 100644 data/styles/default/light/symbols/search-result-attraction.svg create mode 100644 data/styles/default/light/symbols/search-result-remains.svg create mode 100644 data/styles/default/light/symbols/search-result-viewpoint.svg diff --git a/data/styles/default/dark/symbols/search-result-archaeological-site.svg b/data/styles/default/dark/symbols/search-result-archaeological-site.svg new file mode 100644 index 0000000000..8006805983 --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-archaeological-site.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/search-result-attraction.svg b/data/styles/default/dark/symbols/search-result-attraction.svg new file mode 100644 index 0000000000..0da8d5b4a7 --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-attraction.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/search-result-remains.svg b/data/styles/default/dark/symbols/search-result-remains.svg new file mode 100644 index 0000000000..3b76c65c4c --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-remains.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/search-result-viewpoint.svg b/data/styles/default/dark/symbols/search-result-viewpoint.svg new file mode 100644 index 0000000000..ee9e6e67c9 --- /dev/null +++ b/data/styles/default/dark/symbols/search-result-viewpoint.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-archaeological-site.svg b/data/styles/default/light/symbols/search-result-archaeological-site.svg new file mode 100644 index 0000000000..8006805983 --- /dev/null +++ b/data/styles/default/light/symbols/search-result-archaeological-site.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-attraction.svg b/data/styles/default/light/symbols/search-result-attraction.svg new file mode 100644 index 0000000000..0da8d5b4a7 --- /dev/null +++ b/data/styles/default/light/symbols/search-result-attraction.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-remains.svg b/data/styles/default/light/symbols/search-result-remains.svg new file mode 100644 index 0000000000..3b76c65c4c --- /dev/null +++ b/data/styles/default/light/symbols/search-result-remains.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/styles/default/light/symbols/search-result-viewpoint.svg b/data/styles/default/light/symbols/search-result-viewpoint.svg new file mode 100644 index 0000000000..ee9e6e67c9 --- /dev/null +++ b/data/styles/default/light/symbols/search-result-viewpoint.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/map/search_mark.cpp b/map/search_mark.cpp index 317284ce6a..db60fd95b5 100644 --- a/map/search_mark.cpp +++ b/map/search_mark.cpp @@ -37,6 +37,10 @@ enum SearchMarkPoint::SearchMarkType : uint8_t Stadium, Museum, Art, + Attraction, + Viewpoint, + Remains, + ArchaeologicalSite, Information, Marketplace, Nightclub, @@ -102,6 +106,10 @@ std::array const kSymbols = { "search-result-stadium", // Stadium. "search-result-museum", // Museum. "search-result-art", // Art. + "search-result-attraction", // Attraction. + "search-result-viewpoint", // Viewpoint. + "search-result-remains", // Remains. + "search-result-archaeological-site", // ArchaeologicalSite. "search-result-information", // Information. "search-result-marketplace", // Marketplace. "search-result-nightclub", // Nightclub. @@ -187,6 +195,23 @@ private: {{"tourism", "museum"}, SearchMarkType::Museum}, {{"amenity", "arts_centre"}, SearchMarkType::Art}, {{"tourism", "gallery"}, SearchMarkType::Art}, + {{"tourism", "attraction"}, SearchMarkType::Attraction}, + {{"tourism", "viewpoint"}, SearchMarkType::Viewpoint}, + {{"historic", "fort"}, SearchMarkType::Remains}, + {{"historic", "castle"}, SearchMarkType::Remains}, + {{"historic", "castle", "castrum"}, SearchMarkType::Remains}, + {{"historic", "castle", "fortified_church"}, SearchMarkType::Remains}, + {{"historic", "castle", "fortress"}, SearchMarkType::Remains}, + {{"historic", "castle", "hillfort"}, SearchMarkType::Remains}, + {{"historic", "castle", "kremlin"}, SearchMarkType::Remains}, + {{"historic", "castle", "manor"}, SearchMarkType::Remains}, + {{"historic", "castle", "palace"}, SearchMarkType::Remains}, + {{"historic", "castle", "shiro"}, SearchMarkType::Remains}, + {{"historic", "castle", "defensive"}, SearchMarkType::Remains}, + {{"historic", "castle", "stately"}, SearchMarkType::Remains}, + {{"historic", "ruins"}, SearchMarkType::Remains}, + {{"historic", "city_gate"}, SearchMarkType::Remains}, + {{"historic", "archaeological_site"}, SearchMarkType::ArchaeologicalSite}, {{"tourism", "information"}, SearchMarkType::Information}, {{"tourism", "information", "office"}, SearchMarkType::Information}, {{"tourism", "information", "visitor_centre"}, SearchMarkType::Information},