Added missing traffic separation line style

+ code cleanup

src/map/ENC/attributes.h

@@ -12,5 +12,6 @@
 #define OBJNAM 116
 #define RESTRN 131
 #define VALDCO 174
+#define WATLEV 187
 
 #endif // ENC_ATTRIBUTES_H

src/map/ENC/mapdata.cpp

@@ -258,7 +258,7 @@ QVector<Coordinates> MapData::lineGeometry(const ISO8211::Record &r,
 {
 	QVector<Coordinates> path;
 	Coordinates c[2];
-	uint ORNT, MASK;
+	uint ORNT;
 	quint8 type;
 	quint32 id;
 
@@ -270,8 +270,6 @@ QVector<Coordinates> MapData::lineGeometry(const ISO8211::Record &r,
 		if (!parseNAME(FSPT, &type, &id, i) || type != RCNM_VE)
 			return QVector<Coordinates>();
 		ORNT = FSPT->data().at(i).at(1).toUInt();
-		MASK = FSPT->data().at(i).at(3).toUInt();
-		Q_ASSERT(MASK != 1);
 
 		RecordMapIterator it = ve.find(id);
 		if (it == ve.constEnd())
@@ -326,7 +324,7 @@ Polygon MapData::polyGeometry(const ISO8211::Record &r, const RecordMap &vc,
 	Polygon path;
 	QVector<Coordinates> v;
 	Coordinates c[2];
-	uint ORNT, USAG, MASK;
+	uint ORNT, USAG;
 	quint8 type;
 	quint32 id;
 
@@ -339,8 +337,6 @@ Polygon MapData::polyGeometry(const ISO8211::Record &r, const RecordMap &vc,
 			return Polygon();
 		ORNT = FSPT->data().at(i).at(1).toUInt();
 		USAG = FSPT->data().at(i).at(2).toUInt();
-		MASK = FSPT->data().at(i).at(3).toUInt();
-		Q_ASSERT(MASK != 1);
 
 		if (USAG == 2 && path.isEmpty()) {
 			path.append(v);
@@ -420,7 +416,8 @@ MapData::Attr MapData::pointAttr(const ISO8211::Record &r, uint OBJL)
 		if ((OBJL == HRBFAC && key == CATHAF)
 		  || (OBJL == LNDMRK && key == CATLMK)
 		  || (OBJL == WRECKS && key == CATWRK)
-		  || (OBJL == MORFAC && key == CATMOR))
+		  || (OBJL == MORFAC && key == CATMOR)
+		  || (OBJL == UWTROC && key == WATLEV))
 			subtype = av.at(1).toString().toUInt();
 	}
 
@@ -608,7 +605,7 @@ bool MapData::bounds(const QVector<ISO8211::Record> &gv, Rect &b)
 	return true;
 }
 
-bool MapData::fetchBoundsAndName()
+MapData::MapData(const QString &path): _fileName(path)
 {
 	QFile file(_fileName);
 	QVector<ISO8211::Record> gv;
@@ -617,42 +614,34 @@ bool MapData::fetchBoundsAndName()
 
 	if (!file.open(QIODevice::ReadOnly)) {
 		_errorString = file.errorString();
-		return false;
+		return;
 	}
 
 	if (!ddf.readDDR(file)) {
 		_errorString = ddf.errorString();
-		return false;
+		return;
 	}
 	while (!file.atEnd()) {
 		ISO8211::Record record;
 		if (!ddf.readRecord(file, record)) {
 			_errorString = ddf.errorString();
-			return false;
+			return;
 		}
 		if (!processRecord(record, gv, COMF, _name))
-			return false;
+			return;
 	}
 
 	Rect b;
 	if (!bounds(gv, b)) {
 		_errorString = "Error fetching geometries bounds";
-		return false;
+		return;
 	}
 	RectC br(Coordinates(b.minX() / (double)COMF, b.maxY() / (double)COMF),
 	  Coordinates(b.maxX() / (double)COMF, b.minY() / (double)COMF));
-	if (!br.isValid()) {
+	if (!br.isValid())
 		_errorString = "Invalid geometries bounds";
-		return false;
-	} else
+	else
 		_bounds = br;
-
-	return true;
-}
-
-MapData::MapData(const QString &path): _fileName(path)
-{
-	fetchBoundsAndName();
 }
 
 MapData::~MapData()

src/map/ENC/mapdata.h

@@ -147,8 +147,6 @@ private:
 	typedef RTree<Line*, double, 2> LineTree;
 	typedef RTree<Point*, double, 2> PointTree;
 
-	bool fetchBoundsAndName();
-
 	static QVector<Sounding> soundings(const ISO8211::Record &r, uint COMF,
 	  uint SOMF);
 	static QVector<Sounding> soundingGeometry(const ISO8211::Record &r,

src/map/ENC/objects.h

@@ -50,6 +50,7 @@
 #define SLCONS 122
 #define SLOTOP 126
 #define SOUNDG 129
+#define TSELNE 145
 #define TSSBND 146
 #define TSEZNE 150
 #define UWTROC 153

src/map/ENC/style.cpp

@@ -93,6 +93,7 @@ void Style::defaultLineStyle()
 	_lines[TYPE(RAILWY)] = Line(railroad());
 	_lines[TYPE(ROADWY)] = Line(QPen(QColor("#000000"), 2, Qt::SolidLine));
 	_lines[TYPE(GATCON)] = Line(QPen(QColor("#000000"), 2, Qt::SolidLine));
+	_lines[TYPE(TSELNE)] = Line(QPen(QColor("#80fcb4fc"), 4, Qt::SolidLine));
 }
 
 void Style::defaultPointStyle()
@@ -115,14 +116,22 @@ void Style::defaultPointStyle()
 	_points[SUBTYPE(LNDMRK, 17)] = Point(QImage(":/marine/tower.png"));
 	_points[TYPE(LNDELV)] = Point(QImage(":/marine/triangulation-point.png"));
 	_points[TYPE(OBSTRN)] = Point(QImage(":/marine/obstruction.png"), Small);
-	_points[TYPE(WRECKS)] = Point(QImage(":/marine/wreck.png"), Small);
 	_points[SUBTYPE(WRECKS, 1)] = Point(QImage(":/marine/wreck.png"), Small);
 	_points[SUBTYPE(WRECKS, 2)] = Point(QImage(":/marine/wreck-dangerous.png"),
 	  Small);
 	_points[SUBTYPE(WRECKS, 3)] = Point(QImage(":/marine/wreck.png"), Small);
 	_points[SUBTYPE(WRECKS, 4)] = Point(QImage(":/marine/wreck.png"), Small);
 	_points[SUBTYPE(WRECKS, 5)] = Point(QImage(":/marine/wreck-exposed.png"));
-	_points[TYPE(UWTROC)] = Point(QImage(":/marine/rock-dangerous.png"), Small);
+	_points[SUBTYPE(UWTROC, 1)] = Point(QImage(":/marine/rock-exposed.png"),
+	  Small);
+	_points[SUBTYPE(UWTROC, 2)] = Point(QImage(":/marine/rock-exposed.png"),
+	  Small);
+	_points[SUBTYPE(UWTROC, 3)] = Point(QImage(":/marine/rock-dangerous.png"),
+	  Small);
+	_points[SUBTYPE(UWTROC, 4)] = Point(QImage(":/marine/rock-dangerous.png"),
+	  Small);
+	_points[SUBTYPE(UWTROC, 5)] = Point(QImage(":/marine/rock-dangerous.png"),
+	  Small);
 	_points[SUBTYPE(HRBFAC, 5)] = Point(QImage(":/marine/yacht-harbor.png"));
 	_points[TYPE(ACHBRT)] = Point(QImage(":/marine/anchorage.png"));
 	_points[TYPE(OFSPLF)] = Point(QImage(":/marine/platform.png"));

src/map/encmap.cpp

@@ -30,6 +30,7 @@ void ENCMap::load()
 
 void ENCMap::unload()
 {
+	cancelJobs(true);
 	_data.clear();
 }
 
@@ -56,7 +57,7 @@ int ENCMap::zoomFit(const QSize &size, const RectC &rect)
 
 int ENCMap::zoomIn()
 {
-	cancelJobs();
+	cancelJobs(false);
 
 	_zoom = qMin(_zoom + 1, ZOOMS.max());
 	updateTransform();
@@ -65,7 +66,7 @@ int ENCMap::zoomIn()
 
 int ENCMap::zoomOut()
 {
-	cancelJobs();
+	cancelJobs(false);
 
 	_zoom = qMax(_zoom - 1, ZOOMS.min());
 	updateTransform();
@@ -141,10 +142,10 @@ void ENCMap::jobFinished(ENCMapJob *job)
 	emit tilesLoaded();
 }
 
-void ENCMap::cancelJobs()
+void ENCMap::cancelJobs(bool wait)
 {
 	for (int i = 0; i < _jobs.size(); i++)
-		_jobs.at(i)->cancel();
+		_jobs.at(i)->cancel(wait);
 }
 
 QString ENCMap::key(int zoom, const QPoint &xy) const

src/map/encmap.h

@@ -23,7 +23,12 @@ public:
 		_future = QtConcurrent::map(_tiles, &ENC::RasterTile::render);
 		_watcher.setFuture(_future);
 	}
-	void cancel() {_future.cancel();}
+	void cancel(bool wait)
+	{
+		_future.cancel();
+		if (wait)
+			_future.waitForFinished();
+	}
 	const QList<ENC::RasterTile> &tiles() const {return _tiles;}
 
 signals:
@@ -82,7 +87,7 @@ private:
 	bool isRunning(int zoom, const QPoint &xy) const;
 	void runJob(ENCMapJob *job);
 	void removeJob(ENCMapJob *job);
-	void cancelJobs();
+	void cancelJobs(bool wait);
 	QString key(int zoom, const QPoint &xy) const;
 
 	ENC::MapData _data;