Distinguish white/yellow lights on ENC charts

src/data/kmlparser.cpp

@@ -541,7 +541,7 @@ void KMLParser::photoOverlay(const Ctx &ctx, QVector<Waypoint> &waypoints,
 	Waypoint w;
 	QMap<QString, PolygonStyle> unused;
 	QMap<QString, LineStyle> unused2;
-	static QRegularExpression re("\\$\\[[^\\]]+\\]");
+	static const QRegularExpression re("\\$\\[[^\\]]+\\]");
 
 	while (_reader.readNextStartElement()) {
 		if (_reader.name() == QLatin1String("name"))

src/map/ENC/iso8211.cpp

@@ -141,7 +141,7 @@ int ISO8211::readDR(QVector<FieldDefinition> &fields)
 
 bool ISO8211::readDDA(const FieldDefinition &def, SubFields &fields)
 {
-	static QRegularExpression re("(\\d*)(\\w+)\\(*(\\d*)\\)*");
+	static const QRegularExpression re("(\\d*)(\\w+)\\(*(\\d*)\\)*");
 	QByteArray ba(def.size, Qt::Initialization::Uninitialized);
 	bool repeat = false;
 	QVector<SubFieldDefinition> defs;

src/map/ENC/style.cpp

@@ -482,6 +482,7 @@ Style::Style(qreal ratio)
 	_lightRed = QImage(":/marine/light-red.png");
 	_lightGreen = QImage(":/marine/light-green.png");
 	_lightYellow = QImage(":/marine/light-yellow.png");
+	_lightWhite = QImage(":/marine/light-white.png");
 	_lightOffset = QPoint(11, 11);
 	_signal = QImage(":/marine/fog-signal.png");
 	_signalOffset = QPoint(-9, 9);
@@ -541,6 +542,7 @@ const QImage *Style::light(Color color) const
 		case Green:
 			return &_lightGreen;
 		case White:
+			return &_lightWhite;
 		case Yellow:
 		case Amber:
 		case Orange:
@@ -558,6 +560,7 @@ QColor Style::color(Style::Color c)
 		case Green:
 			return Qt::green;
 		case White:
+			return Qt::white;
 		case Yellow:
 		case Amber:
 		case Orange:

src/map/ENC/style.h

@@ -121,7 +121,7 @@ private:
 
 	/* Fonts and images must be initialized after QGuiApplication! */
 	QFont _small, _normal, _large;
-	QImage _light, _lightRed, _lightGreen, _lightYellow, _signal;
+	QImage _light, _lightRed, _lightGreen, _lightYellow, _lightWhite, _signal;
 	QPoint _lightOffset, _signalOffset;
 };