Added rescue station

gpxsee.qrc

@@ -200,6 +200,7 @@
 		<file alias="construction.png">icons/map/marine/construction.png</file>
 		<file alias="radio-call.png">icons/map/marine/radio-call.png</file>
 		<file alias="current.png">icons/map/marine/current.png</file>
+		<file alias="rescue-station.png">icons/map/marine/rescue-station.png</file>
 	</qresource>
 
 	<!-- Mapsforge rendertheme -->

src/map/ENC/mapdata.cpp

@@ -23,6 +23,7 @@ static QMap<uint,uint> orderMapInit()
 	map.insert(TYPE(FOGSIG), 0);
 
 	map.insert(TYPE(CGUSTA), 1);
+	map.insert(TYPE(RSCSTA), 1);
 	map.insert(SUBTYPE(BUAARE, 1), 2);
 	map.insert(SUBTYPE(BUAARE, 5), 3);
 	map.insert(SUBTYPE(BUAARE, 4), 4);
@@ -264,6 +265,13 @@ MapData::Point::Point(uint type, const Coordinates &c, const QString &label,
 		if (_label.isEmpty())
 			_label = sistat(type & 0xFF);
 		_type = TYPE(SISTAT);
+	} else if (type>>16 == LNDELV && params.size()) {
+		if (_label.isEmpty())
+			_label = QString::fromLatin1(params.at(0))
+			  + QString::fromUtf8("\xE2\x80\x89m");
+		else
+			_label += "\n(" + QString::fromLatin1(params.at(0))
+			  + "\xE2\x80\x89m)";
 	}
 }
 
@@ -552,7 +560,8 @@ MapData::Attr MapData::pointAttr(const ISO8211::Record &r, uint OBJL)
 		if ((OBJL == I_DISMAR && key == I_WTWDIS)
 		  || (OBJL == RDOCAL && key == ORIENT)
 		  || (OBJL == I_RDOCAL && key == ORIENT)
-		  || (OBJL == CURENT && key == ORIENT))
+		  || (OBJL == CURENT && key == ORIENT)
+		  || (OBJL == LNDELV && key == ELEVAT))
 			params[0] = av.at(1).toByteArray();
 		if ((OBJL == I_RDOCAL && key == COMCHA)
 		  || (OBJL == RDOCAL && key == COMCHA)

src/map/ENC/objects.h

@@ -70,6 +70,7 @@
 #define RAILWY 106
 #define RCRTCL 108
 #define RECTRC 109
+#define RSCSTA 111
 #define RESARE 112
 #define RIVERS 114
 #define ROADWY 116

src/map/ENC/style.cpp

@@ -248,6 +248,7 @@ void Style::pointStyle()
 	_points[SUBTYPE(I_DISMAR, 3)] = _points[SUBTYPE(I_DISMAR, 2)];
 	_points[SUBTYPE(I_DISMAR, 4)] = _points[SUBTYPE(I_DISMAR, 2)];
 	_points[TYPE(CGUSTA)] = Point(QImage(":/marine/coast-guard.png"));
+	_points[TYPE(RSCSTA)] = Point(QImage(":/marine/rescue-station.png"));
 	_points[TYPE(RDOSTA)] = Point(QImage(":/marine/radio.png"));
 	_points[TYPE(RADSTA)] = Point(QImage(":/marine/radar.png"));
 	_points[TYPE(RTPBCN)] = Point(QImage(":/marine/radar-transponder.png"));