Some more missing marine style stuff

gpxsee.qrc

@@ -137,13 +137,19 @@
 
 		<file alias="light-major.png">icons/IMG/marine/light-major.png</file>
 		<file alias="light-platform.png">icons/IMG/marine/light-platform.png</file>
+		<file alias="buoy.png">icons/IMG/marine/buoy.png</file>
 		<file alias="beacon.png">icons/IMG/marine/beacon.png</file>
-		<file alias="rock.png">icons/IMG/marine/rock.png</file>
+		<file alias="rock-exposed.png">icons/IMG/marine/rock-exposed.png</file>
+		<file alias="rock-dangerous.png">icons/IMG/marine/rock-dangerous.png</file>
 		<file alias="wreck.png">icons/IMG/marine/wreck.png</file>
+		<file alias="wreck-exposed.png">icons/IMG/marine/wreck-exposed.png</file>
 		<file alias="obstruction.png">icons/IMG/marine/obstruction.png</file>
+		<file alias="obstruction-covers.png">icons/IMG/marine/obstruction-covers.png</file>
 		<file alias="anchor-line.png">icons/IMG/marine/anchor-line.png</file>
 		<file alias="pipeline.png">icons/IMG/marine/pipeline.png</file>
 		<file alias="cable.png">icons/IMG/marine/cable.png</file>
+		<file alias="anchorage.png">icons/IMG/marine/anchorage.png</file>
+		<file alias="anchoring-prohibited.png">icons/IMG/marine/anchoring-prohibited.png</file>
 	</qresource>
 
 	<!-- Mapsforge rendertheme -->

src/map/IMG/style.cpp

@@ -117,19 +117,21 @@ void Style::defaultPolygonStyle()
 	_polygons[0x10101] = Polygon(QBrush("#e8e064"));
 	_polygons[0x10102] = Polygon(QBrush("#d98b21"));
 	_polygons[0x10104] = Polygon(QBrush("#ffffff"));
+	_polygons[0x10105] = Polygon(QBrush("#a58140"));
 	_polygons[0x10301] = Polygon(QBrush("#98c064"));
 	_polygons[0x10302] = Polygon(QBrush("#a0a0ff"));
 	_polygons[0x10303] = Polygon(QBrush("#b0b0ff"));
 	_polygons[0x10304] = Polygon(QBrush("#c0c0ff"));
 	_polygons[0x10409] = Polygon(QBrush("#ff4040", Qt::FDiagPattern));
 	_polygons[0x10503] = Polygon(QBrush("#ff4040", Qt::FDiagPattern));
+	_polygons[0x10601] = Polygon(QBrush("#aaaaaa"));
 	_polygons[0x1060a] = Polygon(QBrush("#fcb4fc"));
 
 	// Draw order
 	_drawOrder
 	  << TYPE(0x4b) << 0x10d01 << 0x10104 << 0x10613 << TYPE(0x4a)
-	  << 0x10101 << 0x10102 << 0x10301 << 0x10302 << 0x10303 << 0x10304
+	  << 0x10101 << 0x10102 << 0x10301 << 0x10302 << 0x10303
-	  << 0x10409 << 0x10503 << 0x1060a
+	  << 0x10304 << 0x10105 << 0x10409 << 0x10503 << 0x10601 << 0x1060a
 	  << 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
@@ -236,6 +238,7 @@ void Style::defaultLineStyle()
 
 	// Marine stuff
 	_lines[0x10101] = Line(QPen(QColor("#000000"), 1, Qt::SolidLine));
+	_lines[0x10107] = Line(QPen(QColor("#a58140"), 3, Qt::SolidLine));
 	_lines[0x10108] = Line(QPen(QColor("#000000"), 1, Qt::SolidLine));
 	_lines[0x10301] = Line(QPen(QColor("#0e1087"), 1, Qt::SolidLine));
 	_lines[0x10307] = Line(QPen(QColor("#05620e"), 1, Qt::SolidLine));
@@ -244,7 +247,7 @@ void Style::defaultLineStyle()
 	_lines[0x10409] = Line(QPen(QColor("#000000"), 1, Qt::DotLine));
 	_lines[0x10503] = Line(QPen(QColor("#e728e7"), 1, Qt::DashLine));
 	_lines[0x10507] = Line(QPen(QColor("#e728e7"), 1, Qt::DashLine));
-	_lines[0x10601] = Line(QPen(QColor("#000000"), 1, Qt::DashLine));
+	_lines[0x10601] = Line(QPen(QColor("#000000"), 1, Qt::SolidLine));
 	_lines[0x10606] = Line(QImage(":/IMG/anchor-line.png"));
 	_lines[0x1060d] = Line(QPen(QColor("#eb49eb"), 1, Qt::DashLine));
 	_lines[0x10611] = Line(QPen(QColor("#eb49eb"), 1, Qt::DashLine));
@@ -489,12 +492,19 @@ void Style::defaultPointStyle()
 	_points[0x10108] = Point(QImage(":/IMG/light-major.png"));
 	_points[0x10109] = Point(QImage(":/IMG/light-major.png"));
 	_points[0x1010a] = Point(QImage(":/IMG/light-major.png"));
+	_points[0x10200] = Point(QImage(":/IMG/buoy.png"));
+	_points[0x10201] = Point(QImage(":/IMG/buoy.png"));
 	_points[0x10206] = Point(QImage(":/IMG/beacon.png"));
+	_points[0x1020b] = Point(QImage(":/IMG/buoy.png"));
 	_points[0x1020d] = Point(QImage(":/IMG/light-platform.png"));
 	_points[0x10401] = Point(QImage(":/IMG/obstruction.png"));
 	_points[0x10402] = Point(QImage(":/IMG/wreck.png"));
-	_points[0x1040a] = Point(QImage(":/IMG/rock.png"));
+	_points[0x10403] = Point(QImage(":/IMG/wreck-exposed.png"));
-
+	_points[0x10408] = Point(QImage(":/IMG/obstruction-covers.png"));
+	_points[0x1040a] = Point(QImage(":/IMG/rock-dangerous.png"));
+	_points[0x1040c] = Point(QImage(":/IMG/rock-exposed.png"));
+	_points[0x10701] = Point(QImage(":/IMG/anchorage.png"));
+	_points[0x10705] = Point(QImage(":/IMG/anchoring-prohibited.png"));
 }
 
 static bool readBitmap(SubFile *file, SubFile::Handle &hdl, QImage &img,