Prohibited areas

gpxsee.qrc

@@ -184,6 +184,8 @@
 		<file alias="radar.png">icons/map/marine/radar.png</file>
 		<file alias="radar-transponder.png">icons/map/marine/radar-transponder.png</file>
 		<file alias="silo.png">icons/map/marine/silo.png</file>
+		<file alias="turning-basin.png">icons/map/marine/turning-basin.png</file>
+		<file alias="entry-prohibited-line.png">icons/map/marine/entry-prohibited-line.png</file>
 	</qresource>
 
 	<!-- Mapsforge rendertheme -->

src/map/ENC/mapdata.cpp

@@ -558,6 +558,8 @@ MapData::Attr MapData::polyAttr(const ISO8211::Record &r, uint OBJL)
 		  || (OBJL == I_RESARE && key == I_RESTRN)) {
 			if (av.at(1).toByteArray().toUInt() == 1)
 				subtype = 2;
+			if (av.at(1).toByteArray().toUInt() == 7)
+				subtype = 17;
 		}
 
 		if ((OBJL == TSSLPT && key == ORIENT)

src/map/ENC/objects.h

@@ -99,5 +99,6 @@
 #define I_SLCONS 17032
 #define I_WTWAXS 17051
 #define I_TERMNL 17064
+#define I_TRNBSN 17065
 
 #endif // ENC_OBJECTS_H

src/map/ENC/style.cpp

@@ -63,6 +63,10 @@ void Style::defaultPolygonStyle()
 	  Qt::BDiagPattern));
 	_polygons[SUBTYPE(RESARE, 2)] = Polygon(QImage(":/marine/noanchor-line.png"));
 	_polygons[SUBTYPE(I_RESARE, 2)] = Polygon(QImage(":/marine/noanchor-line.png"));
+	_polygons[SUBTYPE(RESARE, 17)] = Polygon(
+	  QImage(":/marine/entry-prohibited-line.png"));
+	_polygons[SUBTYPE(I_RESARE, 17)] = Polygon(
+	  QImage(":/marine/entry-prohibited-line.png"));
 	_polygons[SUBTYPE(ACHARE, 1)] = Polygon(QImage(":/marine/anchor-line.png"));
 	_polygons[SUBTYPE(I_ACHARE, 1)] = Polygon(QImage(":/marine/anchor-line.png"));
 	_polygons[TYPE(PRCARE)] = Polygon(QBrush(QColor("#eb49eb"),
@@ -77,7 +81,7 @@ void Style::defaultPolygonStyle()
 	  1));
 	_polygons[TYPE(I_FLODOC)] = Polygon(QBrush("#333333"),
 	  QPen(QColor("#000000"), 1));
-	_polygons[TYPE(DWRTPT)] = Polygon(QImage(":/marine/dw-route-line"));
+	_polygons[TYPE(DWRTPT)] = Polygon(QImage(":/marine/dw-route-line.png"));
 	_polygons[TYPE(MORFAC)] = Polygon(QBrush("#e8e064"), QPen(QColor("#000000"),
 	  2));
 	_polygons[TYPE(GATCON)] = Polygon(QBrush("#000000"));
@@ -105,7 +109,8 @@ void Style::defaultPolygonStyle()
 	  << TYPE(GATCON) << TYPE(I_GATCON) << TYPE(DMPGRD) << TYPE(TSEZNE)
 	  << TYPE(OBSTRN) << TYPE(UWTROC) << TYPE(DWRTPT) << SUBTYPE(ACHARE, 1)
 	  << SUBTYPE(I_ACHARE, 1) << SUBTYPE(RESARE, 9) << SUBTYPE(RESARE, 2)
-	  << SUBTYPE(I_RESARE, 2) << TYPE(PRCARE);
+	  << SUBTYPE(I_RESARE, 2) << SUBTYPE(RESARE, 17) << SUBTYPE(I_RESARE, 17)
+	  << TYPE(PRCARE);
 }
 
 void Style::defaultLineStyle()
@@ -219,6 +224,7 @@ void Style::defaultPointStyle()
 	_points[TYPE(RADSTA)] = Point(QImage(":/marine/radar.png"));
 	_points[TYPE(RTPBCN)] = Point(QImage(":/marine/radar-transponder.png"));
 	_points[TYPE(SILTNK)] = Point(QImage(":/marine/silo.png"));
+	_points[TYPE(I_TRNBSN)] = Point(QImage(":/marine/turning-basin.png"));
 }
 
 Style::Style()