Show recommended tracks orientation

gpxsee.qrc

@@ -331,6 +331,7 @@
 		<file alias="international-maritime-boundary.png">icons/map/marine/international-maritime-boundary.png</file>
 		<file alias="straight-territorial-sea-baseline.png">icons/map/marine/straight-territorial-sea-baseline.png</file>
 		<file alias="seaward-limit-of-territorial-sea.png">icons/map/marine/seaward-limit-of-territorial-sea.png</file>
+		<file alias="seaward-limit-of-contiguous-zone.png">icons/map/marine/seaward-limit-of-contiguous-zone.png</file>
 	</qresource>
 
 	<!-- Patterns (Mapsforge) -->

src/map/ENC/attributes.h

@@ -26,6 +26,7 @@
 #define DRVAL1 87
 #define ELEVAT 90
 #define FUNCTN 94
+#define JRSDTN 103
 #define LITVIS 108
 #define OBJNAM 116
 #define ORIENT 117

src/map/ENC/mapdata.cpp

@@ -488,6 +488,8 @@ MapData::Poly::Poly(uint type, const Polygon &path, const Attributes &attr,
 		subtype = CATSLC;
 	else if (type == I_SLCONS)
 		subtype = I_CATSLC;
+	else if (type == ADMARE)
+		subtype = JRSDTN;
 
 	switch (type) {
 		case DEPARE:
@@ -523,6 +525,8 @@ MapData::Line::Line(uint type, const QVector<Coordinates> &path,
 		_label = QString::fromLatin1(_attr.value(VALDCO));
 	else if (type == LNDELV)
 		_label = QString::fromLatin1(_attr.value(ELEVAT));
+	else if (type == RECTRC)
+		_label = QString::fromLatin1(_attr.value(ORIENT));
 	else
 		_label = QString::fromLatin1(_attr.value(OBJNAM));
 }

src/map/ENC/objects.h

@@ -4,6 +4,7 @@
 #define TYPE(t) ((t)<<16)
 #define SUBTYPE(t, s) (((t)<<16)|(s))
 
+#define ADMARE 1
 #define AIRARE 2
 #define ACHBRT 3
 #define ACHARE 4
@@ -88,6 +89,8 @@
 #define SLOTOP 126
 #define SMCFAC 128
 #define SOUNDG 129
+#define STSLNE 132
+#define TESARE 135
 #define TSELNE 145
 #define TSSBND 146
 #define TSSLPT 148

src/map/ENC/style.cpp

@@ -288,10 +288,14 @@ void Style::polygonStyle()
 	_polygons[SUBTYPE(I_BERTHS, 6)] = _polygons[TYPE(BERTHS)];
 	_polygons[TYPE(I_TRNBSN)] = Polygon(Qt::NoBrush, QPen(QColor(0xeb, 0x49, 0xeb),
 	  1, Qt::DashLine));
-	_polygons[TYPE(CONZNE)] = Polygon(Qt::NoBrush, QPen(QColor(0xeb, 0x49, 0xeb),
-	  1, Qt::DashDotLine));
 	_polygons[TYPE(PILBOP)] = Polygon(Qt::NoBrush, QPen(QColor(0xeb, 0x49, 0xeb),
 	  1, Qt::DashLine));
+	_polygons[TYPE(CONZNE)] = Polygon(
+	  QImage(":/marine/seaward-limit-of-contiguous-zone.png"));
+	_polygons[TYPE(TESARE)] = Polygon(
+	  QImage(":/marine/seaward-limit-of-territorial-sea.png"));
+	_polygons[SUBTYPE(ADMARE, 2)] = Polygon(
+	  QImage(":/marine/international-maritime-boundary.png"));
 
 	_drawOrder
 	  << TYPE(LNDARE) << SUBTYPE(DEPARE, 0) << SUBTYPE(DEPARE, 1)
@@ -339,7 +343,8 @@ void Style::polygonStyle()
 	  << SUBTYPE(I_RESARE, 25) << SUBTYPE(RESARE, 26) << SUBTYPE(I_RESARE, 26)
 	  << TYPE(CBLARE) << TYPE(PIPARE) << TYPE(PRCARE) << TYPE(I_TRNBSN)
 	  << TYPE(PILBOP) << SUBTYPE(MARCUL, 0) << SUBTYPE(MARCUL, 1)
-	  << SUBTYPE(MARCUL, 2) << SUBTYPE(MARCUL, 3) << TYPE(CONZNE);
+	  << SUBTYPE(MARCUL, 2) << SUBTYPE(MARCUL, 3) << TYPE(CONZNE)
+	  << TYPE(TESARE) << SUBTYPE(ADMARE, 2);
 }
 
 void Style::lineStyle(qreal ratio)
@@ -406,6 +411,7 @@ void Style::lineStyle(qreal ratio)
 	  Qt::SolidLine));
 	_lines[TYPE(I_WTWAXS)] = Line(QPen(QColor(0, 0, 0), 0, Qt::DashLine));
 	_lines[SUBTYPE(RECTRC, 1)] = Line(QPen(QColor(0, 0, 0), 0, Qt::SolidLine));
+	_lines[SUBTYPE(RECTRC, 1)].setTextFontSize(Small);
 	_lines[SUBTYPE(RECTRC, 2)] = Line(QPen(QColor(0, 0, 0), 0, Qt::DashLine));
 	_lines[SUBTYPE(RCRTCL, 1)] = Line(QPen(QColor(0xeb, 0x49, 0xeb), 0,
 	  Qt::SolidLine));
@@ -428,6 +434,8 @@ void Style::lineStyle(qreal ratio)
 	  Qt::DashLine));
 	_lines[SUBTYPE(RDOCAL, 4)] = Line(QPen(QColor(0xeb, 0x49, 0xeb), 1,
 	  Qt::DashLine));
+	_lines[TYPE(STSLNE)] = Line(
+	  QImage(":/marine/straight-territorial-sea-baseline.png"));
 }
 
 void Style::pointStyle(qreal ratio)

src/map/textpointitem.cpp

@@ -8,7 +8,7 @@
 
 
 #define FLAGS (Qt::AlignCenter | Qt::TextWordWrap | Qt::TextDontClip)
-#define MAX_TEXT_WIDTH 8
+#define MAX_TEXT_WIDTH 10
 #define MIN_BOX_WIDTH 2