root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-10-06 06:43:22 +02:00
Code Issues Projects Releases Activity

Turbulences and pilot boarding places

Browse Source
This commit is contained in:
Martin Tůma 2022-12-10 18:41:35 +01:00
parent ca3e0eda49
commit ae49e9f2fd
8 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gpxsee.qrc
View File

@ -196,6 +196,9 @@
<file alias="shipyard.png">icons/map/marine/shipyard.png</file> <file alias="shipyard.png">icons/map/marine/shipyard.png</file>
<file alias="pylon.png">icons/map/marine/pylon.png</file> <file alias="pylon.png">icons/map/marine/pylon.png</file>
<file alias="fleeting-area.png">icons/map/marine/fleeting-area.png</file> <file alias="fleeting-area.png">icons/map/marine/fleeting-area.png</file>
<file alias="breakers.png">icons/map/marine/breakers.png</file>
<file alias="overfalls.png">icons/map/marine/overfalls.png</file>
<file alias="boarding-place.png">icons/map/marine/boarding-place.png</file>
</qresource> </qresource>
<!-- Mapsforge rendertheme --> <!-- Mapsforge rendertheme -->

BIN
icons/map/marine/boarding-place.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 234 B

BIN
icons/map/marine/breakers.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 271 B

BIN
icons/map/marine/overfalls.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 198 B

1
src/map/ENC/attributes.h
View File

@ -11,6 +11,7 @@
#define CATTRK 54 #define CATTRK 54
#define CATREA 56 #define CATREA 56
#define CATSCF 65 #define CATSCF 65
#define CATWAT 69
#define CATWRK 71 #define CATWRK 71
#define COMCHA 77 #define COMCHA 77
#define DRVAL1 87 #define DRVAL1 87

37
src/map/ENC/mapdata.cpp
View File

@ -49,21 +49,25 @@ static QMap<uint,uint> orderMapInit()
map.insert(TYPE(OBSTRN), 24); map.insert(TYPE(OBSTRN), 24);
map.insert(TYPE(WRECKS), 25); map.insert(TYPE(WRECKS), 25);
map.insert(TYPE(UWTROC), 26); map.insert(TYPE(UWTROC), 26);
map.insert(TYPE(I_RDOCAL), 27); map.insert(TYPE(WATTUR), 27);
map.insert(TYPE(I_TRNBSN), 28); map.insert(TYPE(PILBOP), 28);
map.insert(TYPE(HRBFAC), 29); map.insert(TYPE(I_RDOCAL), 29);
map.insert(TYPE(I_HRBFAC), 29); map.insert(TYPE(I_TRNBSN), 30);
map.insert(TYPE(PILPNT), 30); map.insert(TYPE(HRBFAC), 31);
map.insert(TYPE(ACHBRT), 31); map.insert(TYPE(I_HRBFAC), 31);
map.insert(TYPE(I_ACHBRT), 31); map.insert(TYPE(PILPNT), 32);
map.insert(TYPE(CRANES), 32); map.insert(TYPE(ACHBRT), 33);
map.insert(TYPE(I_CRANES), 32); map.insert(TYPE(I_ACHBRT), 33);
map.insert(TYPE(LNDMRK), 33); map.insert(TYPE(CRANES), 34);
map.insert(TYPE(SILTNK), 34); map.insert(TYPE(I_CRANES), 34);
map.insert(TYPE(LNDELV), 35); map.insert(TYPE(I_WTWGAG), 35);
map.insert(TYPE(SMCFAC), 36); map.insert(TYPE(PYLONS), 36);
map.insert(TYPE(BUISGL), 37); map.insert(TYPE(LNDMRK), 37);
map.insert(TYPE(I_WTWGAG), 38); map.insert(TYPE(SILTNK), 38);
map.insert(TYPE(LNDELV), 39);
map.insert(TYPE(SMCFAC), 40);
map.insert(TYPE(BUISGL), 41);
map.insert(TYPE(I_DISMAR), 0xFFFFFFFE); map.insert(TYPE(I_DISMAR), 0xFFFFFFFE);
map.insert(TYPE(SOUNDG), 0xFFFFFFFF); map.insert(TYPE(SOUNDG), 0xFFFFFFFF);
@ -504,7 +508,8 @@ MapData::Attr MapData::pointAttr(const ISO8211::Record &r, uint OBJL)
|| (OBJL == UWTROC && key == WATLEV) || (OBJL == UWTROC && key == WATLEV)
|| (OBJL == BUAARE && key == CATBUA) || (OBJL == BUAARE && key == CATBUA)
|| (OBJL == SMCFAC && key == CATSCF) || (OBJL == SMCFAC && key == CATSCF)
|| (OBJL == BUISGL && key == FUNCTN)) || (OBJL == BUISGL && key == FUNCTN)
|| (OBJL == WATTUR && key == CATWAT))
subtype = av.at(1).toByteArray().toUInt(); subtype = av.at(1).toByteArray().toUInt();
else if (OBJL == I_DISMAR && key == CATDIS) else if (OBJL == I_DISMAR && key == CATDIS)
subtype |= av.at(1).toByteArray().toUInt(); subtype |= av.at(1).toByteArray().toUInt();

2
src/map/ENC/objects.h
View File

@ -54,6 +54,7 @@
#define OBSTRN 86 #define OBSTRN 86
#define OFSPLF 87 #define OFSPLF 87
#define PILPNT 90 #define PILPNT 90
#define PILBOP 91
#define PIPARE 92 #define PIPARE 92
#define PIPOHD 93 #define PIPOHD 93
#define PIPSOL 94 #define PIPSOL 94
@ -81,6 +82,7 @@
#define TUNNEL 151 #define TUNNEL 151
#define UWTROC 153 #define UWTROC 153
#define UNSARE 154 #define UNSARE 154
#define WATTUR 156
#define WRECKS 159 #define WRECKS 159
#define M_COVR 302 #define M_COVR 302

5
src/map/ENC/style.cpp
View File

@ -199,6 +199,7 @@ void Style::pointStyle()
_points[SUBTYPE(LNDMRK, 19)] = Point(QImage(":/marine/windmotor.png")); _points[SUBTYPE(LNDMRK, 19)] = Point(QImage(":/marine/windmotor.png"));
_points[TYPE(LNDELV)] = Point(QImage(":/marine/triangulation-point.png")); _points[TYPE(LNDELV)] = Point(QImage(":/marine/triangulation-point.png"));
_points[TYPE(OBSTRN)] = Point(QImage(":/marine/obstruction.png"), Small); _points[TYPE(OBSTRN)] = Point(QImage(":/marine/obstruction.png"), Small);
_points[SUBTYPE(WRECKS, 0)] = Point(QImage(":/marine/wreck.png"), Small);
_points[SUBTYPE(WRECKS, 1)] = Point(QImage(":/marine/wreck.png"), Small); _points[SUBTYPE(WRECKS, 1)] = Point(QImage(":/marine/wreck.png"), Small);
_points[SUBTYPE(WRECKS, 2)] = Point(QImage(":/marine/wreck-dangerous.png"), _points[SUBTYPE(WRECKS, 2)] = Point(QImage(":/marine/wreck-dangerous.png"),
Small); Small);
@ -250,6 +251,10 @@ void Style::pointStyle()
_points[TYPE(I_RDOCAL)].setTextColor(QColor("#eb49eb")); _points[TYPE(I_RDOCAL)].setTextColor(QColor("#eb49eb"));
_points[TYPE(PYLONS)] = Point(QImage(":/marine/pylon.png")); _points[TYPE(PYLONS)] = Point(QImage(":/marine/pylon.png"));
_points[SUBTYPE(I_BERTHS, 6)] = Point(QImage(":/marine/fleeting-area.png")); _points[SUBTYPE(I_BERTHS, 6)] = Point(QImage(":/marine/fleeting-area.png"));
_points[SUBTYPE(WATTUR, 1)] = Point(QImage(":/marine/breakers.png"));
_points[SUBTYPE(WATTUR, 3)] = Point(QImage(":/marine/overfalls.png"));
_points[SUBTYPE(WATTUR, 4)] = Point(QImage(":/marine/overfalls.png"));
_points[TYPE(PILBOP)] = Point(QImage(":/marine/boarding-place.png"));
_points[SUBTYPE(SMCFAC, 7)] = Point(QImage(":/POI/restaurant-11.png")); _points[SUBTYPE(SMCFAC, 7)] = Point(QImage(":/POI/restaurant-11.png"));
_points[SUBTYPE(SMCFAC, 11)] = Point(QImage(":/POI/pharmacy-11.png")); _points[SUBTYPE(SMCFAC, 11)] = Point(QImage(":/POI/pharmacy-11.png"));