root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-19 09:00:49 +01:00
Code Issues Projects Releases Activity

Do not show area labels when the area is not shown

Browse Source
This commit is contained in:
Martin Tůma 2025-02-12 19:45:11 +01:00
parent ca17ec9e5f
commit 1ee60b4f96
2 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,12 +178,22 @@ static bool polygonPointCb(const MapData::Poly *polygon, void *context)
if (baseType == TSSLPT || baseType == RCTLPT || baseType == I_TRNBSN
|| baseType == BRIDGE || baseType == I_BRIDGE || baseType == BUAARE
|| baseType == RESARE || baseType == I_RESARE || baseType == LNDARE
|| baseType == LNDRGN
|| type == SUBTYPE(ACHARE, 2) || type == SUBTYPE(ACHARE, 3)
|| type == SUBTYPE(ACHARE, 9) || type == SUBTYPE(I_ACHARE, 2)
|| type == SUBTYPE(I_ACHARE, 3) || type == SUBTYPE(I_ACHARE, 9)
|| type == SUBTYPE(I_BERTHS, 6))
|| baseType == LNDARE || baseType == LNDRGN
|| type == SUBTYPE(ACHARE, 2) || type == SUBTYPE(I_ACHARE, 2)
|| type == SUBTYPE(ACHARE, 3) || type == SUBTYPE(I_ACHARE, 3)
|| type == SUBTYPE(ACHARE, 9) || type == SUBTYPE(I_ACHARE, 9)
|| type == SUBTYPE(I_BERTHS, 6)
|| type == SUBTYPE(RESARE, 1) || type == SUBTYPE(I_RESARE, 1)
|| type == SUBTYPE(RESARE, 2) || type == SUBTYPE(I_RESARE, 2)
|| type == SUBTYPE(RESARE, 4) || type == SUBTYPE(I_RESARE, 4)
|| type == SUBTYPE(RESARE, 5) || type == SUBTYPE(I_RESARE, 5)
|| type == SUBTYPE(RESARE, 6) || type == SUBTYPE(I_RESARE, 6)
|| type == SUBTYPE(RESARE, 7) || type == SUBTYPE(I_RESARE, 7)
|| type == SUBTYPE(RESARE, 9) || type == SUBTYPE(I_RESARE, 9)
|| type == SUBTYPE(RESARE, 12) || type == SUBTYPE(I_RESARE, 12)
|| type == SUBTYPE(RESARE, 17) || type == SUBTYPE(I_RESARE, 17)
|| type == SUBTYPE(RESARE, 22) || type == SUBTYPE(I_RESARE, 22)
|| type == SUBTYPE(RESARE, 23) || type == SUBTYPE(I_RESARE, 23))
points->append(MapData::Point(baseType, polygon->bounds().center(),
polygon->attributes(), polygon->HUNI(), true));

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

@ -88,6 +88,8 @@ void Style::polygonStyle()
_polygons[SUBTYPE(I_RESARE, 9)] = _polygons[SUBTYPE(RESARE, 9)];
_polygons[SUBTYPE(I_RESARE, 12)] = _polygons[SUBTYPE(RESARE, 12)];
_polygons[SUBTYPE(I_RESARE, 17)] = _polygons[SUBTYPE(RESARE, 17)];
_polygons[SUBTYPE(I_RESARE, 22)] = _polygons[SUBTYPE(RESARE, 22)];
_polygons[SUBTYPE(I_RESARE, 23)] = _polygons[SUBTYPE(RESARE, 23)];
_polygons[SUBTYPE(ACHARE, 1)] = Polygon(QImage(":/marine/anchor-line.png"));
_polygons[SUBTYPE(ACHARE, 2)] = _polygons[SUBTYPE(ACHARE, 1)];
_polygons[SUBTYPE(ACHARE, 3)] = _polygons[SUBTYPE(ACHARE, 1)];
@ -405,66 +407,30 @@ void Style::pointStyle(qreal ratio)
_points[SUBTYPE(I_ACHARE, 2)] = _points[SUBTYPE(ACHARE, 2)];
_points[SUBTYPE(I_ACHARE, 3)] = _points[SUBTYPE(ACHARE, 3)];
_points[SUBTYPE(I_ACHARE, 9)] = _points[SUBTYPE(ACHARE, 9)];
_points[TYPE(RESARE)].setTextColor(QColor(0xeb, 0x49, 0xeb));
_points[TYPE(RESARE)].setHaloColor(QColor());
_points[SUBTYPE(RESARE, 1)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 1)].setTextColor(QColor(0xeb, 0x49, 0xeb));
_points[SUBTYPE(RESARE, 1)].setHaloColor(QColor());
_points[SUBTYPE(RESARE, 2)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 3)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 4)].setTextColor(QColor(0x30, 0xa0, 0x1b));
_points[SUBTYPE(RESARE, 4)].setHaloColor(QColor());
_points[SUBTYPE(RESARE, 5)] = _points[SUBTYPE(RESARE, 4)];
_points[SUBTYPE(RESARE, 6)] = _points[SUBTYPE(RESARE, 4)];
_points[SUBTYPE(RESARE, 7)] = _points[SUBTYPE(RESARE, 4)];
_points[SUBTYPE(RESARE, 8)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 9)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 10)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 11)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 12)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 13)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 14)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 15)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 16)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 17)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 18)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 19)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 20)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 21)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 22)] = _points[SUBTYPE(RESARE, 4)];
_points[SUBTYPE(RESARE, 23)] = _points[SUBTYPE(RESARE, 4)];
_points[SUBTYPE(RESARE, 24)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 25)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 26)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 27)] = _points[TYPE(RESARE)];
_points[SUBTYPE(RESARE, 28)] = _points[TYPE(RESARE)];
_points[TYPE(I_RESARE)] = _points[TYPE(RESARE)];
_points[SUBTYPE(I_RESARE, 1)] = _points[SUBTYPE(RESARE, 1)];
_points[SUBTYPE(I_RESARE, 2)] = _points[SUBTYPE(RESARE, 2)];
_points[SUBTYPE(I_RESARE, 3)] = _points[SUBTYPE(RESARE, 3)];
_points[SUBTYPE(I_RESARE, 4)] = _points[SUBTYPE(RESARE, 4)];
_points[SUBTYPE(I_RESARE, 5)] = _points[SUBTYPE(RESARE, 5)];
_points[SUBTYPE(I_RESARE, 6)] = _points[SUBTYPE(RESARE, 6)];
_points[SUBTYPE(I_RESARE, 7)] = _points[SUBTYPE(RESARE, 7)];
_points[SUBTYPE(I_RESARE, 8)] = _points[SUBTYPE(RESARE, 8)];
_points[SUBTYPE(I_RESARE, 9)] = _points[SUBTYPE(RESARE, 9)];
_points[SUBTYPE(I_RESARE, 10)] = _points[SUBTYPE(RESARE, 10)];
_points[SUBTYPE(I_RESARE, 11)] = _points[SUBTYPE(RESARE, 11)];
_points[SUBTYPE(I_RESARE, 12)] = _points[SUBTYPE(RESARE, 12)];
_points[SUBTYPE(I_RESARE, 13)] = _points[SUBTYPE(RESARE, 13)];
_points[SUBTYPE(I_RESARE, 14)] = _points[SUBTYPE(RESARE, 14)];
_points[SUBTYPE(I_RESARE, 15)] = _points[SUBTYPE(RESARE, 15)];
_points[SUBTYPE(I_RESARE, 16)] = _points[SUBTYPE(RESARE, 16)];
_points[SUBTYPE(I_RESARE, 17)] = _points[SUBTYPE(RESARE, 17)];
_points[SUBTYPE(I_RESARE, 18)] = _points[SUBTYPE(RESARE, 18)];
_points[SUBTYPE(I_RESARE, 19)] = _points[SUBTYPE(RESARE, 19)];
_points[SUBTYPE(I_RESARE, 20)] = _points[SUBTYPE(RESARE, 20)];
_points[SUBTYPE(I_RESARE, 21)] = _points[SUBTYPE(RESARE, 21)];
_points[SUBTYPE(I_RESARE, 22)] = _points[SUBTYPE(RESARE, 22)];
_points[SUBTYPE(I_RESARE, 23)] = _points[SUBTYPE(RESARE, 23)];
_points[SUBTYPE(I_RESARE, 24)] = _points[SUBTYPE(RESARE, 24)];
_points[SUBTYPE(I_RESARE, 25)] = _points[SUBTYPE(RESARE, 25)];
_points[SUBTYPE(I_RESARE, 26)] = _points[SUBTYPE(RESARE, 26)];
_points[SUBTYPE(I_RESARE, 27)] = _points[SUBTYPE(RESARE, 27)];
_points[SUBTYPE(I_RESARE, 28)] = _points[SUBTYPE(RESARE, 28)];
_points[SUBTYPE(SMCFAC, 7)] = Point(svg2img(":/POI/restaurant-11.svg",
ratio), Small);