From 9ff95e9a59ee43d2181963b17e492e168539f29f Mon Sep 17 00:00:00 2001
From: Harry Bond <endim8@pm.me>
Date: Thu, 8 Dec 2022 23:01:36 +0000
Subject: [PATCH] [styles] new icon for music shop

Signed-off-by: Harry Bond <endim8@pm.me>
---
 data/styles/clear/include/Icons.mapcss                 |  6 ++++--
 data/styles/clear/style-clear/symbols/music-m.svg      |  9 ++-------
 .../clear/style-clear/symbols/musical-instrument-m.svg | 10 ++++++++++
 data/styles/clear/style-night/symbols/music-m.svg      |  9 ++-------
 .../clear/style-night/symbols/musical-instrument-m.svg | 10 ++++++++++
 5 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 data/styles/clear/style-clear/symbols/musical-instrument-m.svg
 create mode 100644 data/styles/clear/style-night/symbols/musical-instrument-m.svg

diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 4414a97fec..67b73db971 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -2378,12 +2378,13 @@ area|z16[shop=gift]
 {icon-image: gift-m.svg;}
 node|z16[shop=music],
 area|z16[shop=music],
+{icon-image: music-m.svg;}
 node|z16[shop=video],
 area|z16[shop=video]
 {icon-image: media-m.svg;}
 node|z16[shop=musical_instrument],
 area|z16[shop=musical_instrument]
-{icon-image: music-m.svg;}
+{icon-image: musical-instrument-m.svg;}
 node|z16[shop=greengrocer],
 area|z16[shop=greengrocer]
 {icon-image: greengrocer-m.svg;}
@@ -2565,12 +2566,13 @@ area|z17-[shop=gift]
 {icon-image: gift-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=music],
 area|z17-[shop=music],
+{icon-image: music-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=video],
 area|z17-[shop=video]
 {icon-image: media-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=musical_instrument],
 area|z17-[shop=musical_instrument]
-{icon-image: music-m.svg;icon-min-distance: 24;text-optional: true;}
+{icon-image: musical-instrument-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=greengrocer],
 area|z17-[shop=greengrocer]
 {icon-image: greengrocer-m.svg;icon-min-distance: 24;text-optional: true;}
diff --git a/data/styles/clear/style-clear/symbols/music-m.svg b/data/styles/clear/style-clear/symbols/music-m.svg
index 3e1df80668..b013772721 100644
--- a/data/styles/clear/style-clear/symbols/music-m.svg
+++ b/data/styles/clear/style-clear/symbols/music-m.svg
@@ -1,10 +1,5 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>music-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="music-m" fill-rule="nonzero">
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
    <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <path id="Shape" d="m18.743 6.4923-1.236-1.236c-0.34181-0.34181-0.8969-0.34181-1.2387 0l-1.8567 1.8567c-0.34181 0.34181-0.34181 0.8969 0 1.2387l-1.4821 1.4793c-1.2414-0.79299-2.7454-0.79026-3.6505 0.11485-0.26524 0.26524-0.44845 0.57971-0.56056 0.92698-0.1668 0.51408-0.6426 0.90511-1.1676 0.95433-0.65627 0.062893-1.2661 0.3172-1.7336 0.78753-1.2633 1.2606-1.0364 3.5302 0.50041 5.067 1.5368 1.5368 3.8064 1.761 5.067 0.50041 0.47033-0.46759 0.72463-1.0774 0.78753-1.7364 0.04922-0.52228 0.44025-1.0008 0.95433-1.1676 0.34728-0.11211 0.66174-0.29532 0.92698-0.56056 0.90511-0.90511 0.90511-2.4091 0.11485-3.6505l1.4821-1.4821c0.34181 0.34181 0.8969 0.34181 1.2387 0l1.8567-1.8567c0.33907-0.33907 0.33907-0.89417-0.0027344-1.236zm-8.0557 8.1323c-0.72463 0-1.3125-0.58791-1.3125-1.3125 0-0.72463 0.58791-1.3125 1.3125-1.3125 0.72463 0 1.3125 0.58791 1.3125 1.3125 0 0.72463-0.58791 1.3125-1.3125 1.3125z" fill="#fff"/>
-  </g>
- </g>
+  <path d="m18.289 5.5406c0.20956 0.15523 0.33374 0.40359 0.33374 0.6649v8.6928c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-3.7669l-6.6231 1.9869v5.3864c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-5.9142c0-0.36479 0.2406-0.68818 0.58987-0.79426l8.2789-2.4837c0.25095-0.075029 0.5226-0.02848 0.73216 0.12936z" fill="#fff"/>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/musical-instrument-m.svg b/data/styles/clear/style-clear/symbols/musical-instrument-m.svg
new file mode 100644
index 0000000000..3e1df80668
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/musical-instrument-m.svg
@@ -0,0 +1,10 @@
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <title>music-m</title>
+ <g fill="none" fill-rule="evenodd">
+  <g id="music-m" fill-rule="nonzero">
+   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <path id="Shape" d="m18.743 6.4923-1.236-1.236c-0.34181-0.34181-0.8969-0.34181-1.2387 0l-1.8567 1.8567c-0.34181 0.34181-0.34181 0.8969 0 1.2387l-1.4821 1.4793c-1.2414-0.79299-2.7454-0.79026-3.6505 0.11485-0.26524 0.26524-0.44845 0.57971-0.56056 0.92698-0.1668 0.51408-0.6426 0.90511-1.1676 0.95433-0.65627 0.062893-1.2661 0.3172-1.7336 0.78753-1.2633 1.2606-1.0364 3.5302 0.50041 5.067 1.5368 1.5368 3.8064 1.761 5.067 0.50041 0.47033-0.46759 0.72463-1.0774 0.78753-1.7364 0.04922-0.52228 0.44025-1.0008 0.95433-1.1676 0.34728-0.11211 0.66174-0.29532 0.92698-0.56056 0.90511-0.90511 0.90511-2.4091 0.11485-3.6505l1.4821-1.4821c0.34181 0.34181 0.8969 0.34181 1.2387 0l1.8567-1.8567c0.33907-0.33907 0.33907-0.89417-0.0027344-1.236zm-8.0557 8.1323c-0.72463 0-1.3125-0.58791-1.3125-1.3125 0-0.72463 0.58791-1.3125 1.3125-1.3125 0.72463 0 1.3125 0.58791 1.3125 1.3125 0 0.72463-0.58791 1.3125-1.3125 1.3125z" fill="#fff"/>
+  </g>
+ </g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/music-m.svg b/data/styles/clear/style-night/symbols/music-m.svg
index 4b04cf7b80..5f07cac502 100644
--- a/data/styles/clear/style-night/symbols/music-m.svg
+++ b/data/styles/clear/style-night/symbols/music-m.svg
@@ -1,10 +1,5 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <title>music-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="music-m" fill-rule="nonzero">
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
    <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <path id="Shape" d="m18.743 6.4923-1.236-1.236c-0.34181-0.34181-0.8969-0.34181-1.2387 0l-1.8567 1.8567c-0.34181 0.34181-0.34181 0.8969 0 1.2387l-1.4821 1.4793c-1.2414-0.79299-2.7454-0.79026-3.6505 0.11485-0.26524 0.26524-0.44845 0.57971-0.56056 0.92698-0.1668 0.51408-0.6426 0.90511-1.1676 0.95433-0.65627 0.062893-1.2661 0.3172-1.7336 0.78753-1.2633 1.2606-1.0364 3.5302 0.50041 5.067 1.5368 1.5368 3.8064 1.761 5.067 0.50041 0.47033-0.46759 0.72463-1.0774 0.78753-1.7364 0.04922-0.52228 0.44025-1.0008 0.95433-1.1676 0.34728-0.11211 0.66174-0.29532 0.92698-0.56056 0.90511-0.90511 0.90511-2.4091 0.11485-3.6505l1.4821-1.4821c0.34181 0.34181 0.8969 0.34181 1.2387 0l1.8567-1.8567c0.33907-0.33907 0.33907-0.89417-0.0027344-1.236zm-8.0557 8.1323c-0.72463 0-1.3125-0.58791-1.3125-1.3125 0-0.72463 0.58791-1.3125 1.3125-1.3125 0.72463 0 1.3125 0.58791 1.3125 1.3125 0 0.72463-0.58791 1.3125-1.3125 1.3125z" fill="#000"/>
-  </g>
- </g>
+  <path d="m18.289 5.5406c0.20956 0.15523 0.33374 0.40359 0.33374 0.6649v8.6928c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-3.7669l-6.6231 1.9869v5.3864c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-5.9142c0-0.36479 0.2406-0.68818 0.58987-0.79426l8.2789-2.4837c0.25095-0.075029 0.5226-0.02848 0.73216 0.12936z" fill="#000"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/musical-instrument-m.svg b/data/styles/clear/style-night/symbols/musical-instrument-m.svg
new file mode 100644
index 0000000000..1b8b624273
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/musical-instrument-m.svg
@@ -0,0 +1,10 @@
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <title>music-m</title>
+ <g id="Page-2:-Night" fill="none" fill-rule="evenodd">
+  <g id="music-m" fill-rule="nonzero">
+   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity="0.6"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <path id="Shape" d="m18.743 6.4923-1.236-1.236c-0.34181-0.34181-0.8969-0.34181-1.2387 0l-1.8567 1.8567c-0.34181 0.34181-0.34181 0.8969 0 1.2387l-1.4821 1.4793c-1.2414-0.79299-2.7454-0.79026-3.6505 0.11485-0.26524 0.26524-0.44845 0.57971-0.56056 0.92698-0.1668 0.51408-0.6426 0.90511-1.1676 0.95433-0.65627 0.062893-1.2661 0.3172-1.7336 0.78753-1.2633 1.2606-1.0364 3.5302 0.50041 5.067 1.5368 1.5368 3.8064 1.761 5.067 0.50041 0.47033-0.46759 0.72463-1.0774 0.78753-1.7364 0.04922-0.52228 0.44025-1.0008 0.95433-1.1676 0.34728-0.11211 0.66174-0.29532 0.92698-0.56056 0.90511-0.90511 0.90511-2.4091 0.11485-3.6505l1.4821-1.4821c0.34181 0.34181 0.8969 0.34181 1.2387 0l1.8567-1.8567c0.33907-0.33907 0.33907-0.89417-0.0027344-1.236zm-8.0557 8.1323c-0.72463 0-1.3125-0.58791-1.3125-1.3125 0-0.72463 0.58791-1.3125 1.3125-1.3125 0.72463 0 1.3125 0.58791 1.3125 1.3125 0 0.72463-0.58791 1.3125-1.3125 1.3125z" fill="#000"/>
+  </g>
+ </g>
+</svg>