From 7cfd62ca970b29185247cf52690f36bc85613c85 Mon Sep 17 00:00:00 2001 From: mtriau <283571717@qq.com> Date: Sun, 26 Jan 2025 06:03:59 +0000 Subject: [PATCH 01/11] Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 99.7% (487 of 488 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/ --- lang/gpxsee_zh_CN.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/gpxsee_zh_CN.ts b/lang/gpxsee_zh_CN.ts index 8e54b269..d3969f7c 100644 --- a/lang/gpxsee_zh_CN.ts +++ b/lang/gpxsee_zh_CN.ts @@ -486,17 +486,17 @@ All - + 全部 Raster only - + 仅栅格 Vector only - + 仅矢量 @@ -733,7 +733,7 @@ Layers - + 图层 @@ -1692,7 +1692,7 @@ Detect pauses - + 检测暂停 @@ -1796,7 +1796,7 @@ Detection: - + 检测： From f67c26229220e879cdebfe5590fa1dcb7551f69e Mon Sep 17 00:00:00 2001 From: mtriau <283571717@qq.com> Date: Sun, 26 Jan 2025 06:19:55 +0000 Subject: [PATCH 02/11] Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (488 of 488 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/ --- lang/gpxsee_zh_CN.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lang/gpxsee_zh_CN.ts b/lang/gpxsee_zh_CN.ts index d3969f7c..880de478 100644 --- a/lang/gpxsee_zh_CN.ts +++ b/lang/gpxsee_zh_CN.ts @@ -486,17 +486,17 @@ All - 全部 + 所有图层 Raster only - 仅栅格 + 仅栅格层 Vector only - 仅矢量 + 仅矢量层 @@ -1796,7 +1796,7 @@ Detection: - 检测： + 检测模式： @@ -1821,7 +1821,7 @@ Pause detection - 暂停检测 + 检测暂停 @@ -1870,7 +1870,7 @@ Opacity: - 透明度： + 不透明度： @@ -1922,7 +1922,7 @@ Lightening: - + 明亮度： From 398ef2c4f5b74badbc04b064c1e0a70f8da35400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Tue, 11 Feb 2025 09:13:09 +0100 Subject: [PATCH 03/11] Code cleanup --- src/map/IMG/rastertile.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/map/IMG/rastertile.cpp b/src/map/IMG/rastertile.cpp index 515065fd..82664113 100644 --- a/src/map/IMG/rastertile.cpp +++ b/src/map/IMG/rastertile.cpp @@ -256,7 +256,7 @@ void RasterTile::drawSectorLights(QPainter *painter, QRect rect(lightRect(pos, start.range ? start.range : 6)); - painter->setPen(QPen(Qt::black, 6, Qt::SolidLine, + painter->setPen(QPen(Qt::black, 6, Qt::SolidLine, Qt::FlatCap)); painter->drawArc(rect, a1 * 16, as * 16); painter->setPen(QPen(Style::color(start.color), 4, @@ -274,15 +274,13 @@ void RasterTile::drawSectorLights(QPainter *painter, } } } else { - if (p->lights.color && p->lights.range) { - QRect rect(lightRect(pos, p->lights.range)); + QRect rect(lightRect(pos, p->lights.range)); - painter->setPen(QPen(Qt::black, 6, Qt::SolidLine, Qt::FlatCap)); - painter->drawArc(rect, 0, 360 * 16); - painter->setPen(QPen(Style::color(p->lights.color), 4, - Qt::SolidLine, Qt::FlatCap)); - painter->drawArc(rect, 0, 360 * 16); - } + painter->setPen(QPen(Qt::black, 6, Qt::SolidLine, Qt::FlatCap)); + painter->drawArc(rect, 0, 360 * 16); + painter->setPen(QPen(Style::color(p->lights.color), 4, + Qt::SolidLine, Qt::FlatCap)); + painter->drawArc(rect, 0, 360 * 16); } } } From 59be4aaf1a60e5347fa5d008f17b074c4bad1a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 12 Feb 2025 01:55:02 +0100 Subject: [PATCH 04/11] Unify the lights display logic between ENC ad IMG --- src/map/ENC/rastertile.cpp | 2 +- src/map/IMG/lights.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/map/ENC/rastertile.cpp b/src/map/ENC/rastertile.cpp index 91bccd5f..1f4b9a25 100644 --- a/src/map/ENC/rastertile.cpp +++ b/src/map/ENC/rastertile.cpp @@ -277,7 +277,7 @@ void RasterTile::processPoints(QList &points, double range = attr.value(VALNMR).toDouble(); if (attr.contains(SECTR1) - || (range >= 6 && !(point.type() & 0xFFFF))) { + || (range > 6 && !(point.type() & 0xFFFF))) { sectorLights.append(SectorLight(point.pos(), color, attr.value(LITVIS).toUInt(), range, attr.value(SECTR1).toDouble(), attr.value(SECTR2).toDouble())); diff --git a/src/map/IMG/lights.h b/src/map/IMG/lights.h index c722f73e..c1265801 100644 --- a/src/map/IMG/lights.h +++ b/src/map/IMG/lights.h @@ -23,7 +23,8 @@ public: }; Lights() : color(None), range(0) {} - bool isSectorLight() const {return ((color && range) || !sectors.isEmpty());} + bool isSectorLight() const + {return ((color && range > 6) || !sectors.isEmpty());} Color color; quint32 range; From c4e44c87967f1ce91cb20c979ae6c7b74189b6e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 12 Feb 2025 09:04:46 +0100 Subject: [PATCH 05/11] Alwas show the area pictograms --- src/map/ENC/mapdata.cpp | 6 +++--- src/map/ENC/mapdata.h | 5 ++++- src/map/ENC/rastertile.cpp | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/map/ENC/mapdata.cpp b/src/map/ENC/mapdata.cpp index 41c594e2..d68c866e 100644 --- a/src/map/ENC/mapdata.cpp +++ b/src/map/ENC/mapdata.cpp @@ -185,7 +185,7 @@ static bool polygonPointCb(const MapData::Poly *polygon, void *context) || type == SUBTYPE(I_ACHARE, 3) || type == SUBTYPE(I_ACHARE, 9) || type == SUBTYPE(I_BERTHS, 6)) points->append(MapData::Point(baseType, polygon->bounds().center(), - polygon->attributes(), polygon->HUNI())); + polygon->attributes(), polygon->HUNI(), true)); return true; } @@ -286,13 +286,13 @@ static QString weed(uint type) } MapData::Point::Point(uint type, const Coordinates &c, const QString &label) - : _type(SUBTYPE(type, 0)), _pos(c), _label(label) + : _type(SUBTYPE(type, 0)), _pos(c), _label(label), _polygon(false) { _id = ((quint64)order(_type))<<32 | (uint)qHash(c); } MapData::Point::Point(uint type, const Coordinates &c, const Attributes &attr, - uint HUNI) : _pos(c), _attr(attr) + uint HUNI, bool polygon) : _pos(c), _attr(attr), _polygon(polygon) { uint subtype = 0; diff --git a/src/map/ENC/mapdata.h b/src/map/ENC/mapdata.h index 92e1b137..74de79bb 100644 --- a/src/map/ENC/mapdata.h +++ b/src/map/ENC/mapdata.h @@ -49,13 +49,15 @@ public: class Point { public: - Point(uint type, const Coordinates &c, const Attributes &attr, uint HUNI); + Point(uint type, const Coordinates &c, const Attributes &attr, + uint HUNI, bool polygon = false); Point(uint type, const Coordinates &s, const QString &label); const Coordinates &pos() const {return _pos;} uint type() const {return _type;} const QString &label() const {return _label;} const Attributes &attributes() const {return _attr;} + bool polygon() const {return _polygon;} bool operator<(const Point &other) const {return _id < other._id;} @@ -66,6 +68,7 @@ public: QString _label; quint64 _id; Attributes _attr; + bool _polygon; }; MapData(const QString &path); diff --git a/src/map/ENC/rastertile.cpp b/src/map/ENC/rastertile.cpp index 1f4b9a25..c0e57efb 100644 --- a/src/map/ENC/rastertile.cpp +++ b/src/map/ENC/rastertile.cpp @@ -313,7 +313,7 @@ void RasterTile::processPoints(QList &points, TextPointItem *item = new TextPointItem(pos + offset, label, fnt, img, color, hColor, 0, 2, rotate); if (item->isValid() && (slMap.contains(point.pos()) - || !item->collides(textItems))) { + || (point.polygon() && img) || !item->collides(textItems))) { textItems.append(item); if (lightsMap.contains(point.pos())) lights.append(new TextPointItem(pos + _style->lightOffset(), From d3781e7f0bdd2dba06b5220f8637b19101410853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 12 Feb 2025 19:05:47 +0100 Subject: [PATCH 06/11] Improved restricted areas rendering --- gpxsee.qrc | 2 + icons/map/marine/dw-route-line.png | Bin 259 -> 4365 bytes icons/map/marine/nature-reserve-line.png | Bin 0 -> 4377 bytes icons/map/marine/sanctuary-line.png | Bin 0 -> 127 bytes src/map/ENC/mapdata.cpp | 52 +++++++++--- src/map/ENC/style.cpp | 96 ++++++++++++++++++++--- 6 files changed, 126 insertions(+), 24 deletions(-) create mode 100644 icons/map/marine/nature-reserve-line.png create mode 100644 icons/map/marine/sanctuary-line.png diff --git a/gpxsee.qrc b/gpxsee.qrc index 8eca235c..1708da6f 100644 --- a/gpxsee.qrc +++ b/gpxsee.qrc @@ -214,6 +214,8 @@ icons/map/marine/24h-anchorage.png icons/map/marine/dw-anchorage.png icons/map/marine/tanker-anchorage.png + icons/map/marine/nature-reserve-line.png + icons/map/marine/sanctuary-line.png diff --git a/icons/map/marine/dw-route-line.png b/icons/map/marine/dw-route-line.png index 2bdf923290a2006753be4b56f17f385be29f7231..8c6201c889bb41c2c5da090581a9514f5b9ddbdf 100644 GIT binary patch literal 4365 zcmeHKYj6|S6<*l}JHkK%A)&!Ei;@&mvf78VmbCSPu_R*!WHi_~#*+-}Ve50voe#A%YrqZGGwGGR(OZe0Ttl9^;C6cQet4so0g2}zpPX&N9T(6cM~ z)n=ySndYCRxxQ!b{mysK{qDKP+Ky1w>e<%Ytr&*Q4pjQqLthLnzhEZ(ZOxn84c$pp z7YGLeKfns$0g#qF%mS8yvt;djuyZWAST6JrLz@S-fic?cmKkQh6YND<`*E;~vzQ#P zX-f_^8~Pq-4A{3oe+ZiLNM@}8u#HcF`K<@bU>@yP2ZAA-vD1{@;Rb(-VL6K7Xa=Wg zj&^e_1!&9D;}IE5*EiIk0hV^f>kS3GUOcX;VI_hvEZy^y-F)TovZ7Zvo!;_%P0=U# z@UCaL^L~F((}K>>lDDnD<__Hd<&0oqp!2b3hw9`1kY4&|X!uvX?Y(%xwzgMhRdw3e z58wD{`C|*`c3&I$^uqg}F2RmDc@38?S$Gz3A&Le-g{e?y6#rAMQBY@e5b9{huqg?%W{nz0#BZ%X72lt<)YE zxzd$5k9IVic=P_|Zg<5!`}*rHiM2F4ylnWDLzf;W|H{{T)U9W>B+m>i-7XwHNRnHh zyjXCmZqRnuqoL611?;)XlZW<*OV(UlcE^nuKi>cP^SgSj72Pe7vi48DJbGg&b);6& zj;-l@q3!3ly>@lsjAQ*}z3;i-eXaX6XL<0g!MztoROgPLtvj`7F|jSLFp_)Q*~P*0 zx%O1sGfTZC=sxSITkgGk=M3FAw>1ZUD;L^O! zHR^htBgs@M zWluTms@6c#9*>8l7?NQKKoE(Rm@cG=SmI8DBE#WB2}x7px}wH#gHsUIq|V!HFprPM z7mWvlWAw2^Rt3<5Obc<6wo_y@N>21h=>BFP$p-X|9*LTkI3m}hgqqYO-jgA$FKULf`)q^^X=#hMhGF=K9LVj$o? z#ybf;x_1){s9=!usZ!DiFW}>C#`>JBN{Y;xrpM!wN?b0H5S^Y9!s&6j2*H8EgecK2 zT9TctES5~53d9n+5R;HW1>|-Gcv!(9(oRt%XpbNePRY#@qAUUr3e$p{rd=*7Jb_}J zra)E-k%>_mR5DP7B?{5VHs#c?_5#BadbjPNHaGhj97kq+_ zfOM=3*Nm3okEl+-B18W2>EY`Tt)E8ma`4#|n!GI9}O3F{!7tcN8$0_!G9 zM2CP}lq}FLVKRF{4eKdEL#rATMJ!3c^WXy!i!BeNSO zjhZpK<5Kd!G$}O!6N(J@WyYX*K`kW5ieXkWqwIW(pX^zDiz@*2^deKzcUrD#xu&GR zl)%&3H7(ba6qpitI=lXFa#_b;r%()j1*PC+Y35Vj7`$lB6xXcwVHEZ>wrJM&{Ye

IaOBkYXCIaM%5~J*OV5^VegQl1UU_F8w)x`CgE>R@_!~do zCk<>raiVL_tvv@eF8KVjyZgjYdhlRq9k#Sxf8dAizm-_2-{v^HxpT0~;en`Dn|zyp z@}2AFZeH$qx9f|OUBN$Jw)S;x`f8w>eCWXE(z*JNdeW9%6`MxhNj5I^AG%DveDCg| e&F>cs&gH)s`0-~ierFMcjRpKwzTcE@e(>K7ecccM literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^GC<7E!3HFyWpvK~DYhhUcNZWH1V5d3*8?fe0*}aI zppNSx%;=;sy8jwxjg2lZLWI za@bq{$=BzbX`E~j*3*e*2)HC?!R&r|*|dDqw|C}5?ED%b&EusdTJtj~JVHWFLi-7) zjMSB#w=Cao6OpKP^jx@`vzwZFB82@K>f&~CFRR)vmUGEF27gv&Le*7%K&?? y)4jrc=MMaM@3H>e!DE|5>)kw$ZenHc_im8a6?U1ms$A?l$SzrO)rfe*SohAs5E3{AVD@jkA@BetLM zdx;&kK_Fr!DP;XhLkpc+m3A9hM+r={3S|^TLER=ORE0 z5uU#v%Yz57v{*3vq3g&jB$@;hBlvYZzVnG!1|LmallFf$IP}}z_Fg=1W80f|)O0%P zhHgDw_Qc#-T_e}8Ui|CT`M9g8`al_9axUiFRnu|fSm)f0TiX`fKdlHxo}-uYKN#-X z_Y>>zhMvJkZvNwD(KqYf7fVX+t6`2G>^R@?D^INbpUc*7UnzGF?@s?^&mFUuCs$t| z-k}Yk&5iH=>9LkBZ{-8e^*3A+SJCXylA$;EUV4`N#J|d?uK#dd^M^+kZ4wUtnk3i1 z`1icC4M*+wZL6)Vx{JLKJhS&1alwj_CHLNX<8sfbSD);)Rd%&TOWLn|{m!ky)S*>M z^4N;b*V=x0_sJV`XB_J<>HXOI(aElJoMp@Dqum#;tFFz@KXi89d}5-=VLT)!f@w)ZG1+rLb`Geg^Hkakzh9 z|DjE%4~~pjzT}g7z3*Rppaj!OxIu3SRdbRWa|p63B1bxwFwP4rUY01HBEjq5_1h-(WChzv#mX;M;2=!zQ04NO5)n{~h44(s@6 ze6d6*GzK5nvMc}}WLij&w1XmJF><1ZrdPB8NH(Bv_0Ynt2}IT*O>Is}sGBtg^q9_KY8th6>+S0giV;%+tjY=$GdI8y!EOjL^PS&K@j1@DTiGhIo z815wN(cDdAunL8^fGRZ`;qd{#-PoU#RY{RKQ;e`qkKhyp!Yd<|a7m0r_(Td39!5k+ zVB9nx&RV#6`JSMi#wpb^^ph zNd>A>h)#^kfRX{q=V86zt zh{!~|(OfVH=SpjNznyVVoZT8$Eadn zB^);|1t& zh%zN3XT;<4$)3sRni|nlLK2lW0*}BIl&AR*3SVp<)RM{8skO*B1t5%|7=mX0lQ1%y zFlqFR(Tt19|Kgt2z%QeN<^{cw9BYPI&WyJ69e%QB@g42}(9@etiQj3urs{B;V&;a5-!UY1_6?h3(+)@|a7ssMHwM>KdlJ8uk2+2UPkP|no(P{qtkIr+8%?!aNkJWw6t1Epc_A5T2vFFcOtZ!P%j zY<%V49{A#WN36Mv*8KVX25n3JTh^Xab-mKb_g0q$?%eUh)}PLvy}Ym0J!{R$;5&KY z;K-cqpR~_k=nC{~xv>Ae^BosX-~ZKt94zMd7vAYB*#F8JYt-LnJOIn?xx5o!{tDp!iTz+0pfg)QKYwj1m@S8MrR9 Vep;RKc@0o0gQu&X%Q~loCIG-XAnpJF literal 0 HcmV?d00001 diff --git a/src/map/ENC/mapdata.cpp b/src/map/ENC/mapdata.cpp index d68c866e..fd17d1d6 100644 --- a/src/map/ENC/mapdata.cpp +++ b/src/map/ENC/mapdata.cpp @@ -285,6 +285,24 @@ static QString weed(uint type) } } +static uint restrictionCategory(uint type, const MapData::Attributes &attr) +{ + uint catrea = attr.value(CATREA).toUInt(); + + if (!catrea) { + uint restrn = attr.value( + (type == RESARE) ? RESTRN : I_RESTRN).toUInt(); + + if (restrn == 1) + return 2; + else if (restrn == 7) + return 17; + else + return 0; + } else + return catrea; +} + MapData::Point::Point(uint type, const Coordinates &c, const QString &label) : _type(SUBTYPE(type, 0)), _pos(c), _label(label), _polygon(false) { @@ -328,10 +346,18 @@ MapData::Point::Point(uint type, const Coordinates &c, const Attributes &attr, subtype = CATLIT; else if (type == I_DISMAR) subtype = CATDIS; + else if (type == I_BERTHS) + subtype = I_CATBRT; + else if (type == ACHARE) + subtype = CATACH; + else if (type == I_ACHARE) + subtype = I_CATACH; QList list(_attr.value(subtype).split(',')); std::sort(list.begin(), list.end()); - _type = SUBTYPE(type, list.first().toUInt()); + _type = (type == RESARE || type == I_RESARE) + ? SUBTYPE(type, restrictionCategory(type, _attr)) + : SUBTYPE(type, list.first().toUInt()); _id = ((quint64)order(_type))<<32 | (uint)qHash(c); _label = QString::fromLatin1(_attr.value(OBJNAM)); @@ -377,9 +403,7 @@ MapData::Poly::Poly(uint type, const Polygon &path, const Attributes &attr, { uint subtype = 0; - if (type == RESARE || type == I_RESARE) - subtype = CATREA; - else if (type == ACHARE) + if (type == ACHARE) subtype = CATACH; else if (type == I_ACHARE) subtype = I_CATACH; @@ -389,17 +413,19 @@ MapData::Poly::Poly(uint type, const Polygon &path, const Attributes &attr, subtype = CATMFA; else if (type == I_BERTHS) subtype = I_CATBRT; - else if (type == RESARE || type == I_RESARE) { - uint restr = _attr.value((type == RESARE) ? RESTRN : I_RESTRN).toUInt(); - if (restr == 1) - subtype = 2; - else if (restr == 7) - subtype = 17; + + switch (type) { + case DEPARE: + _type = SUBTYPE(type, depthLevel(_attr.value(DRVAL1).toDouble())); + break; + case RESARE: + case I_RESARE: + _type = SUBTYPE(type, restrictionCategory(type, attr)); + break; + default: + _type = SUBTYPE(type, _attr.value(subtype).toUInt()); } - _type = (type == DEPARE) - ? SUBTYPE(DEPARE, depthLevel(_attr.value(DRVAL1).toDouble())) - : SUBTYPE(type, _attr.value(subtype).toUInt()); } MapData::Line::Line(uint type, const QVector &path, diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index f39631c3..7d2621cb 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -70,17 +70,24 @@ void Style::polygonStyle() _polygons[TYPE(DRGARE)] = Polygon(QBrush(QColor(0xa0, 0xa0, 0xff), Qt::Dense4Pattern)); _polygons[TYPE(UNSARE)] = Polygon(QBrush(QColor(0x99, 0x99, 0x99))); + _polygons[SUBTYPE(RESARE, 1)] = Polygon(QImage(":/marine/safety-zone-line.png")); + _polygons[SUBTYPE(RESARE, 2)] = Polygon(QImage(":/marine/noanchor-line.png")); + _polygons[SUBTYPE(RESARE, 4)] = Polygon(QImage(":/marine/nature-reserve-line.png")); + _polygons[SUBTYPE(RESARE, 5)] = Polygon(QImage(":/marine/sanctuary-line.png")); + _polygons[SUBTYPE(RESARE, 6)] = Polygon(QImage(":/marine/sanctuary-line.png")); + _polygons[SUBTYPE(RESARE, 7)] = Polygon(QImage(":/marine/sanctuary-line.png")); _polygons[SUBTYPE(RESARE, 9)] = Polygon(QBrush(QColor(0xff, 0x00, 0x00), Qt::BDiagPattern)); - _polygons[SUBTYPE(RESARE, 2)] = Polygon(QImage(":/marine/noanchor-line.png")); - _polygons[SUBTYPE(I_RESARE, 2)] = Polygon(QImage(":/marine/noanchor-line.png")); - _polygons[SUBTYPE(RESARE, 17)] = Polygon( - QImage(":/marine/entry-prohibited-line.png")); - _polygons[SUBTYPE(I_RESARE, 17)] = Polygon( - QImage(":/marine/entry-prohibited-line.png")); _polygons[SUBTYPE(RESARE, 12)] = Polygon(QImage(":/marine/safety-zone-line.png")); - _polygons[SUBTYPE(I_RESARE, 12)] = Polygon(QImage(":/marine/safety-zone-line.png")); - _polygons[SUBTYPE(RESARE, 1)] = Polygon(QImage(":/marine/safety-zone-line.png")); + _polygons[SUBTYPE(RESARE, 17)] = Polygon(QImage(":/marine/entry-prohibited-line.png")); + _polygons[SUBTYPE(RESARE, 22)] = Polygon(QImage(":/marine/sanctuary-line.png")); + _polygons[SUBTYPE(RESARE, 23)] = Polygon(QImage(":/marine/nature-reserve-line.png")); + _polygons[SUBTYPE(I_RESARE, 1)] = _polygons[SUBTYPE(RESARE, 1)]; + _polygons[SUBTYPE(I_RESARE, 2)] = _polygons[SUBTYPE(RESARE, 2)]; + _polygons[SUBTYPE(I_RESARE, 4)] = _polygons[SUBTYPE(RESARE, 4)]; + _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(ACHARE, 1)] = Polygon(QImage(":/marine/anchor-line.png")); _polygons[SUBTYPE(ACHARE, 2)] = _polygons[SUBTYPE(ACHARE, 1)]; _polygons[SUBTYPE(ACHARE, 3)] = _polygons[SUBTYPE(ACHARE, 1)]; @@ -162,9 +169,14 @@ void Style::polygonStyle() << SUBTYPE(I_ACHARE, 2) << SUBTYPE(I_ACHARE, 3) << SUBTYPE(I_ACHARE, 4) << SUBTYPE(I_ACHARE, 5) << SUBTYPE(I_ACHARE, 6) << SUBTYPE(I_ACHARE, 7) << SUBTYPE(I_ACHARE, 8) << SUBTYPE(I_ACHARE, 9) << SUBTYPE(I_ACHARE, 10) - << SUBTYPE(I_ACHARE, 11) << SUBTYPE(I_ACHARE, 12) << SUBTYPE(RESARE, 9) - << SUBTYPE(RESARE, 2) << SUBTYPE(I_RESARE, 2) << SUBTYPE(RESARE, 17) - << SUBTYPE(I_RESARE, 17) << SUBTYPE(RESARE, 12) << SUBTYPE(I_RESARE, 12) + << SUBTYPE(I_ACHARE, 11) << SUBTYPE(I_ACHARE, 12) << SUBTYPE(RESARE, 1) + << SUBTYPE(I_RESARE, 1) << SUBTYPE(RESARE, 2) << SUBTYPE(I_RESARE, 2) + << SUBTYPE(RESARE, 4) << SUBTYPE(I_RESARE, 4) << SUBTYPE(RESARE, 5) + << SUBTYPE(I_RESARE, 5) << SUBTYPE(RESARE, 6) << SUBTYPE(I_RESARE, 6) + << SUBTYPE(RESARE, 7) << SUBTYPE(I_RESARE, 7) << SUBTYPE(RESARE, 9) + << SUBTYPE(I_RESARE, 9) << SUBTYPE(RESARE, 12) << SUBTYPE(I_RESARE, 12) + << SUBTYPE(RESARE, 17) << SUBTYPE(I_RESARE, 17) << SUBTYPE(RESARE, 22) + << SUBTYPE(I_RESARE, 22) << SUBTYPE(RESARE, 23) << SUBTYPE(I_RESARE, 23) << SUBTYPE(RESARE, 1) << TYPE(CBLARE) << TYPE(PIPARE) << TYPE(PRCARE) << TYPE(I_TRNBSN) << SUBTYPE(MARKUL, 3) << TYPE(CONZNE); } @@ -382,6 +394,8 @@ void Style::pointStyle(qreal ratio) _points[SUBTYPE(I_BERTHS, 6)] = Point(QImage(":/marine/fleeting-area.png"), Small); + _points[SUBTYPE(I_BERTHS, 6)].setTextColor(QColor(0xeb, 0x49, 0xeb)); + _points[SUBTYPE(I_BERTHS, 6)].setHaloColor(QColor()); _points[SUBTYPE(ACHARE, 2)] = Point(QImage(":/marine/dw-anchorage.png"), Small); _points[SUBTYPE(ACHARE, 3)] = Point(QImage(":/marine/tanker-anchorage.png"), @@ -391,6 +405,66 @@ 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, 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); From ca17ec9e5faee90acd9c8b3f09843d26b7e088eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 12 Feb 2025 19:13:32 +0100 Subject: [PATCH 07/11] Fixed color artefacts --- icons/map/marine/dw-route-line.png | Bin 4365 -> 4514 bytes icons/map/marine/nature-reserve-line.png | Bin 4377 -> 4542 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/map/marine/dw-route-line.png b/icons/map/marine/dw-route-line.png index 8c6201c889bb41c2c5da090581a9514f5b9ddbdf..c2a4ed0bf037d89fc18aa81ce5179a0dbe4f1f26 100644 GIT binary patch delta 692 zcmeBGTBJOonUQ&7i=oF41_lOpAcoQIp1uJJMtX(@dd3zE3`Pb=)jpf6gc_FJPE(sIQv5U2@Cz4XB9CIrjx##Rev>YJkd6P&@!_l9vCV(Z z|FvYh(sZ<;!DCKBTc&Wnz;W~3=FfJ8EmKpc{+Ls7X$iNGeNpVkAHBsVQybIW&g7)c zvvAUxwkzUgQka?PBgscAR=u2}|HLNDGQaTJs?uxw)aw&>ET~_vQ#|*XL{P*LA(f7R z0C(2V8yy!{O-@pD{_QFMf5q$RCzeiF&E(d{dS!uQ+205CA9hEtwy=Gw+B(_cefQ&< z9_EFy3$7N-d7pedb1uWd^aoz=e`Nb6e4G5m&AnTWvHA9aqowY_-x^NKCOkPg!T09W zCX?1A!3z7u`KOo?E{-7`)qv*k@aP8rS2t`-hP#KS`A_dEz0;ePl?5upRYq)KmB05{WV5x5u6GPGlr=+#> SPoD)^#Ng@b=d#Wzp$PyoR14|= delta 721 zcmV;?0xtccBaI@Eg8>4OgfU230000100015000010000-Nlj27GA=PNE;Bd)05UK# zH99adIx#XJF)=zZI65^j00962paTE_00001000000002~Ra(}O{U9FGYNb>h>>%Qh zp*q<`MI37ticlfc3avVrT>1q~43j$nEPrcEvqDKg(`_@GPKo)#iWq){fG8s9MM!3r zF)K+K_>Ql81o(QF;936X{v7>k(PBVABu+BJw29Y=r#Eeb^FDEmRb-X;oOs-%3lcwa zUGeyhbJ=BqXU5E2c8)kkES9@i>0(wfHR37axT@)tFXTN|Id5^+YIWAWCx2nIsDCdn zah>J}(pbPEB#2N@M-?^LNYJX2Vj)ZWDIfo^>zBx-kgEztj(KcAgY5dj|KNAGR%vp= zONyp|o)^dY7zM(+K&#<6-^Y&AIst;uz?I(dZ#03KPtqG5Eq(+HYy%h99ZlH-E_Z;T zCqp)6R|?V;N+sa^jJ~M=4Bi5fRV%Nz_C8J@fE;y|xd9Fifw3}Wulc;Yue-N@&$Rpd z0rg38bW=I}qyPX7c(afKiUK4xVKZVeG-6^cF*#vjEi_{|H7#OfVmB>eWo9v9I59Cd zH!xIJ1}r6all32w(^V2A@N2 zlk*TWe+m*Za6PEE00021Nkl7zhkrU01XLW%?cVCE6P0^lq~XzP|^zJJEXjguCfm{}F{@+GfgPo>zOsx!ztPG753@xn; zEUiq985kKD7cc`!1~3Lv43a^=KTZ6rAQ!w;Nz~E0!y;vcUs<4L-&QWy6#`kUVX{7Y zf1A{JCtEY>)UWp0TqV@7>~@;kRFUGJp@v_$7!!FETXvk$N%os`>4R+ica9HV^^R@+ zbN;U-+m)uH4GkW16529_^97EZ=Qe+~D{PsXI`zk#ic3qlh3t!BKmO<~KAGB>?sg_8 zZJvdb&a_<-FO$N|Odm-;TCwWo6#XYQVV3!Y*H)EY+oxWixMM;6dY$6A&m@8(jtHrA z1O&LVhTiD7xN35eqVsQ0`Tr|kPd~AA!fGbBKGrJ>9LxSbsQ<7#dbNe^Q`OeV4)41k z*Yq$ij9qZGV9xvGV*V04?BB_|r08z-hr_GI^i>zv1)$HCIQTcUEZfPitm5T|Kq6pI@$ z>MK26978NlCno@bL4?BJ`Hb8RozglJ{`L1rzTla0LAIs4Uh$#k+ t8ci-YEb&bFaO<^HW8E*gp delta 739 zcmdm|JX2{xGb7W)7DJCH1_lO3AcoQIp1uJJMtX(@dd3zE3`Pb8`&RQBG^G4y(goRc&U0r3eMY{qNuW+rkni2Dh z)t6_oHKR^_w$ElKPlwC7#g5#uC$?dh`GwcAO0VrxuTR{vqF!IWaPBjXOA!Z@R5}6z z+(k`qcwAUDIZ4s`x2F964X>x4SUO=fms?+DjzjaCUkCp`DBm8IS#-#|YgxlQ@#8-w zSP$)XSpCrA{_(!cR*X&O4@|xHG2f(drvD{rS=~Aoo*ZWJ>$1K#nf1yW7OFd&rG|4| z67f=f@V95*N(P>LOcO)3*Khx3=O^DFQ#y4gBOhPmMx)gAKlkijzk7TA`7OVHGk*0f zDhamyvxI?xw_@`IrY`%eBWU|i3| zYqfcgo-{BPw|lxchFF|FI@y-*umVpj@2g9Bp-*+b2<&5FR!=y4F`~GMXD7?_6G5w! zkDrQlauMvE)mkGYWWTA>j6dPH$3cz|kKZCaPnu3`+V5?X3JNW_KHm}mfYLK!mua$-v|B>p4gd_ Syd8IglA@=ppUXO@geCy6+%16s From 1ee60b4f9641743c1ecb25ce7981168ed4639164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 12 Feb 2025 19:45:11 +0100 Subject: [PATCH 08/11] Do not show area labels when the area is not shown --- src/map/ENC/mapdata.cpp | 22 +++++++++++++++------ src/map/ENC/style.cpp | 42 ++++------------------------------------- 2 files changed, 20 insertions(+), 44 deletions(-) diff --git a/src/map/ENC/mapdata.cpp b/src/map/ENC/mapdata.cpp index fd17d1d6..ad46b72a 100644 --- a/src/map/ENC/mapdata.cpp +++ b/src/map/ENC/mapdata.cpp @@ -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)); diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index 7d2621cb..41389e3b 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -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); From 8041aa454c5b8c028f8ecffce94b0866eabcef6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 12 Feb 2025 20:01:06 +0100 Subject: [PATCH 09/11] Fixed restricted areas labels colors --- src/map/ENC/style.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index 41389e3b..bf09ac79 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -409,15 +409,15 @@ void Style::pointStyle(qreal ratio) _points[SUBTYPE(I_ACHARE, 9)] = _points[SUBTYPE(ACHARE, 9)]; _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, 2)] = _points[SUBTYPE(RESARE, 1)]; _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, 9)] = _points[TYPE(RESARE)]; - _points[SUBTYPE(RESARE, 12)] = _points[TYPE(RESARE)]; - _points[SUBTYPE(RESARE, 17)] = _points[TYPE(RESARE)]; + _points[SUBTYPE(RESARE, 9)] = _points[SUBTYPE(RESARE, 1)]; + _points[SUBTYPE(RESARE, 12)] = _points[SUBTYPE(RESARE, 1)]; + _points[SUBTYPE(RESARE, 17)] = _points[SUBTYPE(RESARE, 1)]; _points[SUBTYPE(RESARE, 22)] = _points[SUBTYPE(RESARE, 4)]; _points[SUBTYPE(RESARE, 23)] = _points[SUBTYPE(RESARE, 4)]; _points[SUBTYPE(I_RESARE, 1)] = _points[SUBTYPE(RESARE, 1)]; From 4438bc8d522e5579d476ce16600ea1c10957dc01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 12 Feb 2025 23:46:36 +0100 Subject: [PATCH 10/11] Version++ --- .appveyor.yml | 2 +- gpxsee.pro | 2 +- pkg/windows/gpxsee64.nsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index d062ec65..a9ce6291 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -version: 13.35.{build} +version: 13.36.{build} configuration: - Release diff --git a/gpxsee.pro b/gpxsee.pro index 4b279f37..29183b9e 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -3,7 +3,7 @@ unix:!macx:!android { } else { TARGET = GPXSee } -VERSION = 13.35 +VERSION = 13.36 QT += core \ diff --git a/pkg/windows/gpxsee64.nsi b/pkg/windows/gpxsee64.nsi index 38b9e872..d97fb058 100644 --- a/pkg/windows/gpxsee64.nsi +++ b/pkg/windows/gpxsee64.nsi @@ -49,7 +49,7 @@ Unicode true ; The name of the installer Name "GPXSee" ; Program version -!define VERSION "13.35" +!define VERSION "13.36" ; The file to write OutFile "GPXSee-${VERSION}_x64.exe" From 3fc8e69ebbd9486905f4140eb148f7ed91b411eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 12 Feb 2025 23:58:57 +0100 Subject: [PATCH 11/11] Removed unused metadata --- icons/map/marine/anchorage.png | Bin 4611 -> 286 bytes icons/map/marine/anchoring-prohibited.png | Bin 4619 -> 294 bytes icons/map/marine/beacon.png | Bin 4301 -> 202 bytes icons/map/marine/buoy.png | Bin 4215 -> 215 bytes icons/map/marine/chimney.png | Bin 4492 -> 393 bytes icons/map/marine/crane.png | Bin 4289 -> 190 bytes icons/map/marine/dw-route-line.png | Bin 4514 -> 189 bytes icons/map/marine/flagstaff.png | Bin 4382 -> 382 bytes icons/map/marine/fleeting-area.png | Bin 4337 -> 238 bytes icons/map/marine/fog-signal.png | Bin 4318 -> 219 bytes icons/map/marine/gauge.png | Bin 4319 -> 220 bytes icons/map/marine/light-yellow.png | Bin 4428 -> 330 bytes icons/map/marine/light.png | Bin 4500 -> 401 bytes icons/map/marine/monument.png | Bin 4385 -> 286 bytes icons/map/marine/mooring-buoy.png | Bin 4360 -> 261 bytes icons/map/marine/nature-reserve-line.png | Bin 4542 -> 217 bytes icons/map/marine/spar-buoy.png | Bin 4342 -> 243 bytes icons/map/marine/tower.png | Bin 4338 -> 239 bytes icons/map/marine/windmotor.png | Bin 4374 -> 275 bytes icons/map/marine/wreck-exposed.png | Bin 4365 -> 266 bytes 20 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/map/marine/anchorage.png b/icons/map/marine/anchorage.png index e87bb9f5501d0ccf39e2605c3622f16b2f756864..f22d5d48b0a5dd671cbe8cd266a8677547aab649 100644 GIT binary patch delta 47 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 AlmGw# literal 4301 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 Kvb(Zg-2QJMsv~m% diff --git a/icons/map/marine/crane.png b/icons/map/marine/crane.png index 37c6fb71cea88686d26b0a0c8fffd8f4049d6b4a..b59a9a331d959fae0cc14e8c029536a3c374c142 100644 GIT binary patch delta 47 zcmX@8xQ}syiV9njx4R320mA|YY3};zr3?%VoCO|{#S9F**Fl)kNn>`!WN(2o04E0w AZ~y=R literal 4289 zcmeHKdu&rx81Eizvxws<%EMeP&kb+yW4B#nZ|gE-DS{^gLY?D27J${jut}qIjZ#dJf2)r7QBFF zO1dcpBwa5hA>RpdYD$_Z4f-Z%<3ZMS^fo1Bl+ibXJT)P=fIKguqubCasirZ|?}WyH zJQ4am(Bw_=wT^(SKUv1-SCBHH_4ms>-cpRQ(3B<54)zqoa+HmuDU4<~*2?9vuzt!b z10Lx}nLYb%fPam$%T?-exv)@J@yUK^~JsY1su=kF=8?ax~x-Xu8^#^?RW7{UK zJ{tSDHv7uDE62}7*MGj7I?=mh6nn)t%s(I(X#Ek8=H?8;g5Nkd!sYx-uPbSjPX)YRrCFlu zJLbAoZEr%~(yL`6u$c+cP zde3EV|33V7@Z6zYkb^O~qEf5$F6TrgVBsZ2K$ch_qzBAYuqYPd#kEMo1XLvlo%oe^ z-@`Fka^kD3UdkJCp=!CfA&kl!N-D&LwW3497cDdw#5e#5AdSaj0e?{CVouz^^HU}i6ru)0H~_4Dm`RL{lq0LbPB5EK*+EHvWIADvTuN_A-?G|#&!lf0_I8FA=>?W zH*d^v7}4GHxShDZJ|`)nEOCY?h%CeKc9xLrcA8+3k0JOxDxYxpM8PN0`T34K zb`X>&sA_yrL^>3JTV%ko3$$Qo^F@Le>;l2kj6m2a+DfpZz*q&VC?Xp*2x3K8hOFfM zgT2zBB!F@Vv?NjzPgn)fL9h6(U2y zDq}(?oLf@rapH_6zN#@&>gP2d7&!6eaxfAbP_2*ys9fW9HtBpC{I=!gv3g~++Xj^G zM`0B*QO7iDr!k|4g@erivAmwA0AP&6UN~16@tP8@P!zutPgdRJv=@$(#B02p*ARdv z>u^PX9iC4y9F-)E^D2_;tN%A`{qSG~@sJnGDy&~`48>1WIjW7n#b5ohag;F3I20T& z#pP&q@jqt!@{0uV+}HiD-9N*I~gFsav!{v8*P zf8(UUP#9EXz%D)p#S3a7nJk70&h)bLKR$_A{EsUD^vEK^;&+6u5xR!Oz_64@vTKB{ zVKFc)<&o_A&*(A_T&GYF{sl$hveegC^$lFKGKBkqdMsjwfv)Y4&opUQH1kKMZU)`G~UaYd~y z(?8wch~<#fjA(Rpy6Ig09N#3%;p2By7tZNfot0Oz=OMcL)ek4kJeX?=ezs-viOzl6 r&rQ3tdz;69c{*~T&p-FeuIKOJ9-h76$4j0D-8WBBiFXQuwivTKN1wH@( literal 4514 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 A00000 literal 4337 zcmeHKeQXnD7;m?+LFG$6L}0|TVjST0?%M0uWu35gqm2~iHeg^BuXk^^gSOY*UDs|2 zim;%_L^0rG5D|ikh7Sp76vA`@@q=$LSu_lA5+N`^;uQPU)4nT8W=)+^( zNJXMXe3uLH)eCNSiO=oEqLLUCLP)1eY*@V7@}|92V@6kh zHF?yg!mXp{$H4?f*EYW~5* zXVt^5FTQ@bExzQ$R`TfOrU7)D?erJ*uN~d~!lt>M*bI5_<|7YtGhZqFVZwr&1An+} zI=1`wD|d1iFFYHVI(6dfXt^*_96n3@Ci~*z_Pi-yOupf~@u6?b#HTOpZND-8;^xB{ z#~Yf~b>>&Esd%{Ny;CjQ_=N|{4pOsEPg?MK-8SiL`?lE&x5Z}N`PBR5f_dLF+u4b` zo`29geA64t&6D4|`|T$lI#k$nY-GWm`&)_CkKR9bY(wr{TML(U{Mz!z`M9|K(+l;D zqkOtHV%3jSMt#k*!M5t=mnOVjn~}Bg*(v+4?zAmgH|x}uFkX|@DQ1po4g0^&G{u*+ zJmj{axrS3C3v7! zlqw0z>2wmLnJ}Ai(7@%|h{7iDi2Q&Gk;L#InUjR5B8U-8#bg6wOmP{FFpqV`7moV< zY50hoVgdLd5^R*9Oe7Hw6Fn_trKko#QUU#=g}w5wgSMwBa;Q(>Tr1BpzU?0FEq9mgB8f))wG; zK=~rF!bUixLIJo*036z3H(PnuiCY7-1E-y42kvkNc${=NX^JO#2OF^VfS4r-kd0ni(<~z6$3Tc_CQ)Z`$hN!SX>Lw%jYo;J;QIN}i}PRGoZFzJ>(tC}Eg( zC>WMYE?f(Dsfgq(<*^S;0n@H`-Q^tw2hk7JC=AAQg;Ce!$})Xk$)wONG+I9 zYev_K^NGK4lCLTBC^BG|9E0KowU9^`!xU!_@BjIv_Tv9^fnohl`owQPUHx?RiGe;T z_h(l>U43GpPs;t-^`FsY=)O*&2>c6*!)58Xt3!f|R(9ag=^pLMrTfLb?-`H=MZNQ6 zxSh4CO<$O|J^_O{iqBt^b1BwN6z zoYwndkKfZ+Skky9@12nwGMBx0jh&Z0?y1d|lP8yXLo4=tcChWaXD-edbZqU4_h+x% zlCz|4xVd82&3X5&uRrVxWgY3bhbkMr>Z6NC*IkMpY2C>mx=`i)O+TMH8QcBcnOA>0 x@a5{=;&7_Dc=X+k#lKJZWKZtKIUOUfEVwdfdNj1Qpg>)VuV|)cN8wXT{{+&}*k%9# diff --git a/icons/map/marine/fog-signal.png b/icons/map/marine/fog-signal.png index 83288877acef9245e80aedec62fb9740ea35d666..e038bb1c787a288a24b4baeb4fccf34d57be6da1 100644 GIT binary patch delta 47 zcmcboc$;y8iV9njx4R320mA|YY3};zr3?%VoCO|{#S9F5M?jcysy3hWWN(4V04;C~ A4*&oF literal 4318 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 B3^f1% literal 4428 zcmeHKdr(y86~Bw}$XeqwQH)Nmo5b+&?tSdt*OfIq7T8r5DWZaD2JhYnUfkWg?p|Oq z!Gc;7(J-T6lR-0MYAZ%aOk&$OCaJWQCKHp|YFlDb(P9aCPy-qJ(1h4??=G)4GaY7{ z|Ja>xzjM!b&hIf(@@ zFdv3Nfjl4P6ELJFqkH`VWc8Dzeg6egB8-ta-|ZV-cxH_bk1C7sR(y%E>8m=j5QlkSt0*0YM^%>-IZbzs_9TRlfEo#c6lnJ7??L zMb8cV$k6mNeeUtul|NX&q`)}5W7$l1b~)9)_l3J+WyTvGne zq`|)%e|zey3&Zx?f85bkU++4+X}2^_o_)dhK|+6BZ%X?4v?2S@F86{5xBvA_@6dhy z2hPV`*w=db-Hfd*rOT^cx!Bd=t2}q<9J%gNYWdr>9ig7yj&+}P)UEmYSFWt`vX7Ye zzWd{spL)nO`}reH`V%kDXTt9fnx z*2;^k8y{@wS@71ah10TM&ussT?dn@iml)lS3!MjhhPqoj2Oj?9>85*E#3lT^Vee;6 z#|CuItmqtUUV7-&^ms|%Wf z>Av#e*@_Q_hmq=Yq2n2gXFUrg7?Da!l~PXu!^wUl%gbKD81VP8=dOV}>fpClk-~*4aL7X%axZjVD_XsPw)c_I;=o>x4CAC2TFBZabRfrRE ztA&8_z<3Cr8}$!Xg?w5%JckQD!4IZk*p-~HrF!8;JyZ%RB!5uz0N~%&^D5^P=ttCtu`8??QpDKS~OuaA(DjI zBAO^(90#!`BtccOzVT71P&_~pw2k6~^!&M$sf^V>KwAWAfyX zpM~R;{A`7Q2Llz_f=W1(RpfRUC?heZDe|$32o4TIffT5Uj4hN%eqpV`s%(;0lby6u zCdy3PEEelH@AX0`43(&2YOPaqSC55(WPn&!ty2Kd^pFda6B1ZO4wcBV&tVvCx}(b; zxK2E)uufJH0CcnsmyERGbb@4vXaFjlN9HB5_J3Kcmj}%NdpL5J6o&n4HC6ORtrfOL zpQ4XGNxMoYs$B|(<)SHs*=m8;;smVd61SNRR0z;LV&yubm%gDC%qE_rY2Jc~yw`@& zw8?^btyUVdTWC%&n+TS-SSO-~Wl^bNLqb*s@CaN%d1`;4&=l>UQYTv1Y!=j00KzbW z!bsvj3BzLv<7&?s$v6Z5FHSNvgK>g;wN?%-{KAcJ+;ZC z_?@C_impj9Fe&4y>YAc!QVdMWc&fVoZ*=L$UZ;cr{1;RMFH6HKE4$!DE5W-u--+B& zzenC|YX;3-L04HA-p;z!q03G=6ai(T;`ZbweiEloOirHr8|Nuded=~*mDtX|_=l5) z+3dplq5gW4Ezd+XcICz8lN&FePHes&_eNZQ{Ku!`7aclU>Y09}U|Fiz_HhzZw|x3X zEuTC32mSK!--f?@{^t9g?TDvuIsvbvEfwW#aXd3)7!| AfB*mh diff --git a/icons/map/marine/light.png b/icons/map/marine/light.png index 8ff3dfdc35bea9b47578b7748b46eab577df8c0f..bbcf01725493fa357c1373a35e400e6133424bf1 100644 GIT binary patch delta 48 zcmbQDJdt^ViV9njx4R320mA|YY3};zr3?%VoCO|{#S9F**Fl)kNn>`!W^VycMgSx5 B3=RMQ literal 4500 zcmeHLdr(x@8QU637JAhH(FN%TI>E*IFn%ihcG zVv6xWY^+49u`yC>gal(Fh^fs>M;sJl6031Escln~GFBa8f+S|NHrk$hcX_p$=`hp$ z$K5%5zI)F1{l4$~&UZdIyRoQX;bhHBjY_4O?8vt-f&Dbtl9LkP_iwg6^9}6If>MXu z;mA-W!565hj#H_jBMpe*aiZKgV2=^LQ@NL1bq<+P}dY(uDH zRFh%93pNtUDX@PFHvZ=kUmZ}EpCsjT8%l|=4fP8h&LV`=5x7oohW0pVpl}mK;0Qrd zMgyfMp?~$Bk%(lZr?DN&V0`tw%~s^F*${s~aPw6_r3&w=+iJ}}vEbnim-be)xMp2P z`hMATxO{qQ^=BC=O*#8gm(}1O+??8In4PZMysomd^R@1`)^9p=V9J4Y$nDs^>%DJW z(>}R+N6NCU@X6|_19bzZdO~Z??!!;_H^v)!Oy@tYfAw_RFPchjB8$aI&3~B37HnH` z+Y%U*z)L`wJ~w8t(|-Ht9H|xorUMV^rFGIn?mgL3ts1+ zV|Af5opWp^P@*|EO%vaHx1l3FanfI7{$^|!+QeP+RWtgR_9vLlae14zAN~5hI zxV!v(|D~xruLR!pT{_$hb1=-iN~KcgVu}^KI+_z0pbLBb@`kCho(lVEwh~AP13bLX zsvS6TOpEZGRa;_o;!eK}l=Jzk0-$(Rfs0*L$yzw=Q}Z=hVG06xfkY!=Zy4#&Py-cfeG(l;ec}@`L?c|XLKOY zd>D6(_R!iDWvJzJQg(r@k;8M?ty^f#O&yPY8HvxShP0 z_5jT9^C&)K!l~>chgD1J@R5mRaWhA)g7L8!sEoz z5^bj?06~ZAuxqFe&&5d!kAyG7IR%b)*ZwbU`S2iFP#jasCHVfo9x#5&#@EWO63dK;tHq zF)>CInB5E@IGSS!%UE<#a7!UN0J1%hN5~aSPvtKZlBR4_`dIByIgob&5{5!(0{>6K zu;_v@xn>NlI1BqPPO=n*QAGyYMaE$9g0&DEE{0Lg}7 zy2i!8xRfWdYl5zEF)%LWiR}8n(WM!=P5~eMFDL{rOQv3{7GAUxm_-Zi%9Ts?58ILF zp>&@=zf6R;vkP)l=cN5Q3hch?vT7pJnLijJH^}^dU;jm}B%%|EuBe0h2ln)0l z9W8s|PiRWTOL=p4GVd(+O4A0_X)kuUG{37yYqYlGB}Ezb=4NDT!^-51pM3Jl7fCtm z%b(qtbgK?4$n@;~{;I`urD5K8|E%Blx_;5}vi>`1X-%mo%kKQD1shO*jx6di=iEPq znAvrAZ+3juPhRf+M!o-4O&|FD+-~Nf=Xd}8q<>q>+P$+<4|K4%y443a4yDqY?zU=6`%BIn@BXY; Q{$)kw$StrR$XU7W-_naDTL1t6 diff --git a/icons/map/marine/monument.png b/icons/map/marine/monument.png index 66a07b2654ab65753812e89bb1bd11fb6e3941b2..f30ddc231baa716cd0b1a53c55911d6ee53104af 100644 GIT binary patch delta 47 zcmZ3eG>>V5iV9njx4R320mA|YY3};zr3?%VoCO|{#S9EWb3mAJ)3yJ_lf4D50RSPq B4Wj@6 literal 4385 zcmeHKYj6}*7VgOlb_{PKBC)nW8N-lB5((%o+tYm~=`b@rneJpJ zsX}?A*i{f;aa~eTghF8v5Vgv3u@Vi7yGyYF3sijZFr`REo{FXD0(-h=GD%#kwoL7tt|(QFt)8a58v zPIy_6r$W06Ug-~swYovpp0WC8M+SyXhu%QD(Ce$jSrbE>%nq=pSqn$oIEKa(;{y>2%iiOK;fh%hYPx#|g5+27{gw*K^s4KGyZp2zzh z-@3nkT2AA8g;TfA--=2_2Ta0@J3oD|>pjyt8ZFhS&Cv-@6w7KE3b!neFF@ z{0E*%(~;Ny{nd@!RSl>7bLZwght^9|YH73sPKyO${XHkc@KWR zzwgS7FSi{|JG!xB^VQ^)CurH^o->-08NVrN(2EjhSbzZ|p7@ll^JhXV#bHJxXT@Hod>5Kg;3BSg@hJ>*6;T zPaWyLe*f|Q(-StIjlLc}y?-0zU|g!MRcn2VI6)4Xcv1EvQ#=&WHViAC6OZu1N~Gd` zR40X9#HBaiB5+A`5lgK;+81%7da0~6imF-{R|~Bx1*b^NDKQquIRFSDmB-_uU|8Ye zE<(rUK-PvS0@qd4l`f(d^2jYm5pFSAOf*> zFi+tQ(;kRjR|YMgkMqbvljfe+<07>6IZ+lQk<&%H-S2d;$U?F<&604uSH96_pPQNP_}!lLR=7gSFF|wbN=wq{S-oBp(2rfM8?oHj!m$-Z=!K zA}T>v^1-2AX;30Si8ia9wOgzt_yOL~yp42P1fH}xY<>rAHY2-3(4jCKXu0D)?DiBppZ)NQ;waNnW(s zNr5qINy0enf<>{2d`5o4F7^+a9Min(TYO2Xl41!7kcz77k174=0hO; zDpIygfm=OX&nI^pUj5)Ebg(h1*H=2`T$a&j|MlNr9Isv7yS<)y)sDkm?e~s9Kxexz zuoLZP)(MTyBX3Wd*Kw_2n_2o`=9(Aoxxd4eALfW#^LszbT85pQb` z^tz3!2%fm6Zr{~^w7mE3b?=|J(E8D#_Allbs!V_C5&L_7qs8tmUF_LA|MzSE1E449 Ae*gdg diff --git a/icons/map/marine/mooring-buoy.png b/icons/map/marine/mooring-buoy.png index 8d9c34629dc8199014ba433231e2dbc8efc229d2..c53f9a20e7a3a63c69759de192ba61c5b7a013c5 100644 GIT binary patch delta 47 zcmeBBYGs AM*si- literal 4360 zcmeHKd2ka|7*AR#HG{G6=dWPg@On&<#0M)IMk`4f(R<$;KgBwOXLv2@dW&Kla^MUaXO>_HJO+9?R&rP z_rCXg-}@%}MB((Q156`K27_UMFW*}PeFn6_>1pumP@FrU`xKS=fjzkt;bT1P+C=P$&p7K*gkT;NYyX_j=b6p2w*)^2BM2G%#OxgL?m zbYgsK7~*RXJ)T0J$Ad*>DJX`J!4O|nzu2As-lSU^kG@>FzGUQCto@m$?G+irs}GJH z)|9((_`NmcTbBo}q_eUuPtC7tYg_&PrUeUIw%oL3KK4s$``KeJoi>ktc-gRfcg8=g z9(bYt!k)vixu0$%_nukVmp<$`u)AUT-px-om0rdQl>Tc!9?wr-QuM>9SwE-$aK*B( z<&W>Lj;yad5|}h8>qXQk4wVMYkiJSgRo^~l-0ra#nTv1wGO`{%zP^a z$`zM$s+X3Huidu4ty!qtS-g{)c_4e%t~t%}k@n`9mCZFXuD+Z9;H-O2vYWZAS05jp zKd5O(iq))TQ)UJ#XBOb6XvASIpS|eHgFpb6HBwI287OnQDp6ZM)Os zK&7VrLri^-U0Kwc-LL;QDc{<+N}H8c6AYPWW}ZoNx%y05xOB()OXrX5YrS&cfip)3 zt~e>b9yz*wE#zQaEGbjV`~@s8g)N*Q1&}2kj%o*H$e9?Aa(oq1u>dL;BX0ABx8E^i zqTn`{+Wn+I>OmD^{u~(<&zWAr&#B@W!8~z-DJRYXK^UnV77vFa3LAHubzT;1ZJ01) zIz+83DN>Ehqr6%aQE%@`A@H64(Hc3V zZ%5z>6hdKuDzGZmZAtCMb$VzLl#Ai0?ge6ZL#kr%x>(&}(`NMTbPWXDJ9)dIJNB-F z0p<6zUWu>K!t;6EW^H{|ka$sGb(0KOdBnM_IHK$>oVFnc&Imyo=K`D%4A>c))ya3E z@Cy0G&LzFyZ(sN^*%Lh1_P1La(}=(|)*40;h6bPDMc4 zS%*tH>hL(y%94rjH9Ef}h{3vlLu;1@%KcmsxF(m3&3B&YD z0m3J?pm4QF(BlNI#1vn_MamIWk7T-bjEnz}3dqGE6bRUH&LP10Ihg>?kphGB3`N^q zwx9#K=+$?Mn9SW6b_uhhx zqnp;;@#D=KPoK+NJl9bd2eU>VBH-re;1^B--U)_%}1 z`mOr=mN&Rt#tGslueMyv_&HuXeD~Q;(fY5yP!2SHTy<%6-QbDKCOz|{ SOrLOQTlD2k_io9ZJ^xPzujQox diff --git a/icons/map/marine/nature-reserve-line.png b/icons/map/marine/nature-reserve-line.png index 1739896c4a76160df76c7ba2dd0511d05dfd95be..c677c355e236dd962c1bfde47dcd2bef5dfb074d 100644 GIT binary patch delta 47 zcmdm|e3Nm4iV9njx4R320mA|YY3};zr3?%VoCO|{#S9F**Fl)kNn>`!WL?3D04rDw AhyVZp literal 4542 zcmeHLe{d969p4KL2_gJ2)EQ`vT@FQ}?Cp=c&EBp#Ai2wrZF3$v2u62 z>~4|^S_!{eXedT#YDZJWX=@qcSZ#G=%1leA(puXY+lr;aP$N)B$_%77Rve7@-Mz~% z?TnLA{>$FHec%1Q@B6&(`+UFed$+f*xv73Z$!#SBK`f9PVlB{DKr1Sq3-^JSwVy!u z25y%Vviy0X7#_gVcMIVI$+h$4E!Y17{_WDE(PlXsB~8mn=qXGP*}?n16=`^B-KS38+xn#c zlht3`8`h3Ab$zMgz|Tu+k1YP`o{i;=fw7${7swCxJwAN5Iimjb{o(UJ8rn5P7JsAn z*!-pk11;xo9IWYEy6C|553am>;Yv9f8ftuYTUqZ9&n8w5+-m=Q13OycL#4}iAA5bZ z+H~-(k@9>0Ry^|8z{}76<2PgC+*3PG_VzXmcHFNoF&4ifq<4L|X6x<&JaBC=`_>cl z%hp==d~od{`&GOnS@(J>@x5@(>PMbyzocxeia(J z+jaKD$O8e z5mjrmCQ`Rxhg5J<&qVxJkH6q2buHrmG9PE+W)yGM8@5@vbz4)Lx^0UpYW}rrN~*FF z0Hm>l$ZR^5v88Op@8L=yyK34`dM3`6h`$}uC~8=k3+tE}Sr*IlfZCI6^wxoODCT6%4B=xlE%>uHgSvq=R zlB{XIxg*|oraA)CCvc}(kMG?x2CH~niWzFB>z*8o_}%p-%}{ks^27um6i^T$Dy(6i z3aOk*i3)=$fm1L>TqVmYcnXx9u^p6Au?q#@0UdDI$`H~pqftVbW2ul95&;5k7=?J1 z7gZ#L&=iREmJV5oQd7Nhp)`OJ1wNbzF#@HiA@D{}D=DN^3Y4H}A(j;wM&T3>N>ime z!%8Cvr=CVhOq-dcH{cR3RX58KKNnyoHO(pHBw#|s->7Fgvy%gDdK$Mn$Yqlif?_Zn z6x>@d%!`vo8?j|WCc2nj>GVe2ut=~OAQriK3ILuS_98_sj2y#iGmKQkKT&iihU0LY zG~}Qdaxj2Sl;O7VGW-RGm6)9SE?nHu^hD2pvvv;;Sq1hG@&?_8^?N*3?nJfXt+}V% zV@mgq5=nZ8LPBb83pVP)n&&5A<%ZPFD3iocJ@V-~uGc>%6*xu>t9)3bc!3F0Ar3-^ zlmwy_jnQy0A&8nkgwu^IT%80Sfh$N)?+c1t_!0yqZp22xi*%S z*r3FR^Muhie~Y}r2NfV2Lwx3b>EE1zyRaRq>$U1Uc5&eAnY*NhmLk@0MH z&C)d^24-YDn_d4mx=JSB7;y%E=yk*UVBhhjJ@76$SGlV`MqDOj;_{VKCl-Qcp4spf z8~y`1?KWS{s_$k&S>(v^+M-JZrDgN@4R_yC2dW-9R^1kUP3?e-X(z|N@0;Jd@AlRG z|NQ3uWq&Sx^o{b}ecPA+vEss>-B0Z=EiG*v?OL_unHBxfh3}K4CJda59xROf%oG=k zqy6v6^EN!X#u{Bbuu^6R2QT)nU$mrR?u#{NI(CG9+xvv9jhy+AU$SHP#$D^{3y45Z VLsel#od`}4a&1%W$2A>0{{;&H2EPCR diff --git a/icons/map/marine/spar-buoy.png b/icons/map/marine/spar-buoy.png index 5c15a05e0d335ba9afbb34ccb13b9c1a46bdf47d..4b6380cbb1e011b8d75fb2d848e838f0a5084e7b 100644 GIT binary patch delta 47 zcmeyS_?dBniV9njx4R320mA|YY3};zr3?%VoCO|{#S9F**Fl)kNn>`!WN(4h06Itw A4*&oF literal 4342 zcmeHKYj6}*7VbOBn^D(Pj`b6UdZI67w)o*M)xENjk|)Pr5sq z31u__;)9e=ECo>kA5a)j%YstSuwh}9Wkm|srPf*qn^IsSiY!zuS_D1aGkK|1R;u)0 zX6p7meeXHnIrqEgo|*etY4MT?wwrAjhD`_*`OBc61Z{d|20SlqY8?;VQB)lW1p@Q1 zOn3p!lyocwBvUUXDNhGEH6;y8gMJOP$sn6LX1h6MjMcY;d`nVZ2Xb~&$FyNmQn3lp zZ-mBzJO%pg(3D3KzB)lRKbh9|3P@w2_4i8x!BU*HGql~|278+2c-qM`G|o79n&w#+ z{HJUhjL1ZKuXoiFh;Oyx^OXjCK0Kd!E|7 zr*_)Z#(&J4vbkW})O(uf_b*S}z-8swpIBMn)%D83?W@+lyYu>;EAcC7J?Brqc8-|y z!1Gh?IS~J-apHy63x`j}+Kz6cKk3~thCAszerWXzpX_*ibJb;hsXl(o-*ctnXUe{v zx$OU$-}c#$ynFSlYcpEwPKgT_X1$EoC^xE;O4QFY&bIbs&p$NpqUYj!foWL}e6gqJ z;w@*l98UeTeZ%_8`HkzUbDQ5j*3}``9VkD*R36V+_VJ1i?Nm=kWnD*8$+i7Oe_D3; z8GeV5_0FSniY9H|w1%Dc_6=L_n|rWe!;u>oT$^=*disu8RX4TI7`Lrp)%owcemEUd zckKUS_488#*h%V%OHAtO=7&Nj8#|wzxwR!V{gsF2fB5xV&bIX>$G!@a&FPobv}q^8 z!GERMV{Kh?eNI$mJ2u%i=5$|sXU^F1|4#i+-dpMped7Y`rryfl47WRd@!EACesk%Y zQ%5@c?mgbyJ#qaRZFi)5&lbqRxKdGVR0o&xk{Y%PvMM5bJRCJQ49mYg9u=f|WZ)vI zQ6gUA!rpxZuE<`ZDlbR}qdrut6s^!u`HJESX+^!{k%`+E*z)5%0ECet;PG%nMCapP z!ouZ2Hisz!w^WRJFHsG7 zzHl@c9DtALNfv+)DlSAR#!ge=Fg4UdHwv2pBpJ{zTIdxmQACv?U2W1NRM?Cn#_XXG zvNT{HZPFU7<;W6+8c-Nib@0jzb7`Kq0Sl9Y8YLXHtbpucnuZb@Bx_h~=8UzRp@D$; z0PZmD{DNuoxg#F!K}utZ`Ti@6(WAs9J@pHh77Fsyi?pgySR&hTs#GASI9|yLy8R8CB~q5K`o>PieZv7v+VqipX6TrjvfGd)X9kW9i?lOt`RXXBIVKS z8l`JQ42(#5G`oH?x@?2jDHMT!K{2>27Dm|Z?we1E24E+|k~?B7|ieC3Zg_t@_M diff --git a/icons/map/marine/tower.png b/icons/map/marine/tower.png index dfee2e8bb71efb93fd5d12f4c021cf22b8c00049..757087bd907b45acb2ff349d713bbb0b60b4e40c 100644 GIT binary patch delta 47 zcmeyQ_?~fsiV9njx4R320mA|YY3};zr3?%VoCO|{#S9F**Fl)kNn>`!WN(4x065eQ A0{{R3 literal 4338 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 diff --git a/icons/map/marine/wreck-exposed.png b/icons/map/marine/wreck-exposed.png index 21704e762a2521ee69b4582502c4db21cb30af48..ce5c51c581703f0c4c8e69c5c1bc45015a8a654e 100644 GIT binary patch delta 47 zcmeBG>SCIpqQaKs?e4;0z_5Tpn!A2_DFXuoXMsm#F#`kdbr5EB(wJQ_*<0Wc02KWU ARsaA1 literal 4365 zcmeHKYj6}*7Vc!o!vG>0M3h)f8d@YtFq8Ma_%_gA5);>Vkii@?YVAcW^u?(;&d;yA-sa;kidb(%wQmd>~ z>A%d(oqPJ;bG~!#ch5aD_cxX0rBicm&%rQkYM{(t1^sMj)3Y<-yZ3j;?}hFyR2v8f z0`stJcmU0`Nmv?4hF)4qo(^()ngz2!zX{sSAR9VHyFD$#?6-n^M@rrXazRSRuwl~D zv8mASfX0HH3wI8Swe=n5u;3MucIB9c!NOmi=SlZJW-%xa#*cvoGQO zk9QobpE;xH?RmK!#d~Mm-%S5)U|KtuUub=FeM3*r&eu9OY&o#+#(nGYtCs#t=XQTW z-2Kqgx%VGU{IhA=VLLVE_+=Q#QL#_ex*|F&cK0KQb4vg>$}SpHgnKHhaK{oh;L+Xg&M+iHtiUOLg!C9OJIeUw>tvT((}R(Gjq`n#5`>T0eSe6{Ss z759C_cMJJ1Z@#iLaN=LWDo>d`Nm^o=d+!hKCg9?RR)nm%dgy7`Ac+wWN0R&nBDglw5Kpjc*} ziUdzvtnsxybA1l9JmS5owHS ze8NkZxIDITACifb21vx*Q%MYfNm$jJcfA zfq?li?ilT%wVTSI6%6uzMQk?03;4Z+;h&cjQI>d9WN6yPxg?qt!VF7toWn)B?3|P2 z!gjmhwjsu5XGTEm!9|J;jRZU6409|u z3Zg=lAuEN((NP&t5Dp#QbgfUC}fi)mm?XCB=UBAtLUsM_J60DUT8L4a(^e`BBiKTM1IWaO(BS%oRE*NYwPR2zuPMgc^ zq+PT<8MBG^OQdR$i3X-wJ56(ATXwJ6?>@fapEx*Mim*bOO8SDf?7xo7sC{1M%nopU#Y$L89e~>gp+acJ3-e3 zUE^Y4T*?#KH9^<77#NrGM0WjTbmfd(r%)9B1;ydA^p}oW4sR@eHz@(P8lt&xZs%t3})$pU`f^|nK_d!H*9VvjO%-6z`v-*b*%fTB{#06v;A2Y zukZh~FxMH%{;%`BUjz?g54NSxD5~x3Y`Jy%r>CQTTxsd$am%%-dexof?+kv()xL4Q z`Gswr{D+51=e~%&a`sPOcb7i4$m4k?58Iqk|K3jQUUI|szM@zI8t4l3M84TqPgOfs zRt#Dn|LhM_UU~P{7q;&SX+kFf0F(6dFeBFFQumA%m$JdyWg+q0+d+`aC~ cWl_LlmSYd-*9tP0?KajKC@J^vD_*(&ThfH#DgXcg