Define symbols draw order

pkg/gpxsee64.nsi

@@ -181,13 +181,14 @@ Section "GPXSee" SEC_APP
   !insertmacro FILE_ASSOCIATION_ADD "qct" "QuickChart Map File" 24
   !insertmacro FILE_ASSOCIATION_ADD "trk" "TwoNav Track File" 25
   !insertmacro FILE_ASSOCIATION_ADD "gemf" "GEMF Map File" 26
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 27
+  !insertmacro FILE_ASSOCIATION_ADD "000" "IHO S-57 Electronic Navigation Chart" 27
-  !insertmacro FILE_ASSOCIATION_ADD "kmz" "KML geographic compressed data" 27
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 28
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 28
+  !insertmacro FILE_ASSOCIATION_ADD "kmz" "KML geographic compressed data" 28
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 29
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 29
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 30
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 30
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track File" 31
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 31
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 32
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track File" 32
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 33
 
   WriteRegStr HKCR "Applications\GPXSee.exe\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
   WriteRegStr HKCR ".gpx\OpenWithList" "GPXSee.exe" ""
@@ -237,6 +238,7 @@ Section "GPXSee" SEC_APP
   WriteRegStr HKCR ".qct\OpenWithList" "GPXSee.exe" ""
   WriteRegStr HKCR ".trk\OpenWithList" "GPXSee.exe" ""
   WriteRegStr HKCR ".gemf\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".000\OpenWithList" "GPXSee.exe" ""
 
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
@@ -392,6 +394,7 @@ Section "Uninstall"
   !insertmacro FILE_ASSOCIATION_REMOVE "qct"
   !insertmacro FILE_ASSOCIATION_REMOVE "trk"
   !insertmacro FILE_ASSOCIATION_REMOVE "gemf"
+  !insertmacro FILE_ASSOCIATION_REMOVE "000"
 
   DeleteRegValue HKCR ".gpx\OpenWithList" "GPXSee.exe"
   DeleteRegValue HKCR ".tcx\OpenWithList" "GPXSee.exe"
@@ -440,6 +443,7 @@ Section "Uninstall"
   DeleteRegValue HKCR ".qct\OpenWithList" "GPXSee.exe"
   DeleteRegValue HKCR ".trk\OpenWithList" "GPXSee.exe"
   DeleteRegValue HKCR ".gemf\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".000\OpenWithList" "GPXSee.exe"
   DeleteRegKey HKCR "Applications\GPXSee.exe"   
   
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'

src/map/ENC/attributes.h

@@ -1,6 +1,7 @@
 #ifndef ENC_ATTRIBUTES_H
 #define ENC_ATTRIBUTES_H
 
+#define CATACH 8
 #define CATHAF 30
 #define CATLMK 35
 #define CATMOR 40
@@ -9,6 +10,7 @@
 #define DRVAL1 87
 #define ELEVAT 90
 #define OBJNAM 116
+#define RESTRN 131
 #define VALDCO 174
 
 #endif // ENC_ATTRIBUTES_H

src/map/ENC/mapdata.cpp

@@ -15,6 +15,45 @@ using namespace ENC;
 #define PRIM_L 2
 #define PRIM_A 3
 
+static QMap<uint,uint> orderMapInit()
+{
+	QMap<uint,uint> map;
+
+	map.insert(BUAARE, 1);
+	map.insert(BCNISD, 2);
+	map.insert(BCNLAT, 3);
+	map.insert(BCNSAW, 4);
+	map.insert(BCNSPP, 5);
+	map.insert(BOYCAR, 6);
+	map.insert(BOYINB, 7);
+	map.insert(BOYISD, 8);
+	map.insert(BOYLAT, 9);
+	map.insert(BOYSAW, 10);
+	map.insert(BOYSPP, 11);
+	map.insert(MORFAC, 12);
+	map.insert(OFSPLF, 13);
+	map.insert(LIGHTS, 14);
+	map.insert(OBSTRN, 15);
+	map.insert(WRECKS, 16);
+	map.insert(UWTROC, 17);
+	map.insert(HRBFAC, 18);
+	map.insert(PILPNT, 19);
+	map.insert(ACHBRT, 20);
+	map.insert(LNDELV, 21);
+	map.insert(LNDMRK, 22);
+	map.insert(SOUNDG, 0xFFFFFFFF);
+
+	return map;
+}
+
+static QMap<uint,uint> orderMap = orderMapInit();
+
+static uint order(uint type)
+{
+	QMap<uint, uint>::const_iterator it = orderMap.find(type);
+	return (it == orderMap.constEnd()) ? type + 512 : it.value();
+}
+
 static void warning(const ISO8211::Field &FRID, uint PRIM)
 {
 	uint RCID = 0xFFFFFFFF;
@@ -132,6 +171,13 @@ static Coordinates point(const ISO8211::Record &r, uint COMF)
 	return coordinates(x, y, COMF);
 }
 
+MapData::Point::Point(uint type, const Coordinates &c, const QString &label)
+  : _type(type), _pos(c), _label(label)
+{
+	uint hash = (uint)qHash(QPair<double,double>(c.lon(), c.lat()));
+	_id = ((quint64)order(type>>16))<<32 | hash;
+}
+
 QVector<MapData::Sounding> MapData::soundings(const ISO8211::Record &r,
   uint COMF, uint SOMF)
 {
@@ -419,8 +465,13 @@ MapData::Attr MapData::polyAttr(const ISO8211::Record &r, uint OBJL)
 
 		if (OBJL == DEPARE && key == DRVAL1)
 			subtype = depthLevel(av.at(1).toString());
-		else if (OBJL == RESARE && key == CATREA)
+		else if ((OBJL == RESARE && key == CATREA)
+		  || (OBJL == ACHARE && key == CATACH))
 			subtype = av.at(1).toString().toUInt();
+		else if (OBJL == RESARE && key == RESTRN) {
+			if (av.at(1).toString().toUInt() == 1)
+				subtype = 2;
+		}
 	}
 
 	return Attr(subtype, label);

src/map/ENC/mapdata.h

@@ -52,12 +52,7 @@ public:
 
 	class Point {
 	public:
-		Point(uint type, const Coordinates &c, const QString &label)
+		Point(uint type, const Coordinates &c, const QString &label);
-		  : _type(type), _pos(c), _label(label)
-		{
-			uint hash = (uint)qHash(QPair<double,double>(c.lon(), c.lat()));
-			_id = ((quint64)type)<<32 | hash;
-		}
 
 		const Coordinates &pos() const {return _pos;}
 		uint type() const {return _type;}

src/map/ENC/rastertile.cpp

@@ -88,9 +88,15 @@ void RasterTile::drawPolygons(QPainter *painter)
 				continue;
 			const Style::Polygon &style = s.polygon(ECDIS(poly->type()));
 
-			painter->setPen(style.pen());
+			if (!style.img().isNull()) {
-			painter->setBrush(style.brush());
+				for (int i = 0; i < poly->path().size(); i++)
-			painter->drawPath(painterPath(poly->path()));
+					BitmapLine::draw(painter, polyline(poly->path().at(i)),
+					  style.img());
+			} else {
+				painter->setPen(style.pen());
+				painter->setBrush(style.brush());
+				painter->drawPath(painterPath(poly->path()));
+			}
 		}
 	}
 }

src/map/ENC/style.cpp

@@ -38,8 +38,6 @@ void Style::defaultPolygonStyle()
 	_polygons[TYPE(PONTON)] = Polygon(QBrush("#333333"));
 	_polygons[TYPE(SLCONS)] = Polygon(Qt::NoBrush, QPen(QColor("#333333"), 1.5,
 	  Qt::DashLine));
-	_polygons[TYPE(ACHARE)] = Polygon(Qt::NoBrush, QPen(QColor("#e728e7"), 1,
-	  Qt::DashDotLine));
 	_polygons[TYPE(LAKARE)] = Polygon(QBrush("#9fc4e1"),
 	  QPen(QColor("#000000"), 1));
 	_polygons[TYPE(CANALS)] = Polygon(QBrush("#9fc4e1"),
@@ -48,12 +46,15 @@ void Style::defaultPolygonStyle()
 	_polygons[TYPE(DYKCON)] = Polygon(QBrush(QColor("#9fc4e1"),
 	  Qt::Dense4Pattern), QPen(QColor("#000000"), 1));
 	_polygons[TYPE(AIRARE)] = Polygon(QBrush("#333333"));
-	_polygons[SUBTYPE(RESARE, 9)] = Polygon(QBrush(QColor("#ff0000"),
-	  Qt::BDiagPattern), QPen(QColor("#ff0000"), 1));
 	_polygons[TYPE(TSEZNE)] = Polygon(QBrush("#80fcb4fc"));
 	_polygons[TYPE(DRGARE)] = Polygon(QBrush(QColor("#a0a0ff"),
 	  Qt::Dense4Pattern));
 	_polygons[TYPE(UNSARE)] = Polygon(QBrush("#999999"));
+	_polygons[SUBTYPE(RESARE, 9)] = Polygon(QBrush(QColor("#ff0000"),
+	  Qt::BDiagPattern));
+
+	_polygons[SUBTYPE(RESARE, 2)] = Polygon(QImage(":/marine/noanchor-line.png"));
+	_polygons[SUBTYPE(ACHARE, 1)] = Polygon(QImage(":/marine/anchor-line.png"));
 
 	_drawOrder
 	  << TYPE(M_COVR) << TYPE(LNDARE) << SUBTYPE(DEPARE, 0)
@@ -63,7 +64,7 @@ void Style::defaultPolygonStyle()
 	  << TYPE(RIVERS) << TYPE(DRGARE) << TYPE(FAIRWY) << TYPE(BUAARE)
 	  << TYPE(BUISGL) << TYPE(AIRARE) << TYPE(BRIDGE) << TYPE(SLCONS)
 	  << TYPE(PONTON) << TYPE(DMPGRD) << TYPE(TSEZNE) << TYPE(OBSTRN)
-	  << TYPE(ACHARE) << SUBTYPE(RESARE, 9) << TYPE(154);
+	  << SUBTYPE(ACHARE, 1) << SUBTYPE(RESARE, 9) << SUBTYPE(RESARE, 2);
 }
 
 void Style::defaultLineStyle()

src/map/ENC/style.h

@@ -29,13 +29,18 @@ public:
 		{
 			_pen = (pen == Qt::NoPen) ? QPen(_brush, 0) : pen;
 		}
+		Polygon(const QImage &img)
+		  : _brush(Qt::NoBrush), _pen(Qt::NoPen), _img(img.convertToFormat(
+		  QImage::Format_ARGB32_Premultiplied)) {}
 
 		const QPen &pen() const {return _pen;}
 		const QBrush &brush() const {return _brush;}
+		const QImage &img() const {return _img;}
 
 	private:
 		QBrush _brush;
 		QPen _pen;
+		QImage _img;
 	};
 
 	class Line {