From eb81ee9aaa73b7cf566fb18d532298a49c589abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Fri, 25 Apr 2025 23:00:25 +0200
Subject: [PATCH] Shellfish farms

---
 gpxsee.qrc                               |   1 +
 icons/map/marine/shellfish-farm-line.png | Bin 0 -> 335 bytes
 src/map/ENC/mapdata.cpp                  |   4 ++--
 src/map/ENC/objects.h                    |   2 +-
 src/map/ENC/style.cpp                    |  13 ++++++++-----
 5 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 icons/map/marine/shellfish-farm-line.png

diff --git a/gpxsee.qrc b/gpxsee.qrc
index 1c08bde5..5ea77cf5 100644
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@@ -218,6 +218,7 @@
 		<file alias="nature-reserve-line.png">icons/map/marine/nature-reserve-line.png</file>
 		<file alias="sanctuary-line.png">icons/map/marine/sanctuary-line.png</file>
 		<file alias="fishing-farm.png">icons/map/marine/fishing-farm.png</file>
+		<file alias="shellfish-farm-line.png">icons/map/marine/shellfish-farm-line.png</file>
 	</qresource>
 
 	<!-- Patterns (Mapsforge) -->
diff --git a/icons/map/marine/shellfish-farm-line.png b/icons/map/marine/shellfish-farm-line.png
new file mode 100644
index 0000000000000000000000000000000000000000..7236ec5154e466705a6b16d5eb4ee52238464cfe
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0y~yV31~DU|{E9V_;zTdBAKd0|NtNage(c<IR&g^$ZLQ
zEa{HEjtmSN`?>!lvNA9*C?tCX`7$t6sWC7#v@kIIVqjosc)`F>YQVtoDuIE)Y6b&?
zc)^@qfi?^b3~Wi>?k)@l3=0^fx$CEwGB7Z37I;J!GcfR82Vq7hjoB3p3=GRWT^vI+
z&aVw}<YF@9nRCr`$~=)@-9J0@zbSw2-diaUc&o}&af<6wi{&PYGfysIWSg}1_@qPI
z|L{EeF-^q7ZBn{>!6A78pTCR;E*EhgSex&-X{UwPs>>;L3?~zqW-WQPrpNC2+OHp&
zw!b>Pz=T1A;TuETwJ8iX+uE28R7EcSdUVa7kK0av5bV2WBpjUc_*U-s6W8w?oi;yj
o+s0phL8eajDxSN}-+RNmw<Od_weG<k1_lNOPgg&ebxsLQ0Nwq35dZ)H

literal 0
HcmV?d00001

diff --git a/src/map/ENC/mapdata.cpp b/src/map/ENC/mapdata.cpp
index dd7cca0d..7c4af56c 100644
--- a/src/map/ENC/mapdata.cpp
+++ b/src/map/ENC/mapdata.cpp
@@ -375,7 +375,7 @@ MapData::Point::Point(uint type, const Coordinates &c, const Attributes &attr,
 		subtype = CATACH;
 	else if (type == I_ACHARE)
 		subtype = I_CATACH;
-	else if (type == MARKUL)
+	else if (type == MARCUL)
 		subtype = CATMFA;
 	else if (type == I_BUNSTA)
 		subtype = I_CATBUN;
@@ -436,7 +436,7 @@ MapData::Poly::Poly(uint type, const Polygon &path, const Attributes &attr,
 		subtype = I_CATACH;
 	else if (type == HRBFAC)
 		subtype = CATHAF;
-	else if (type == MARKUL)
+	else if (type == MARCUL)
 		subtype = CATMFA;
 	else if (type == I_BERTHS)
 		subtype = I_CATBRT;
diff --git a/src/map/ENC/objects.h b/src/map/ENC/objects.h
index 2fa3568c..aea5ebce 100644
--- a/src/map/ENC/objects.h
+++ b/src/map/ENC/objects.h
@@ -55,7 +55,7 @@
 #define LNDMRK 74
 #define LIGHTS 75
 #define LOKBSN 79
-#define MARKUL 82
+#define MARCUL 82
 #define MORFAC 84
 #define NAVLNE 85
 #define OBSTRN 86
diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp
index f04ae791..113e3f4c 100644
--- a/src/map/ENC/style.cpp
+++ b/src/map/ENC/style.cpp
@@ -147,8 +147,10 @@ void Style::polygonStyle()
 	  1.5, Qt::DashLine));
 	_polygons[TYPE(CBLARE)] = Polygon(QImage(":/marine/cable-area-line.png"));
 	_polygons[TYPE(PIPARE)] = Polygon(QImage(":/marine/pipeline-area-line.png"));
-	_polygons[SUBTYPE(MARKUL, 0)] = Polygon(QImage(":/marine/fishing-farm-line.png"));
-	_polygons[SUBTYPE(MARKUL, 3)] = Polygon(QImage(":/marine/fishing-farm-line.png"));
+	_polygons[SUBTYPE(MARCUL, 0)] = Polygon(QImage(":/marine/fishing-farm-line.png"));
+	_polygons[SUBTYPE(MARCUL, 1)] = Polygon(QImage(":/marine/shellfish-farm-line.png"));
+	_polygons[SUBTYPE(MARCUL, 2)] = Polygon(QImage(":/marine/shellfish-farm-line.png"));
+	_polygons[SUBTYPE(MARCUL, 3)] = Polygon(QImage(":/marine/fishing-farm-line.png"));
 	_polygons[TYPE(BERTHS)] = Polygon(Qt::NoBrush, QPen(QColor(0xeb, 0x49, 0xeb),
 	  1, Qt::DashLine));
 	_polygons[TYPE(I_BERTHS)] = _polygons[TYPE(BERTHS)];
@@ -189,7 +191,8 @@ void Style::polygonStyle()
 	  << SUBTYPE(RESARE, 23) << SUBTYPE(I_RESARE, 23) << SUBTYPE(RESARE, 25)
 	  << SUBTYPE(I_RESARE, 25) << SUBTYPE(RESARE, 26) << SUBTYPE(I_RESARE, 26)
 	  << TYPE(CBLARE) << TYPE(PIPARE) << TYPE(PRCARE) << TYPE(I_TRNBSN)
-	  << SUBTYPE(MARKUL, 0) << SUBTYPE(MARKUL, 3) << TYPE(CONZNE);
+	  << SUBTYPE(MARCUL, 0) << SUBTYPE(MARCUL, 1) << SUBTYPE(MARCUL, 2)
+	  << SUBTYPE(MARCUL, 3) << TYPE(CONZNE);
 }
 
 void Style::lineStyle(qreal ratio)
@@ -402,8 +405,8 @@ void Style::pointStyle(qreal ratio)
 	_points[TYPE(LNDARE)].setHaloColor(QColor());
 	_points[TYPE(LNDRGN)].setHaloColor(QColor());
 	_points[TYPE(RADRFL)] = Point(QImage(":/marine/radar-reflector.png"));
-	_points[SUBTYPE(MARKUL, 0)] = Point(QImage(":/marine/fishing-farm.png"));
-	_points[SUBTYPE(MARKUL, 3)] = Point(QImage(":/marine/fishing-farm.png"));
+	_points[SUBTYPE(MARCUL, 0)] = Point(QImage(":/marine/fishing-farm.png"));
+	_points[SUBTYPE(MARCUL, 3)] = Point(QImage(":/marine/fishing-farm.png"));
 
 	_points[SUBTYPE(I_BERTHS, 6)] = Point(QImage(":/marine/fleeting-area.png"),
 	  Small);