root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 19:55:53 +01:00
Code Issues Projects Releases Activity

Cosmetics

Browse Source
This commit is contained in:
Martin Tůma 2019-07-13 14:42:44 +02:00
parent 0e9720f68b
commit 297177ad41
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/map/IMG/label.h
View File

@ -4,6 +4,9 @@
#include <QString> #include <QString>
#include <QDebug> #include <QDebug>
#define FIRST_SHIELD Label::Shield::USInterstate
#define LAST_SHIELD Label::Shield::Oval
class Label { class Label {
public: public:
class Shield class Shield

9
src/map/imgmap.cpp
View File

@ -18,7 +18,6 @@
#define TILE_SIZE 256 #define TILE_SIZE 256
#define TEXT_EXTENT 256 #define TEXT_EXTENT 256
#define LINE_TEXT_MIN_ZOOM 22
#define AREA(rect) \ #define AREA(rect) \
(rect.size().width() * rect.size().height()) (rect.size().width() * rect.size().height())
@ -181,7 +180,7 @@ static int minShieldZoom(Label::Shield::Type type)
case Label::Shield::Oval: case Label::Shield::Oval:
return 20; return 20;
default: default:
return INT_MAX; return 0;
} }
} }
@ -357,6 +356,7 @@ void IMGMap::processLines(QList<IMG::Poly> &lines, const QRect &tileRect,
} }
} }
if (_zoom >= 22)
processStreetNames(lines, tileRect, textItems); processStreetNames(lines, tileRect, textItems);
processShields(lines, tileRect, textItems); processShields(lines, tileRect, textItems);
} }
@ -364,7 +364,6 @@ void IMGMap::processLines(QList<IMG::Poly> &lines, const QRect &tileRect,
void IMGMap::processStreetNames(QList<IMG::Poly> &lines, const QRect &tileRect, void IMGMap::processStreetNames(QList<IMG::Poly> &lines, const QRect &tileRect,
QList<TextItem*> &textItems) QList<TextItem*> &textItems)
{ {
if (_zoom >= LINE_TEXT_MIN_ZOOM) {
for (int i = 0; i < lines.size(); i++) { for (int i = 0; i < lines.size(); i++) {
IMG::Poly &poly = lines[i]; IMG::Poly &poly = lines[i];
const Style::Line &style = _img.style()->line(poly.type); const Style::Line &style = _img.style()->line(poly.type);
@ -390,13 +389,11 @@ void IMGMap::processStreetNames(QList<IMG::Poly> &lines, const QRect &tileRect,
delete item; delete item;
} }
} }
}
void IMGMap::processShields(QList<IMG::Poly> &lines, const QRect &tileRect, void IMGMap::processShields(QList<IMG::Poly> &lines, const QRect &tileRect,
QList<TextItem*> &textItems) QList<TextItem*> &textItems)
{ {
for (int type = Label::Shield::USInterstate; type <= Label::Shield::Oval; for (int type = FIRST_SHIELD; type <= LAST_SHIELD; type++) {
type++) {
if (minShieldZoom(static_cast<Label::Shield::Type>(type)) > _zoom) if (minShieldZoom(static_cast<Label::Shield::Type>(type)) > _zoom)
continue; continue;