root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-30 22:51:16 +01:00
Code Issues Projects Releases Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2021-01-31 14:54:21 +01:00
parent 97dbfb163b
commit 47b6c9d116
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/IMG/rgnfile.cpp
View File

@ -2,6 +2,7 @@
#include "common/garmin.h" #include "common/garmin.h"
#include "deltastream.h" #include "deltastream.h"
#include "huffmanstream.h" #include "huffmanstream.h"
#include "style.h"
#include "lblfile.h" #include "lblfile.h"
#include "netfile.h" #include "netfile.h"
#include "nodfile.h" #include "nodfile.h"
@ -18,7 +19,7 @@ static quint64 pointId(const QPoint &pos, quint32 type, quint32 labelPtr)
QPair<int, int>(pos.x(), pos.y())), labelPtr & 0x3FFFFF)); QPair<int, int>(pos.x(), pos.y())), labelPtr & 0x3FFFFF));
id = ((quint64)type)<<32 | hash; id = ((quint64)type)<<32 | hash;
// Make country labels precedent over city labels // Make country labels precedent over city labels
if (!(type >= 0x1400 && type <= 0x153f)) if (!Style::isCountry(type))
id |= 1ULL<<63; id |= 1ULL<<63;
return id; return id;
@ -390,8 +391,9 @@ bool RGNFile::pointObjects(Handle &hdl, const SubDiv *subdiv,
point.coordinates = Coordinates(toWGS24(pos.x()), toWGS24(pos.y())); point.coordinates = Coordinates(toWGS24(pos.x()), toWGS24(pos.y()));
point.id = pointId(pos, point.type, labelPtr & 0x3FFFFF); point.id = pointId(pos, point.type, labelPtr & 0x3FFFFF);
if (lbl && (labelPtr & 0x3FFFFF)) if (lbl && (labelPtr & 0x3FFFFF))
point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF, labelPtr & 0x400000, point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF,
!(point.type == 0x1400 || point.type == 0x1500 || point.type == 0x1e00)); labelPtr & 0x400000, !(Style::isCountry(point.type)
|| Style::isState(point.type)));
points->append(point); points->append(point);
} }

4
src/map/IMG/style.h
View File

@ -127,6 +127,10 @@ public:
{return (type == 0x6616);} {return (type == 0x6616);}
static bool isMajorRoad(quint32 type) static bool isMajorRoad(quint32 type)
{return (type <= TYPE(0x04));} {return (type <= TYPE(0x04));}
static bool isCountry(quint32 type)
{return (type >= 0x1400 && type <= 0x153f);}
static bool isState(quint32 type)
{return (type = TYPE(0x1e));}
static POIClass poiClass(quint32 type); static POIClass poiClass(quint32 type);