gpxsee.qrc

@@ -311,7 +311,6 @@
 		<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>
 		<file alias="degaussing-line.png">icons/map/marine/degaussing-line.png</file>
-		<file alias="nofishing-line.png">icons/map/marine/nofishing-line.png</file>
 	</qresource>
 
 	<!-- Patterns (Mapsforge) -->

src/map/ENC/mapdata.cpp

@@ -199,7 +199,6 @@ static bool polygonPointCb(const MapData::Poly *polygon, void *context)
 	  || type == SUBTYPE(I_ACHARE, 12) || type == SUBTYPE(I_BERTHS, 6)
 	  || type == SUBTYPE(RESARE, 1) || type == SUBTYPE(I_RESARE, 1)
 	  || type == SUBTYPE(RESARE, 2) || type == SUBTYPE(I_RESARE, 2)
-	  || type == SUBTYPE(RESARE, 3) || type == SUBTYPE(I_RESARE, 3)
 	  || type == SUBTYPE(RESARE, 4) || type == SUBTYPE(I_RESARE, 4)
 	  || type == SUBTYPE(RESARE, 5) || type == SUBTYPE(I_RESARE, 5)
 	  || type == SUBTYPE(RESARE, 6) || type == SUBTYPE(I_RESARE, 6)
@@ -324,8 +323,6 @@ static uint restrictionCategory(uint type, const MapData::Attributes &attr)
 
 		if (restrn == 1)
 			return 2;
-		else if (restrn == 3)
-			return 3;
 		else if (restrn == 7)
 			return 17;
 		else

src/map/ENC/style.cpp

@@ -134,7 +134,6 @@ void Style::polygonStyle()
 	_polygons[TYPE(UNSARE)] = Polygon(QBrush(QColor(0x99, 0x99, 0x99)));
 	_polygons[SUBTYPE(RESARE, 1)] = Polygon(QImage(":/marine/safety-zone-line.png"));
 	_polygons[SUBTYPE(RESARE, 2)] = Polygon(QImage(":/marine/noanchor-line.png"));
-	_polygons[SUBTYPE(RESARE, 3)] = Polygon(QImage(":/marine/nofishing-line.png"));
 	_polygons[SUBTYPE(RESARE, 4)] = Polygon(QImage(":/marine/nature-reserve-line.png"));
 	_polygons[SUBTYPE(RESARE, 5)] = Polygon(QImage(":/marine/sanctuary-line.png"));
 	_polygons[SUBTYPE(RESARE, 6)] = Polygon(QImage(":/marine/sanctuary-line.png"));
@@ -152,7 +151,6 @@ void Style::polygonStyle()
 	_polygons[SUBTYPE(RESARE, 26)] = Polygon(QImage(":/marine/safety-zone-line.png"));
 	_polygons[SUBTYPE(I_RESARE, 1)] = _polygons[SUBTYPE(RESARE, 1)];
 	_polygons[SUBTYPE(I_RESARE, 2)] = _polygons[SUBTYPE(RESARE, 2)];
-	_polygons[SUBTYPE(I_RESARE, 3)] = _polygons[SUBTYPE(RESARE, 3)];
 	_polygons[SUBTYPE(I_RESARE, 4)] = _polygons[SUBTYPE(RESARE, 4)];
 	_polygons[SUBTYPE(I_RESARE, 5)] = _polygons[SUBTYPE(RESARE, 5)];
 	_polygons[SUBTYPE(I_RESARE, 6)] = _polygons[SUBTYPE(RESARE, 6)];

src/map/IMG/style.cpp

@@ -356,6 +356,8 @@ void Style::defaultPolygonStyle()
 	  Qt::FDiagPattern));
 	_polygons[0x10503] = Polygon(QBrush(QColor(0xff, 0x40, 0x40),
 	  Qt::FDiagPattern));
+	_polygons[0x10504] = Polygon(QBrush(QColor(0xff, 0x40, 0x40),
+	  Qt::FDiagPattern));
 	_polygons[0x10601] = Polygon(QBrush(QColor(0xaa, 0xaa, 0xaa)));
 	_polygons[0x1060a] = Polygon(QBrush(QColor(0xfc, 0xb4, 0xfc)));
 	_polygons[0x10614] = Polygon(QBrush(QColor(0xff, 0xff, 0xff)));
@@ -364,7 +366,7 @@ void Style::defaultPolygonStyle()
 	_drawOrder
 	  << TYPE(0x4b) << 0x10d01 << 0x10106 << 0x10104 << TYPE(0x4a) << 0x10614
 	  << 0x10101 << 0x10102 << 0x10301 << 0x10302 << 0x10303 << 0x10304
-	  << 0x10305 << 0x10306 << 0x10307 << 0x10308 << 0x10601
+	  << 0x10305 << 0x10306 << 0x10307 << 0x10308 << 0x10601 << 0x1060a << 0x10105
 	  << TYPE(0x01) << 0x10800 << TYPE(0x02) << 0x10801 << TYPE(0x03) << 0x10802
 	  << TYPE(0x17) << 0x10a04 << TYPE(0x18) << 0x1090c << TYPE(0x1a) << 0x1090e
 	  << TYPE(0x28) << 0x10b01 << TYPE(0x32) << 0x10b02 << TYPE(0x3c) << 0x10b03
@@ -379,11 +381,9 @@ void Style::defaultPolygonStyle()
 	  << TYPE(0x04) << 0x10901 << TYPE(0x05) << 0x10902 << TYPE(0x06) << 0x10903
 	  << TYPE(0x07) << 0x10904 << TYPE(0x08) << 0x10905 << TYPE(0x09) << 0x10906
 	  << TYPE(0x0a) << 0x10907 << TYPE(0x0b) << 0x10908 << TYPE(0x0c) << 0x10909
-	  << TYPE(0x26) << TYPE(0x0d) << 0x1090a << TYPE(0x0e) << 0x1090b
+	  << TYPE(0x26) << TYPE(0x0d) << 0x1090a << TYPE(0x0e) << 0x1090b << TYPE(0x0f)
-	  << TYPE(0x0f) << TYPE(0x10) << TYPE(0x11) << TYPE(0x12)
+	  << TYPE(0x10) << TYPE(0x11) << TYPE(0x12) << TYPE(0x19) << 0x1090d
-	  << TYPE(0x19) << 0x1090d << TYPE(0x13) << 0x10900
+	  << TYPE(0x13) << 0x10900 << 0x10407 << 0x10409 << 0x10503 << 0x10504;
-	  << 0x10613 /*raster*/ << 0x1060a << 0x10407 << 0x10409 << 0x10503
-	  << 0x10105;
 }
 
 void Style::defaultLineStyle(qreal ratio)
@@ -499,10 +499,9 @@ void Style::defaultLineStyle(qreal ratio)
 	_lines[0x10407] = Line(QPen(QColor(0xa3, 0xa3, 0xa3), 1, Qt::DashLine));
 	_lines[0x10409] = Line(QPen(QColor(0, 0, 0), 1, Qt::DotLine));
 	_lines[0x10501] = Line(QImage(":/marine/noanchor-line.png"));
-	_lines[0x10502] = Line(QImage(":/marine/nofishing-line.png"));
 	_lines[0x10503] = Line(QImage(":/marine/entry-prohibited-line.png"));
 	_lines[0x10504] = Line(QPen(QColor(0xe7, 0x28, 0xe7), 1, Qt::DashLine));
-	_lines[0x10505] = Line(QImage(":/marine/noanchor-line.png"));
+	_lines[0x10505] = Line(QImage(":/marine/safety-zone-line.png"));
 	_lines[0x10506] = Line(QImage(":/marine/nature-reserve-line.png"));
 	_lines[0x10507] = Line(QImage(":/marine/safety-zone-line.png"));
 	_lines[0x10601] = Line(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));