Fixed broken sector lights rendering after recent code changes

src/map/ENC/rastertile.cpp

@@ -226,11 +226,11 @@ static QRectF lightRect(const QPointF &pos, double range)
 }
 
 void RasterTile::drawSectorLights(QPainter *painter,
-  const QList<SectorLight> &lights) const
+  const QMultiMap<Coordinates, SectorLight> &lights) const
 {
-	for (int i = 0; i < lights.size(); i++) {
-		const SectorLight &l = lights.at(i);
-		QPointF pos(ll2xy(l.pos));
+	for (auto it = lights.cbegin(); it != lights.cend(); ++it) {
+		const SectorLight &l = it.value();
+		QPointF pos(ll2xy(it.key()));
 		QRectF rect(lightRect(pos, (l.range == 0) ? 6 : l.range));
 		double a1 = -(l.end + 90);
 		double a2 = -(l.start + 90);
@@ -263,12 +263,11 @@ void RasterTile::drawSectorLights(QPainter *painter,
 }
 
 void RasterTile::processPoints(const QList<Data::Point> &points,
-  QList<TextItem*> &textItems, QList<TextItem*> &lights,
-  QList<SectorLight> &sectorLights, bool overZoom) const
+  QList<TextItem*> &textItems, QList<TextItem*> &lightItems,
+  QMultiMap<Coordinates, SectorLight> &sectorLights, bool overZoom) const
 {
-	LightMap lightsMap;
-	SignalSet signalsSet;
-	QSet<Coordinates> slMap;
+	QMap<Coordinates, Style::Color> lights;
+	QSet<Coordinates> sigs;
 	int i;
 
 	/* Lights & Signals */
@@ -282,14 +281,13 @@ void RasterTile::processPoints(const QList<Data::Point> &points,
 
 			if (attr.contains(SECTR1)
 			  || (range >= MAJOR_RANGE && !(point.type() & 0xFFFF))) {
-				sectorLights.append(SectorLight(point.pos(), color,
+				sectorLights.insert(point.pos(), SectorLight(color,
 				  attr.value(LITVIS).toUInt(), range,
 				  attr.value(SECTR1).toDouble(), attr.value(SECTR2).toDouble()));
-				slMap.insert(point.pos());
 			} else
-				lightsMap.insert(point.pos(), color);
+				lights.insert(point.pos(), color);
 		} else if (point.type()>>16 == FOGSIG)
-			signalsSet.insert(point.pos());
+			sigs.insert(point.pos());
 		else
 			break;
 	}
@@ -316,14 +314,14 @@ void RasterTile::processPoints(const QList<Data::Point> &points,
 
 		TextPointItem *item = new TextPointItem(pos + offset, label, fnt, img,
 		  color, hColor, 0, 2, rotate);
-		if (item->isValid() && (slMap.contains(point.pos())
+		if (item->isValid() && (sectorLights.contains(point.pos())
 		  || (point.polygon() && img) || !item->collides(textItems))) {
 			textItems.append(item);
-			if (lightsMap.contains(point.pos()))
-				lights.append(new TextPointItem(pos + _style->lightOffset(),
-				  0, 0, _style->light(lightsMap.value(point.pos())), 0, 0, 0, 0));
-			if (signalsSet.contains(point.pos()))
-				lights.append(new TextPointItem(pos + _style->signalOffset(),
+			if (lights.contains(point.pos()))
+				lightItems.append(new TextPointItem(pos + _style->lightOffset(),
+				  0, 0, _style->light(lights.value(point.pos())), 0, 0, 0, 0));
+			if (sigs.contains(point.pos()))
+				lightItems.append(new TextPointItem(pos + _style->signalOffset(),
 				  0, 0, _style->signal(), 0, 0, 0, 0));
 		} else
 			delete item;
@@ -357,23 +355,23 @@ void RasterTile::processLines(const QList<Data::Line> &lines,
 void RasterTile::drawLevels(QPainter *painter, const QList<Level> &levels)
 {
 	for (int i = levels.size() - 1; i >= 0; i--) {
-		QList<TextItem*> textItems, lights;
-		QList<SectorLight> sectorLights;
+		QList<TextItem*> textItems, lightItems;
+		QMultiMap<Coordinates, SectorLight> sectorLights;
 		const Level &l = levels.at(i);
 
-		processPoints(l.points, textItems, lights, sectorLights, l.overZoom);
+		processPoints(l.points, textItems, lightItems, sectorLights, l.overZoom);
 		processLines(l.lines, textItems);
 
 		drawPolygons(painter, l.polygons);
 		drawLines(painter, l.lines);
 		drawArrows(painter, l.points);
 
-		drawTextItems(painter, lights);
+		drawTextItems(painter, lightItems);
 		drawSectorLights(painter, sectorLights);
 		drawTextItems(painter, textItems);
 
 		qDeleteAll(textItems);
-		qDeleteAll(lights);
+		qDeleteAll(lightItems);
 	}
 }
 
@@ -418,7 +416,7 @@ QList<RasterTile::Level> RasterTile::fetchLevels()
 		if (!level.isNull())
 			list.append(level);
 
-		if (_data.size() > 0 && shape(level.polygons).contains(_rect))
+		if (_data.size() > 1 && shape(level.polygons).contains(_rect))
 			break;
 	}
 

src/map/ENC/rastertile.h

@@ -39,11 +39,10 @@ public:
 private:
 	struct SectorLight
 	{
-		SectorLight(const Coordinates &pos, Style::Color color, uint visibility,
-		  double range, double start, double end) : pos(pos), color(color),
-		  visibility(visibility), range(range), start(start), end(end) {}
+		SectorLight(Style::Color color, uint visibility, double range,
+		  double start, double end) : color(color), visibility(visibility),
+		  range(range), start(start), end(end) {}
 
-		Coordinates pos;
 		Style::Color color;
 		uint visibility;
 		double range;
@@ -61,9 +60,6 @@ private:
 		  {return lines.isEmpty() && polygons.isEmpty() && points.isEmpty();}
 	};
 
-	typedef QMap<Coordinates, Style::Color> LightMap;
-	typedef QSet<Coordinates> SignalSet;
-
 	QPointF ll2xy(const Coordinates &c) const
 	  {return _transform.proj2img(_proj.ll2xy(c));}
 	QPainterPath painterPath(const Polygon &polygon) const;
@@ -72,15 +68,16 @@ private:
 	QPolygonF tsslptArrow(const QPointF &p, qreal angle) const;
 	QPointF centroid(const QVector<Coordinates> &polygon) const;
 	void processPoints(const QList<Data::Point> &points,
-	  QList<TextItem*> &textItems, QList<TextItem *> &lights,
-	  QList<SectorLight> &sectorLights, bool overZoom) const;
+	  QList<TextItem*> &textItems, QList<TextItem*> &lightItems,
+	  QMultiMap<Coordinates, SectorLight> &sectorLights, bool overZoom) const;
 	void processLines(const QList<Data::Line> &lines,
 	  QList<TextItem*> &textItems) const;
 	void drawArrows(QPainter *painter, const QList<Data::Point> &points) const;
 	void drawPolygons(QPainter *painter, const QList<Data::Poly> &polygons) const;
 	void drawLines(QPainter *painter, const QList<Data::Line> &lines) const;
 	void drawTextItems(QPainter *painter, const QList<TextItem*> &textItems) const;
-	void drawSectorLights(QPainter *painter, const QList<SectorLight> &lights) const;
+	void drawSectorLights(QPainter *painter,
+	  const QMultiMap<Coordinates, SectorLight> &lights) const;
 	bool showLabel(const QImage *img, int type) const;
 	void drawLevels(QPainter *painter, const QList<Level> &levels);
 	QList<Level> fetchLevels();