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

Allow lower zooms, properly sort cities

Browse Source
This commit is contained in:
Martin Tůma 2019-07-02 08:52:26 +02:00
parent 03d5745da9
commit 863aa3f542
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/IMG/img.h
View File

@ -41,7 +41,7 @@ public:
quint64 id; quint64 id;
bool operator<(const Point &other) const bool operator<(const Point &other) const
{return id > other.id;} {return id < other.id;}
}; };

16
src/map/imgmap.cpp
View File

@ -18,12 +18,6 @@
#define TILE_SIZE 256 #define TILE_SIZE 256
#define TEXT_EXTENT 256 #define TEXT_EXTENT 256
#define LARGE_FONT_SIZE 14
#define NORMAL_FONT_SIZE 12
#define SMALL_FONT_SIZE 10
#define POI_FONT_SIZE 9
#define LINE_TEXT_MIN_ZOOM 22 #define LINE_TEXT_MIN_ZOOM 22
class RasterTile class RasterTile
@ -124,10 +118,10 @@ static const QFont *name() \
return &f; \ return &f; \
} }
FONT(largeFont, LARGE_FONT_SIZE) FONT(largeFont, 14)
FONT(normalFont, NORMAL_FONT_SIZE) FONT(normalFont, 12)
FONT(smallFont, SMALL_FONT_SIZE) FONT(smallFont, 10)
FONT(poiFont, POI_FONT_SIZE) FONT(poiFont, 9)
static const QColor *shieldBgColor(Label::Shield::Type type) static const QColor *shieldBgColor(Label::Shield::Type type)
{ {
@ -173,7 +167,7 @@ IMGMap::IMGMap(const QString &fileName, QObject *parent)
return; return;
} }
_zooms = Range(_img.zooms().min() - 1, 28); _zooms = Range(qMin(_img.zooms().min(), 12), 28);
_zoom = _zooms.min(); _zoom = _zooms.min();
updateTransform(); updateTransform();