root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-06-02 16:23:03 +02:00
Code Issues Projects Releases Activity

Boundary limits style enhancements

Browse Source
This commit is contained in:
Martin Tůma 2025-05-17 00:21:26 +02:00
parent 7e1d0dfb22
commit 7c3a7c1973
6 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gpxsee.qrc
View File

@ -331,6 +331,7 @@
<file alias="international-maritime-boundary.png">icons/map/marine/international-maritime-boundary.png</file> <file alias="international-maritime-boundary.png">icons/map/marine/international-maritime-boundary.png</file>
<file alias="straight-territorial-sea-baseline.png">icons/map/marine/straight-territorial-sea-baseline.png</file> <file alias="straight-territorial-sea-baseline.png">icons/map/marine/straight-territorial-sea-baseline.png</file>
<file alias="seaward-limit-of-territorial-sea.png">icons/map/marine/seaward-limit-of-territorial-sea.png</file> <file alias="seaward-limit-of-territorial-sea.png">icons/map/marine/seaward-limit-of-territorial-sea.png</file>
<file alias="seaward-limit-of-contiguous-zone.png">icons/map/marine/seaward-limit-of-contiguous-zone.png</file>
</qresource> </qresource>
<!-- Patterns (Mapsforge) --> <!-- Patterns (Mapsforge) -->

BIN
icons/map/marine/seaward-limit-of-contiguous-zone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 225 B

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

@ -26,6 +26,7 @@
#define DRVAL1 87 #define DRVAL1 87
#define ELEVAT 90 #define ELEVAT 90
#define FUNCTN 94 #define FUNCTN 94
#define JRSDTN 103
#define LITVIS 108 #define LITVIS 108
#define OBJNAM 116 #define OBJNAM 116
#define ORIENT 117 #define ORIENT 117

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

@ -488,6 +488,8 @@ MapData::Poly::Poly(uint type, const Polygon &path, const Attributes &attr,
subtype = CATSLC; subtype = CATSLC;
else if (type == I_SLCONS) else if (type == I_SLCONS)
subtype = I_CATSLC; subtype = I_CATSLC;
else if (type == ADMARE)
subtype = JRSDTN;
switch (type) { switch (type) {
case DEPARE: case DEPARE:

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

@ -4,6 +4,7 @@
#define TYPE(t) ((t)<<16) #define TYPE(t) ((t)<<16)
#define SUBTYPE(t, s) (((t)<<16)|(s)) #define SUBTYPE(t, s) (((t)<<16)|(s))
#define ADMARE 1
#define AIRARE 2 #define AIRARE 2
#define ACHBRT 3 #define ACHBRT 3
#define ACHARE 4 #define ACHARE 4
@ -88,6 +89,8 @@
#define SLOTOP 126 #define SLOTOP 126
#define SMCFAC 128 #define SMCFAC 128
#define SOUNDG 129 #define SOUNDG 129
#define STSLNE 132
#define TESARE 135
#define TSELNE 145 #define TSELNE 145
#define TSSBND 146 #define TSSBND 146
#define TSSLPT 148 #define TSSLPT 148

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

@ -288,10 +288,14 @@ void Style::polygonStyle()
_polygons[SUBTYPE(I_BERTHS, 6)] = _polygons[TYPE(BERTHS)]; _polygons[SUBTYPE(I_BERTHS, 6)] = _polygons[TYPE(BERTHS)];
_polygons[TYPE(I_TRNBSN)] = Polygon(Qt::NoBrush, QPen(QColor(0xeb, 0x49, 0xeb), _polygons[TYPE(I_TRNBSN)] = Polygon(Qt::NoBrush, QPen(QColor(0xeb, 0x49, 0xeb),
1, Qt::DashLine)); 1, Qt::DashLine));
_polygons[TYPE(CONZNE)] = Polygon(Qt::NoBrush, QPen(QColor(0xeb, 0x49, 0xeb),
1, Qt::DashDotLine));
_polygons[TYPE(PILBOP)] = Polygon(Qt::NoBrush, QPen(QColor(0xeb, 0x49, 0xeb), _polygons[TYPE(PILBOP)] = Polygon(Qt::NoBrush, QPen(QColor(0xeb, 0x49, 0xeb),
1, Qt::DashLine)); 1, Qt::DashLine));
_polygons[TYPE(CONZNE)] = Polygon(
QImage(":/marine/seaward-limit-of-contiguous-zone.png"));
_polygons[TYPE(TESARE)] = Polygon(
QImage(":/marine/seaward-limit-of-territorial-sea.png"));
_polygons[SUBTYPE(ADMARE, 2)] = Polygon(
QImage(":/marine/international-maritime-boundary.png"));
_drawOrder _drawOrder
<< TYPE(LNDARE) << SUBTYPE(DEPARE, 0) << SUBTYPE(DEPARE, 1) << TYPE(LNDARE) << SUBTYPE(DEPARE, 0) << SUBTYPE(DEPARE, 1)
@ -339,7 +343,8 @@ void Style::polygonStyle()
<< SUBTYPE(I_RESARE, 25) << SUBTYPE(RESARE, 26) << SUBTYPE(I_RESARE, 26) << SUBTYPE(I_RESARE, 25) << SUBTYPE(RESARE, 26) << SUBTYPE(I_RESARE, 26)
<< TYPE(CBLARE) << TYPE(PIPARE) << TYPE(PRCARE) << TYPE(I_TRNBSN) << TYPE(CBLARE) << TYPE(PIPARE) << TYPE(PRCARE) << TYPE(I_TRNBSN)
<< TYPE(PILBOP) << SUBTYPE(MARCUL, 0) << SUBTYPE(MARCUL, 1) << TYPE(PILBOP) << SUBTYPE(MARCUL, 0) << SUBTYPE(MARCUL, 1)
<< SUBTYPE(MARCUL, 2) << SUBTYPE(MARCUL, 3) << TYPE(CONZNE); << SUBTYPE(MARCUL, 2) << SUBTYPE(MARCUL, 3) << TYPE(CONZNE)
<< TYPE(TESARE) << SUBTYPE(ADMARE, 2);
} }
void Style::lineStyle(qreal ratio) void Style::lineStyle(qreal ratio)
@ -428,6 +433,8 @@ void Style::lineStyle(qreal ratio)
Qt::DashLine)); Qt::DashLine));
_lines[SUBTYPE(RDOCAL, 4)] = Line(QPen(QColor(0xeb, 0x49, 0xeb), 1, _lines[SUBTYPE(RDOCAL, 4)] = Line(QPen(QColor(0xeb, 0x49, 0xeb), 1,
Qt::DashLine)); Qt::DashLine));
_lines[TYPE(STSLNE)] = Line(
QImage(":/marine/straight-territorial-sea-baseline.png"));
} }
void Style::pointStyle(qreal ratio) void Style::pointStyle(qreal ratio)