mirror of
https://github.com/tumic0/GPXSee.git
synced 2024-12-05 00:39:09 +01:00
Compare commits
2 Commits
c3b484bb75
...
961061b643
Author | SHA1 | Date | |
---|---|---|---|
961061b643 | |||
8bebea53ad |
@ -200,6 +200,7 @@
|
|||||||
<file alias="construction.png">icons/map/marine/construction.png</file>
|
<file alias="construction.png">icons/map/marine/construction.png</file>
|
||||||
<file alias="radio-call.png">icons/map/marine/radio-call.png</file>
|
<file alias="radio-call.png">icons/map/marine/radio-call.png</file>
|
||||||
<file alias="current.png">icons/map/marine/current.png</file>
|
<file alias="current.png">icons/map/marine/current.png</file>
|
||||||
|
<file alias="rescue-station.png">icons/map/marine/rescue-station.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
|
|
||||||
<!-- Mapsforge rendertheme -->
|
<!-- Mapsforge rendertheme -->
|
||||||
|
BIN
icons/map/marine/rescue-station.png
Normal file
BIN
icons/map/marine/rescue-station.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 228 B |
@ -23,6 +23,7 @@ static QMap<uint,uint> orderMapInit()
|
|||||||
map.insert(TYPE(FOGSIG), 0);
|
map.insert(TYPE(FOGSIG), 0);
|
||||||
|
|
||||||
map.insert(TYPE(CGUSTA), 1);
|
map.insert(TYPE(CGUSTA), 1);
|
||||||
|
map.insert(TYPE(RSCSTA), 1);
|
||||||
map.insert(SUBTYPE(BUAARE, 1), 2);
|
map.insert(SUBTYPE(BUAARE, 1), 2);
|
||||||
map.insert(SUBTYPE(BUAARE, 5), 3);
|
map.insert(SUBTYPE(BUAARE, 5), 3);
|
||||||
map.insert(SUBTYPE(BUAARE, 4), 4);
|
map.insert(SUBTYPE(BUAARE, 4), 4);
|
||||||
@ -264,6 +265,13 @@ MapData::Point::Point(uint type, const Coordinates &c, const QString &label,
|
|||||||
if (_label.isEmpty())
|
if (_label.isEmpty())
|
||||||
_label = sistat(type & 0xFF);
|
_label = sistat(type & 0xFF);
|
||||||
_type = TYPE(SISTAT);
|
_type = TYPE(SISTAT);
|
||||||
|
} else if (type>>16 == LNDELV && params.size()) {
|
||||||
|
if (_label.isEmpty())
|
||||||
|
_label = QString::fromLatin1(params.at(0))
|
||||||
|
+ QString::fromUtf8("\xE2\x80\x89m");
|
||||||
|
else
|
||||||
|
_label += "\n(" + QString::fromLatin1(params.at(0))
|
||||||
|
+ "\xE2\x80\x89m)";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -552,7 +560,8 @@ MapData::Attr MapData::pointAttr(const ISO8211::Record &r, uint OBJL)
|
|||||||
if ((OBJL == I_DISMAR && key == I_WTWDIS)
|
if ((OBJL == I_DISMAR && key == I_WTWDIS)
|
||||||
|| (OBJL == RDOCAL && key == ORIENT)
|
|| (OBJL == RDOCAL && key == ORIENT)
|
||||||
|| (OBJL == I_RDOCAL && key == ORIENT)
|
|| (OBJL == I_RDOCAL && key == ORIENT)
|
||||||
|| (OBJL == CURENT && key == ORIENT))
|
|| (OBJL == CURENT && key == ORIENT)
|
||||||
|
|| (OBJL == LNDELV && key == ELEVAT))
|
||||||
params[0] = av.at(1).toByteArray();
|
params[0] = av.at(1).toByteArray();
|
||||||
if ((OBJL == I_RDOCAL && key == COMCHA)
|
if ((OBJL == I_RDOCAL && key == COMCHA)
|
||||||
|| (OBJL == RDOCAL && key == COMCHA)
|
|| (OBJL == RDOCAL && key == COMCHA)
|
||||||
|
@ -70,6 +70,7 @@
|
|||||||
#define RAILWY 106
|
#define RAILWY 106
|
||||||
#define RCRTCL 108
|
#define RCRTCL 108
|
||||||
#define RECTRC 109
|
#define RECTRC 109
|
||||||
|
#define RSCSTA 111
|
||||||
#define RESARE 112
|
#define RESARE 112
|
||||||
#define RIVERS 114
|
#define RIVERS 114
|
||||||
#define ROADWY 116
|
#define ROADWY 116
|
||||||
|
@ -248,6 +248,7 @@ void Style::pointStyle()
|
|||||||
_points[SUBTYPE(I_DISMAR, 3)] = _points[SUBTYPE(I_DISMAR, 2)];
|
_points[SUBTYPE(I_DISMAR, 3)] = _points[SUBTYPE(I_DISMAR, 2)];
|
||||||
_points[SUBTYPE(I_DISMAR, 4)] = _points[SUBTYPE(I_DISMAR, 2)];
|
_points[SUBTYPE(I_DISMAR, 4)] = _points[SUBTYPE(I_DISMAR, 2)];
|
||||||
_points[TYPE(CGUSTA)] = Point(QImage(":/marine/coast-guard.png"));
|
_points[TYPE(CGUSTA)] = Point(QImage(":/marine/coast-guard.png"));
|
||||||
|
_points[TYPE(RSCSTA)] = Point(QImage(":/marine/rescue-station.png"));
|
||||||
_points[TYPE(RDOSTA)] = Point(QImage(":/marine/radio.png"));
|
_points[TYPE(RDOSTA)] = Point(QImage(":/marine/radio.png"));
|
||||||
_points[TYPE(RADSTA)] = Point(QImage(":/marine/radar.png"));
|
_points[TYPE(RADSTA)] = Point(QImage(":/marine/radar.png"));
|
||||||
_points[TYPE(RTPBCN)] = Point(QImage(":/marine/radar-transponder.png"));
|
_points[TYPE(RTPBCN)] = Point(QImage(":/marine/radar-transponder.png"));
|
||||||
|
Loading…
Reference in New Issue
Block a user