Microoptimization

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 13.42.{build}
+version: 13.43.{build}
 
 configuration:
   - Release

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx:!android {
 } else {
     TARGET = GPXSee
 }
-VERSION = 13.42
+VERSION = 13.43
 
 QT += core \
     gui \

gpxsee.qrc

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

pkg/windows/gpxsee64.nsi

@@ -49,7 +49,7 @@ Unicode true
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "13.42"
+!define VERSION "13.43"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"

src/map/ENC/attributes.h

@@ -5,6 +5,7 @@
 #define CATBUA 10
 #define CATCOV 18
 #define CATDIS 21
+#define CATDPG 23
 #define CATHAF 30
 #define CATLMK 35
 #define CATLIT 37

src/map/ENC/mapdata.cpp

@@ -87,6 +87,7 @@ static QMap<uint,uint> orderMapInit()
 	map.insert(TYPE(BUISGL), 46);
 	map.insert(TYPE(ACHARE), 47);
 	map.insert(TYPE(I_ACHARE), 47);
+	map.insert(TYPE(DMPGRD), 48);
 
 	map.insert(TYPE(I_DISMAR), 0xFFFFFFFE);
 	map.insert(TYPE(SOUNDG), 0xFFFFFFFF);
@@ -191,7 +192,7 @@ static bool polygonPointCb(const MapData::Poly *polygon, void *context)
 	if (baseType == TSSLPT || baseType == RCTLPT || baseType == I_TRNBSN
 	  || baseType == BRIDGE || baseType == I_BRIDGE || baseType == BUAARE
 	  || baseType == LNDARE || baseType == LNDRGN || baseType == I_BUNSTA
-	  || baseType == PILBOP
+	  || baseType == PILBOP || baseType == DMPGRD
 	  || type == SUBTYPE(ACHARE, 2) || type == SUBTYPE(I_ACHARE, 2)
 	  || type == SUBTYPE(ACHARE, 3) || type == SUBTYPE(I_ACHARE, 3)
 	  || type == SUBTYPE(ACHARE, 9) || type == SUBTYPE(I_ACHARE, 9)
@@ -199,6 +200,7 @@ 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)
@@ -323,6 +325,8 @@ 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
@@ -447,7 +451,7 @@ MapData::Point::Point(uint type, const Coordinates &c, const Attributes &attr,
 		if (ok && clr > 0)
 			_label = QString::fromUtf8("\xE2\x86\x95") + UNIT_SPACE
 			  + QString::number(clr) + UNIT_SPACE + hUnits(HUNI);
-	} else if (type == OBSTRN || type == WRECKS) {
+	} else if (type == OBSTRN || type == WRECKS || type == UWTROC) {
 		double depth = _attr.value(VALSOU).toDouble(&ok);
 		if (ok && _label.isEmpty())
 			_label = QString::number(depth);
@@ -474,6 +478,8 @@ MapData::Poly::Poly(uint type, const Polygon &path, const Attributes &attr,
 		subtype = I_CATBRT;
 	else if (type == M_COVR)
 		subtype = CATCOV;
+	else if (type == DMPGRD)
+		subtype = CATDPG;
 
 	switch (type) {
 		case DEPARE:

src/map/ENC/style.cpp

@@ -104,7 +104,19 @@ void Style::polygonStyle()
 	_polygons[SUBTYPE(DEPARE, 5)] = Polygon(QBrush(QColor(0xc0, 0xe0, 0xff)));
 	_polygons[SUBTYPE(DEPARE, 6)] = Polygon(QBrush(QColor(0xff, 0xff, 0xff)));
 	_polygons[TYPE(DMPGRD)] = Polygon(QBrush(QColor(0xa3, 0xa3, 0xa3),
-	  Qt::Dense3Pattern));
+	  Qt::Dense5Pattern));
+	_polygons[SUBTYPE(DMPGRD, 1)] = Polygon(QBrush(QColor(0xa3, 0xa3, 0xa3),
+	  Qt::Dense5Pattern));
+	_polygons[SUBTYPE(DMPGRD, 2)] = Polygon(QBrush(QColor(0xa3, 0xa3, 0xa3),
+	  Qt::Dense5Pattern));
+	_polygons[SUBTYPE(DMPGRD, 3)] = Polygon(QBrush(QColor(0xa3, 0xa3, 0xa3),
+	  Qt::Dense5Pattern));
+	_polygons[SUBTYPE(DMPGRD, 4)] = Polygon(QBrush(QColor(0xff, 0x40, 0x40),
+	  Qt::Dense5Pattern));
+	_polygons[SUBTYPE(DMPGRD, 5)] = Polygon(QBrush(QColor(0xa3, 0xa3, 0xa3),
+	  Qt::Dense5Pattern));
+	_polygons[SUBTYPE(DMPGRD, 6)] = Polygon(QBrush(QColor(0xa3, 0xa3, 0xa3),
+	  Qt::Dense5Pattern));
 	_polygons[TYPE(FAIRWY)] = Polygon(Qt::NoBrush, QPen(QColor(0x88, 0x88, 0x88),
 	  1, Qt::DashDotDotLine));
 	_polygons[TYPE(OBSTRN)] = Polygon(Qt::NoBrush, QPen(QColor(0, 0, 0), 1.5,
@@ -134,6 +146,7 @@ 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"));
@@ -151,6 +164,7 @@ 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)];
@@ -242,7 +256,9 @@ void Style::polygonStyle()
 	  << TYPE(HULKES) << TYPE(I_HULKES) << TYPE(FLODOC) << TYPE(I_FLODOC)
 	  << TYPE(DRYDOC) << TYPE(DAMCON) << TYPE(PYLONS) << TYPE(MORFAC)
 	  << TYPE(GATCON) << TYPE(I_GATCON) << TYPE(BERTHS) << TYPE(I_BERTHS)
-	  << SUBTYPE(I_BERTHS, 6) << TYPE(DMPGRD) << TYPE(TSEZNE) << TYPE(OBSTRN)
+	  << SUBTYPE(I_BERTHS, 6) << TYPE(DMPGRD) << SUBTYPE(DMPGRD, 1)
+	  << SUBTYPE(DMPGRD, 2) << SUBTYPE(DMPGRD, 3) << SUBTYPE(DMPGRD, 4)
+	  << SUBTYPE(DMPGRD, 5) << SUBTYPE(DMPGRD, 6) << TYPE(TSEZNE) << TYPE(OBSTRN)
 	  << TYPE(UWTROC) << TYPE(DWRTPT) << SUBTYPE(ACHARE, 1)
 	  << SUBTYPE(ACHARE, 2) << SUBTYPE(ACHARE, 3) << SUBTYPE(ACHARE, 4)
 	  << SUBTYPE(ACHARE, 5) << SUBTYPE(ACHARE, 6) << SUBTYPE(ACHARE, 7)
@@ -540,6 +556,15 @@ void Style::pointStyle(qreal ratio)
 	_points[SUBTYPE(I_RESARE, 23)] = _points[SUBTYPE(RESARE, 23)];
 	_points[SUBTYPE(I_RESARE, 25)] = _points[SUBTYPE(RESARE, 25)];
 	_points[SUBTYPE(I_RESARE, 26)] = _points[SUBTYPE(RESARE, 26)];
+	_points[TYPE(DMPGRD)].setTextColor(QColor(0x5d, 0x5b, 0x59));
+	_points[TYPE(DMPGRD)].setHaloColor(QColor());
+	_points[SUBTYPE(DMPGRD, 1)] = _points[TYPE(DMPGRD)];
+	_points[SUBTYPE(DMPGRD, 2)] = _points[TYPE(DMPGRD)];
+	_points[SUBTYPE(DMPGRD, 3)] = _points[TYPE(DMPGRD)];
+	_points[SUBTYPE(DMPGRD, 4)].setTextColor(QColor(0xff, 0x40, 0x40));
+	_points[SUBTYPE(DMPGRD, 4)].setHaloColor(QColor());
+	_points[SUBTYPE(DMPGRD, 5)] = _points[TYPE(DMPGRD)];
+	_points[SUBTYPE(DMPGRD, 6)] = _points[TYPE(DMPGRD)];
 
 	_points[SUBTYPE(I_BUNSTA, 1)] = Point(svg2img(":/POI/fuel-11.svg", ratio),
 	  Small);

src/map/IMG/mapdata.h

@@ -29,18 +29,23 @@ class MapData
 {
 public:
 	struct Poly {
-		Poly() : oneway(false) {}
+		Poly() : flags(0) {}
+
+		enum Flags {
+			OneWay = 1,
+			Invert = 2
+		};
 
 		/* QPointF insted of Coordinates for performance reasons (no need to
 		   duplicate all the vectors for drawing). Note, that we do not want to
 		   ll2xy() the points in the MapData class as this can not be done in
 		   parallel. */
 		QVector<QPointF> points;
+		RectC boundingRect;
 		Label label;
 		Raster raster;
 		quint32 type;
-		RectC boundingRect;
+		quint32 flags;
-		bool oneway;
 
 		bool operator<(const Poly &other) const
 		  {return type > other.type;}
@@ -50,7 +55,6 @@ public:
 		Point() : id(0), flags(0) {}
 
 		enum Flags {
-			NoFlag = 0,
 			ClassLabel = 1,
 		};
 

src/map/IMG/netfile.cpp

@@ -480,7 +480,7 @@ bool NETFile::link(const SubDiv *subdiv, quint32 shift, Handle &hdl,
 	if (lbl)
 		linkLabel(hdl, linkOffset, lbl, lblHdl, poly.label);
 	if ((linkInfo.flags >> 3) & 1)
-		poly.oneway = true;
+		poly.flags |= MapData::Poly::OneWay;
 
 	lines->append(poly);
 

src/map/IMG/rastertile.cpp

@@ -206,9 +206,12 @@ void RasterTile::drawLines(QPainter *painter,
 		const MapData::Poly &poly = lines.at(i);
 		const Style::Line &style = _data->style()->line(poly.type);
 
-		if (!style.img().isNull())
+		if (!style.img().isNull()) {
-			BitmapLine::draw(painter, poly.points, style.img());
+			if (poly.flags & MapData::Poly::Invert)
-		else if (style.foreground() != Qt::NoPen) {
+				BitmapLine::drawR(painter, poly.points, style.img());
+			else
+				BitmapLine::draw(painter, poly.points, style.img());
+		} else if (style.foreground() != Qt::NoPen) {
 			painter->setPen(style.foreground());
 			painter->drawPolyline(poly.points);
 		}
@@ -383,7 +386,7 @@ void RasterTile::processStreetNames(const QList<MapData::Poly> &lines,
 		  ? &style.text().color() : Style::isContourLine(poly.type)
 			? 0 : &textColor;
 		const QColor *hColor = Style::isContourLine(poly.type) ? 0 : &haloColor;
-		const QImage *img = poly.oneway
+		const QImage *img = (poly.flags & MapData::Poly::OneWay)
 		  ? Style::isWaterLine(poly.type)
 			? &arrows[WATER] : &arrows[ROAD] : 0;
 		const QString *label = poly.label.text().isEmpty()
@@ -559,8 +562,6 @@ void RasterTile::processPoints(QList<MapData::Point> &points,
 		} else
 			delete item;
 	}
-
-
 }
 
 void RasterTile::fetchData(QList<MapData::Poly> &polygons,

src/map/IMG/rgnfile.cpp

@@ -244,6 +244,22 @@ bool RGNFile::readLabel(Handle &hdl, LBLFile *lbl, Handle &lblHdl,
 	return true;
 }
 
+bool RGNFile::readLineInfo(Handle &hdl, quint32 size, MapData::Poly *line) const
+{
+	if (size == 1) {
+		quint32 val;
+
+		if (!readUInt8(hdl, val))
+			return false;
+
+		if (((val >> 3) & 3) & 2)
+			line->flags |= MapData::Poly::Invert;
+
+		return true;
+	} else
+		return (!size);
+}
+
 bool RGNFile::readClassFields(Handle &hdl, SegmentType segmentType,
   void *object, LBLFile *lbl, Handle &lblHdl) const
 {
@@ -251,6 +267,8 @@ bool RGNFile::readClassFields(Handle &hdl, SegmentType segmentType,
 	quint32 rs = 0;
 	MapData::Poly *poly = (segmentType == Polygon)
 	  ? (MapData::Poly *) object : 0;
+	MapData::Poly *line = (segmentType == Line)
+	  ? (MapData::Poly *) object : 0;
 	MapData::Point *point = (segmentType == Point)
 	  ? (MapData::Point *) object : 0;
 
@@ -289,6 +307,9 @@ bool RGNFile::readClassFields(Handle &hdl, SegmentType segmentType,
 	if (point && Style::isLight(point->type))
 		readLightInfo(hdl, flags, rs, point);
 
+	if (line && Style::isMarineLine(line->type))
+		readLineInfo(hdl, rs, line);
+
 	return seek(hdl, off + rs);
 }
 
@@ -597,8 +618,7 @@ bool RGNFile::polyObjects(Handle &hdl, const SubDiv *subdiv,
 		poly.type = (segmentType == Polygon)
 		  ? ((quint32)(type & 0x7F)) << 8 : ((quint32)(type & 0x3F)) << 8;
 		if (segmentType == Line && type & 0x40)
-			poly.oneway = true;
+			poly.flags |= MapData::Poly::OneWay;
-
 
 		QPoint pos(subdiv->lon() + LS(lon, 24-subdiv->bits()),
 		  subdiv->lat() + LS(lat, 24-subdiv->bits()));

src/map/IMG/rgnfile.h

@@ -69,6 +69,7 @@ private:
 	  MapData::Point *point) const;
 	bool readLightInfo(Handle &hdl, quint8 flags, quint32 size,
 	  MapData::Point *point) const;
+	bool readLineInfo(Handle &hdl, quint32 size, MapData::Poly *line) const;
 	bool readLabel(Handle &hdl, LBLFile *lbl, Handle &lblHdl,
 	  quint8 flags, quint32 size, MapData::Point *point) const;
 	bool readLclNavaid(Handle &hdl, quint32 size,

src/map/IMG/style.cpp

@@ -351,13 +351,13 @@ void Style::defaultPolygonStyle()
 	_polygons[0x10307] = Polygon(QBrush(QColor(0xff, 0xff, 0xff)));
 	_polygons[0x10308] = Polygon(QBrush(QColor(0xff, 0xff, 0xff)));
 	_polygons[0x10407] = Polygon(QBrush(QColor(0xa3, 0xa3, 0xa3),
-	  Qt::Dense3Pattern));
+	  Qt::Dense5Pattern));
+	_polygons[0x10408] = Polygon(QBrush(QColor(0xff, 0x40, 0x40),
+	  Qt::Dense5Pattern));
 	_polygons[0x10409] = Polygon(QBrush(QColor(0xff, 0x40, 0x40),
 	  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)));
@@ -366,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 << 0x10105
+	  << 0x10305 << 0x10306 << 0x10307 << 0x10308 << 0x10601
 	  << 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
@@ -381,10 +381,11 @@ 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(0x0f)
+	  << TYPE(0x26) << TYPE(0x0d) << 0x1090a << TYPE(0x0e) << 0x1090b
-	  << TYPE(0x10) << TYPE(0x11) << TYPE(0x12) << TYPE(0x19) << 0x1090d
+	  << TYPE(0x0f) << TYPE(0x10) << TYPE(0x11) << TYPE(0x12)
-	  << TYPE(0x13) << 0x10900 << 0x10613 << 0x10407 << 0x10409 << 0x10503
+	  << TYPE(0x19) << 0x1090d << TYPE(0x13) << 0x10900
-	  << 0x10504 << 0x1060a;
+	  << 0x10613 /*raster*/ << 0x1060a << 0x10407 << 0x10408 << 0x10409
+	  << 0x10503 << 0x10105;
 }
 
 void Style::defaultLineStyle(qreal ratio)
@@ -498,16 +499,21 @@ void Style::defaultLineStyle(qreal ratio)
 	_lines[0x10405] = Line(QImage(":/marine/pipeline-area-line.png"));
 	_lines[0x10406] = Line(QImage(":/marine/cable-area-line.png"));
 	_lines[0x10407] = Line(QPen(QColor(0xa3, 0xa3, 0xa3), 1, Qt::DashLine));
+	_lines[0x10408] = Line(QPen(QColor(0xff, 0x40, 0x40), 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/safety-zone-line.png"));
+	_lines[0x10505] = Line(QImage(":/marine/noanchor-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));
+	_lines[0x10601] = Line(QPen(QColor(0, 0, 0), 1, Qt::DashLine));
-	_lines[0x10603] = Line(QPen(QColor(0xe7, 0x28, 0xe7), 2, Qt::DashDotLine));
+	_lines[0x10602] = Line(QPen(QColor(0xfc, 0xb4, 0xfc), 2));
+	_lines[0x10603] = Line(QPen(QColor(0xe7, 0x28, 0xe7), 1.5, Qt::DashDotLine));
+	_lines[0x10604] = Line(QPen(QColor(0xe7, 0x28, 0xe7), 1, Qt::DashDotLine));
 	_lines[0x10606] = Line(QImage(":/marine/anchor-line.png"));
+	_lines[0x10608] = Line(QImage(":/marine/fishing-line.png"));
 	_lines[0x1060c] = Line(QPen(QColor(0xe7, 0x28, 0xe7), 1, Qt::SolidLine));
 	_lines[0x1060d] = Line(QPen(QColor(0xeb, 0x49, 0xeb), 1, Qt::DashLine));
 	_lines[0x10611] = Line(QPen(QColor(0xeb, 0x49, 0xeb), 1, Qt::DashLine));
@@ -790,6 +796,8 @@ void Style::defaultPointStyle(qreal ratio)
 	COLORSET(0x10214, "beacon", 0, -8);
 	COLORSET(0x10215, "beacon", 0, -8);
 	_points[0x10216] = Point(QImage(":/marine/mooring-buoy.png"), QPoint(0, -5));
+	_points[0x10217] = Point(QImage(":/marine/pylon.png"));
+	_points[0x10218] = Point(QImage(":/marine/pylon.png"));
 
 	_points[0x10304] = Point(QImage(":/marine/building.png"));
 	_points[0x10305] = Point(QImage(":/marine/chimney.png"), QPoint(0, -11));
@@ -804,6 +812,7 @@ void Style::defaultPointStyle(qreal ratio)
 	_points[0x10402] = Point(QImage(":/marine/wreck.png"));
 	_points[0x10403] = Point(QImage(":/marine/wreck-exposed.png"), QPoint(0, -4));
 	_points[0x10408] = Point(QImage(":/marine/obstruction-covers.png"));
+	_points[0x10409] = Point(QImage(":/marine/fishing-farm.png"));
 	_points[0x1040a] = Point(QImage(":/marine/rock-dangerous.png"));
 	_points[0x1040c] = Point(QImage(":/marine/rock-exposed.png"));
 

src/map/IMG/style.h

@@ -154,10 +154,12 @@ public:
 	  {return (type >= 0x10100 && type < 0x10200);}
 	static bool isMarinePoint(quint32 type)
 	  {return type >= 0x10100 && type < 0x10a00;}
+	static bool isMarineLine(quint32 type)
+	  {return type >= 0x10400 && type < 0x10700;}
 	static bool isMarina(quint32 type)
 	  {return type == 0x10703;}
 	static bool hasColorset(quint32 type)
-	  {return (isBuoy(type) && !(type == 0x1020d || type == 0x10216));}
+	  {return (isBuoy(type) && !(type == 0x1020d || type >= 0x10216));}
 
 	static QColor color(Light::Color c);
 

src/map/bitmapline.cpp

@@ -53,6 +53,26 @@ void BitmapLine::draw(QPainter *painter, const QPolygonF &line,
 	}
 }
 
+void BitmapLine::drawR(QPainter *painter, const QPolygonF &line,
+  const QImage &img)
+{
+	int offset = 0;
+
+	for (int i = line.size() - 1; i > 0; i--) {
+		QLineF segment(line.at(i).x(), line.at(i).y(), line.at(i-1).x(),
+		  line.at(i-1).y());
+		int len = qCeil(segment.length() * img.devicePixelRatio());
+
+		painter->save();
+		painter->translate(segment.p1());
+		painter->rotate(-segment.angle());
+		painter->drawImage(0.0, -img.height()/2.0, img2line(img, len, offset));
+		painter->restore();
+
+		offset = (len + offset) % img.width();
+	}
+}
+
 void BitmapLine::draw(QPainter *painter, const QVector<QPolygonF> &lines,
   const QImage &img)
 {

src/map/bitmapline.h

@@ -11,6 +11,7 @@ class QPainterPath;
 namespace BitmapLine
 {
 	void draw(QPainter *painter, const QPolygonF &line, const QImage &img);
+	void drawR(QPainter *painter, const QPolygonF &line, const QImage &img);
 	void draw(QPainter *painter, const QVector<QPolygonF> &lines,
 	  const QImage &img);
 	void draw(QPainter *painter, const QPainterPath &line, const QImage &img);