Yet another area labels layout algorithm change

tumic0 · Nov 13, 2024 · a992791 · a992791
1 parent 1a9bec1
commit a992791
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/map/mapsforge/rastertile.cpp b/src/map/mapsforge/rastertile.cpp
@@ -205,17 +205,14 @@ void RasterTile::processAreaLabels(const QVector<PainterPath> &paths,
 		const QColor *color = p.ti ? &p.ti->fillColor() : 0;
 		const QColor *hColor = p.ti ? haloColor(p.ti) : 0;
 
-		QPainterPath rp;
-		rp.addRect(_rect);
 		QPointF pos = p.p->path->labelPos.isNull()
-		  ? centroid(p.p->pp & rp) : ll2xy(p.p->path->labelPos);
+		  ? centroid(p.p->pp) : ll2xy(p.p->path->labelPos);
 		if (p.ti && p.lbl && set.contains(*p.lbl))
 			continue;
 
 		PointItem *item = new PointItem(pos.toPoint(), p.lbl, font, img, color,
 		  hColor);
-		if (item->isValid() && _rect.contains(item->boundingRect().toRect())
-		  && rectNearPolygon(p.p->pp, item->boundingRect())
+		if (item->isValid() && rectNearPolygon(p.p->pp, item->boundingRect())
 		  && !item->collides(textItems)) {
 			textItems.append(item);
 			if (p.ti && p.lbl)