From 70acdd3d96b400bc10dddefe78ede8c8ee515826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Wed, 7 May 2025 20:33:16 +0200
Subject: [PATCH] Added missing buoy/beacon icons

---
 gpxsee.qrc                                    |   4 ++++
 icons/map/marine/beacon-black-white-black.png | Bin 0 -> 275 bytes
 icons/map/marine/beacon-red-yellow.png        | Bin 0 -> 283 bytes
 icons/map/marine/buoy-black-white-black.png   | Bin 0 -> 320 bytes
 icons/map/marine/buoy-red-yellow.png          | Bin 0 -> 340 bytes
 src/map/ENC/style.cpp                         |   2 ++
 6 files changed, 6 insertions(+)
 create mode 100644 icons/map/marine/beacon-black-white-black.png
 create mode 100644 icons/map/marine/beacon-red-yellow.png
 create mode 100644 icons/map/marine/buoy-black-white-black.png
 create mode 100644 icons/map/marine/buoy-red-yellow.png

diff --git a/gpxsee.qrc b/gpxsee.qrc
index 21e6e8e2..652940ec 100644
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@@ -157,6 +157,7 @@
 		<file alias="buoy-red-white-red-white.png">icons/map/marine/buoy-red-white-red-white.png</file>
 		<file alias="buoy-red-black.png">icons/map/marine/buoy-red-black.png</file>
 		<file alias="buoy-red-green.png">icons/map/marine/buoy-red-green.png</file>
+		<file alias="buoy-red-yellow.png">icons/map/marine/buoy-red-yellow.png</file>
 		<file alias="buoy-red-green-red.png">icons/map/marine/buoy-red-green-red.png</file>
 		<file alias="buoy-red-green-red-green.png">icons/map/marine/buoy-red-green-red-green.png</file>
 		<file alias="buoy-yellow.png">icons/map/marine/buoy-yellow.png</file>
@@ -167,6 +168,7 @@
 		<file alias="buoy-yellow-red-yellow.png">icons/map/marine/buoy-yellow-red-yellow.png</file>
 		<file alias="buoy-black-white.png">icons/map/marine/buoy-black-white.png</file>
 		<file alias="buoy-black-red.png">icons/map/marine/buoy-black-red.png</file>
+		<file alias="buoy-black-white-black.png">icons/map/marine/buoy-black-white-black.png</file>
 		<file alias="buoy-black-red-black.png">icons/map/marine/buoy-black-red-black.png</file>
 		<file alias="buoy-black-green.png">icons/map/marine/buoy-black-green.png</file>
 		<file alias="buoy-black-yellow.png">icons/map/marine/buoy-black-yellow.png</file>
@@ -190,6 +192,7 @@
 		<file alias="beacon-red-white-red-white.png">icons/map/marine/beacon-red-white-red-white.png</file>
 		<file alias="beacon-red-black.png">icons/map/marine/beacon-red-black.png</file>
 		<file alias="beacon-red-green.png">icons/map/marine/beacon-red-green.png</file>
+		<file alias="beacon-red-yellow.png">icons/map/marine/beacon-red-yellow.png</file>
 		<file alias="beacon-red-green-red.png">icons/map/marine/beacon-red-green-red.png</file>
 		<file alias="beacon-red-green-red-green.png">icons/map/marine/beacon-red-green-red-green.png</file>
 		<file alias="beacon-yellow.png">icons/map/marine/beacon-yellow.png</file>
@@ -199,6 +202,7 @@
 		<file alias="beacon-yellow-black-yellow.png">icons/map/marine/beacon-yellow-black-yellow.png</file>
 		<file alias="beacon-yellow-red-yellow.png">icons/map/marine/beacon-yellow-red-yellow.png</file>
 		<file alias="beacon-black-white.png">icons/map/marine/beacon-black-white.png</file>
+		<file alias="beacon-black-white-black.png">icons/map/marine/beacon-black-white-black.png</file>
 		<file alias="beacon-black-red.png">icons/map/marine/beacon-black-red.png</file>
 		<file alias="beacon-black-red-black.png">icons/map/marine/beacon-black-red-black.png</file>
 		<file alias="beacon-black-green.png">icons/map/marine/beacon-black-green.png</file>
diff --git a/icons/map/marine/beacon-black-white-black.png b/icons/map/marine/beacon-black-white-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea4bbfea728a701fc23467f38d9c6752728ceb5d
GIT binary patch
literal 275
zcmeAS@N?(olHy`uVBq!ia0vp@KrGI|1|%;mJK6}O7>k44ofvPP)Tsw@SkfJR9T^xl
z_H+M9WCijSl0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d72G^}9Gu0R{01Y44~
zy9<K>!vY3r?)vGaKoQOYkH})6mDfR-(Me-=1yC@{)5S5w;`GxghI|JUc$nXI{ogO~
za+ioEuO_qd*%qeGGmbf}3>VyQe2dtgRIGJkuU_tvPS>?wZc(CV?>DT_tGDS$`tWPA
zyhD{;dV^2)*WL!(%5$G`{695Zuij-eO(XM5&#^~IIuVu=Rqoz*w^03m;RVQJ44$rj
JF6*2UngE=zTFw9f

literal 0
HcmV?d00001

diff --git a/icons/map/marine/beacon-red-yellow.png b/icons/map/marine/beacon-red-yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..82ec81b58d1babb1b5fa21aac1bdfea54c901275
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp@KrGI|1|%;mJK6}O7>k44ofvPP)Tsw@SkfJR9T^xl
z_H+M9WCijSl0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d72G^}9Gu0R{01Y44~
zy9<K>!vY3r?)vGaKoQOYkH})6mDfR-(Me-=1yHca)5S5w;`G}PN4^6J9NFUE{<EK7
zvinR+;`4)t{fd;7d>gm8aCshbpOA9?ut<Abmnh#?ub-K(*u|2}&xXnU)VXu}cj8kw
z*{3RtKiv9!Z|l`p_Fh4vamNa`E}a?ia-z%&&#JS2={hrmj-NT^l&mz%Qjp<J&~kIF
UtGs-tfwnVvy85}Sb4q9e0A>hZ8~^|S

literal 0
HcmV?d00001

diff --git a/icons/map/marine/buoy-black-white-black.png b/icons/map/marine/buoy-black-white-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..98c3c0184717613eacc4a9223101cb0dd5f434f8
GIT binary patch
literal 320
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?7!3HF=7hLlMQjEnx?oNz1PwLbIIV|apzK#qG
z8~eHcB(ehe3dtTpz6=aiY77hwEes65fI<x~7#K<o7#Ln9FfdrnU|<k0n6oR;1}MRn
z<n8XlV8F0|L7KaMdMQwZv%n*=n1O*?7=#%aX3dcR3QqTQaSX9Iy)@WUsKJ0Ed&a;2
zJL5hk&F#nu%S+lkA*iP}DD-K54s+vG`On-HjJap+A52LR40#YL^!LF`Um2ZelRrrC
z^mQ;e7>Q3Ts-C0rK|Ikbh_(B5Lkjm(!OA0-0=L_)HdSWlbuV|W*x1CwSN7ngW9U@z
z)tmU;Gu^sb7qCp{-@sgVmv8=CyFKij>4~3Tifqz$yL^eWZgZM!_oD4fflg%bboFyt
I=akR{0GI1$O8@`>

literal 0
HcmV?d00001

diff --git a/icons/map/marine/buoy-red-yellow.png b/icons/map/marine/buoy-red-yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1c2fdc4e42fe7341df39342d5e57b5e89c98d91
GIT binary patch
literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?7!3HF=7hLlMQjEnx?oNz1PwLbIIV|apzK#qG
z8~eHcB(ehe3dtTpz6=aiY77hwEes65fI<x~7#K<o7#Ln9FfdrnU|<k0n6oR;1}MRn
z<n8XlV8F0|L7KaMdMQwZv%n*=n1O*?7=#%aX3dcR3a<8aaSX9IJ$JGp-%$e&=iDiG
z{%@;4`9M#eb7{+^O%p%KIBR@VRMC9)hi6h<-$%Bxg8q+UaSPMJl=KRk7CXE=!Wwp0
zi{Zd3v#{g`Dw$Ke7s||u&P!jd(fX)6I^EsR=}+{wtc6AkXVz@KY@@aC@4AVWC;q&-
z#j`y!M#sLNp>zK8NfSzaJiF|JuLZHp{9?Vy$y4DchyA)*_I-Q(*5nqHPqgT+wVRu;
eH6<r%7lW8bqG=tQ+CHGO89ZJ6T-G@yGywoRgLGv8

literal 0
HcmV?d00001

diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp
index b8f87482..ea39fd16 100644
--- a/src/map/ENC/style.cpp
+++ b/src/map/ENC/style.cpp
@@ -43,6 +43,7 @@ using namespace Util;
 	PNT(type, COLOR2(3, 1), ":/marine/" name "-red-white.png", dx, dy); \
 	PNT(type, COLOR2(3, 2), ":/marine/" name "-red-black.png", dx, dy); \
 	PNT(type, COLOR2(3, 4), ":/marine/" name "-red-green.png", dx, dy); \
+	PNT(type, COLOR2(3, 6), ":/marine/" name "-red-yellow.png", dx, dy); \
 	PNT(type, COLOR2(4, 1), ":/marine/" name "-green-white.png", dx, dy); \
 	PNT(type, COLOR2(4, 2), ":/marine/" name "-green-black.png", dx, dy); \
 	PNT(type, COLOR2(4, 3), ":/marine/" name "-green-red.png", dx, dy); \
@@ -55,6 +56,7 @@ using namespace Util;
 	PNT(type, COLOR3(1, 6, 1), ":/marine/" name "-white-yellow-white.png", dx, dy); \
 	PNT(type, COLOR3(1, 9, 1), ":/marine/" name "-white-yellow-white.png", dx, dy); \
 	PNT(type, COLOR3(1, 11, 1), ":/marine/" name "-white-yellow-white.png", dx, dy); \
+	PNT(type, COLOR3(2, 1, 2), ":/marine/" name "-black-white-black.png", dx, dy); \
 	PNT(type, COLOR3(2, 3, 2), ":/marine/" name "-black-red-black.png", dx, dy); \
 	PNT(type, COLOR3(2, 6, 2), ":/marine/" name "-black-yellow-black.png", dx, dy); \
 	PNT(type, COLOR3(3, 4, 3), ":/marine/" name "-red-green-red.png", dx, dy); \