Show obstruction/wreck depths

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>

src/map/ENC/attributes.h

@@ -33,6 +33,7 @@
 #define TRAFIC 172
 #define VALDCO 174
 #define VALNMR 178
+#define VALSOU 179
 #define VERCLR 181
 #define WATLEV 187
 

src/map/ENC/mapdata.cpp

@@ -351,6 +351,7 @@ MapData::Point::Point(uint type, const Coordinates &c, const Attributes &attr,
   uint HUNI, bool polygon) : _pos(c), _attr(attr), _polygon(polygon)
 {
 	uint subtype = 0;
+	bool ok;
 
 	if (type == HRBFAC)
 		subtype = CATHAF;
@@ -442,11 +443,14 @@ MapData::Point::Point(uint type, const Coordinates &c, const Attributes &attr,
 			_label += "\n(" + QString::fromLatin1(_attr.value(ELEVAT))
 			  + "\xE2\x80\x89m)";
 	} else if (type == BRIDGE || type == I_BRIDGE) {
-		double clr = _attr.value(VERCLR).toDouble();
-		if (clr > 0) {
+		double clr = _attr.value(VERCLR).toDouble(&ok);
+		if (ok && clr > 0)
 			_label = QString::fromUtf8("\xE2\x86\x95") + UNIT_SPACE
 			  + QString::number(clr) + UNIT_SPACE + hUnits(HUNI);
-		}
+	} else if (type == OBSTRN || type == WRECKS) {
+		double depth = _attr.value(VALSOU).toDouble(&ok);
+		if (ok && _label.isEmpty())
+			_label = QString::number(depth);
 	} else if (_type == SUBTYPE(RESARE, 8)) {
 		if (_label.isEmpty())
 			_label = "Degaussing Range";

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); \