root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-20 17:50:49 +01:00
Code Issues Projects Releases Activity

Yet another code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2023-08-03 00:39:56 +02:00
parent 4bcbce671d
commit 4bf81e020f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/map/IMG/rastertile.cpp
View File

@ -18,6 +18,9 @@ using namespace IMG;
#define AREA(rect) \
(rect.size().width() * rect.size().height())
#define ROAD 0
#define WATER 1
static const QColor textColor(Qt::black);
static const QColor haloColor(Qt::white);
static const QColor shieldColor(Qt::white);
@ -327,7 +330,7 @@ void RasterTile::processStreetNames(const QList<MapData::Poly> &lines,
const QColor *hColor = Style::isContourLine(poly.type) ? 0 : &haloColor;
const QImage *img = poly.oneway
? Style::isWaterLine(poly.type)
? &arrows[1] : &arrows[0] : 0;
? &arrows[WATER] : &arrows[ROAD] : 0;
const QString *label = poly.label.text().isEmpty()
? 0 : &poly.label.text();
@ -479,9 +482,9 @@ void RasterTile::render()
QList<TextItem*> textItems;
QImage arrows[2];
arrows[0] = (_ratio >= 2)
arrows[ROAD] = (_ratio >= 2)
? QImage(":/map/arrow@2x.png") : QImage(":/map/arrow.png");
arrows[1] = (_ratio >= 2)
arrows[WATER] = (_ratio >= 2)
? QImage(":/map/water-arrow@2x.png") : QImage(":/map/water-arrow.png");
fetchData(polygons, lines, points);