diff --git a/gpxsee.qrc b/gpxsee.qrc index 652940ec..7ea07373 100644 --- a/gpxsee.qrc +++ b/gpxsee.qrc @@ -311,6 +311,7 @@ icons/map/marine/fishing-farm.png icons/map/marine/shellfish-farm-line.png icons/map/marine/degaussing-line.png + icons/map/marine/nofishing-line.png diff --git a/icons/map/marine/noanchor-line.png b/icons/map/marine/noanchor-line.png index c50af80a..9dbc52dd 100644 Binary files a/icons/map/marine/noanchor-line.png and b/icons/map/marine/noanchor-line.png differ diff --git a/icons/map/marine/nofishing-line.png b/icons/map/marine/nofishing-line.png new file mode 100644 index 00000000..d07e1be2 Binary files /dev/null and b/icons/map/marine/nofishing-line.png differ diff --git a/src/map/ENC/mapdata.cpp b/src/map/ENC/mapdata.cpp index f6004cdf..fa0f9960 100644 --- a/src/map/ENC/mapdata.cpp +++ b/src/map/ENC/mapdata.cpp @@ -199,6 +199,7 @@ static bool polygonPointCb(const MapData::Poly *polygon, void *context) || type == SUBTYPE(I_ACHARE, 12) || 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, 3) || type == SUBTYPE(I_RESARE, 3) || 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) @@ -323,6 +324,8 @@ static uint restrictionCategory(uint type, const MapData::Attributes &attr) if (restrn == 1) return 2; + else if (restrn == 3) + return 3; else if (restrn == 7) return 17; else diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index ea39fd16..60e4d6e5 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -134,6 +134,7 @@ void Style::polygonStyle() _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, 3)] = Polygon(QImage(":/marine/nofishing-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")); @@ -151,6 +152,7 @@ void Style::polygonStyle() _polygons[SUBTYPE(RESARE, 26)] = Polygon(QImage(":/marine/safety-zone-line.png")); _polygons[SUBTYPE(I_RESARE, 1)] = _polygons[SUBTYPE(RESARE, 1)]; _polygons[SUBTYPE(I_RESARE, 2)] = _polygons[SUBTYPE(RESARE, 2)]; + _polygons[SUBTYPE(I_RESARE, 3)] = _polygons[SUBTYPE(RESARE, 3)]; _polygons[SUBTYPE(I_RESARE, 4)] = _polygons[SUBTYPE(RESARE, 4)]; _polygons[SUBTYPE(I_RESARE, 5)] = _polygons[SUBTYPE(RESARE, 5)]; _polygons[SUBTYPE(I_RESARE, 6)] = _polygons[SUBTYPE(RESARE, 6)]; diff --git a/src/map/IMG/style.cpp b/src/map/IMG/style.cpp index 2dbb81ef..e511b15f 100644 --- a/src/map/IMG/style.cpp +++ b/src/map/IMG/style.cpp @@ -499,6 +499,7 @@ void Style::defaultLineStyle(qreal ratio) _lines[0x10407] = Line(QPen(QColor(0xa3, 0xa3, 0xa3), 1, Qt::DashLine)); _lines[0x10409] = Line(QPen(QColor(0, 0, 0), 1, Qt::DotLine)); _lines[0x10501] = Line(QImage(":/marine/noanchor-line.png")); + _lines[0x10502] = Line(QImage(":/marine/nofishing-line.png")); _lines[0x10503] = Line(QImage(":/marine/entry-prohibited-line.png")); _lines[0x10504] = Line(QPen(QColor(0xe7, 0x28, 0xe7), 1, Qt::DashLine)); _lines[0x10505] = Line(QImage(":/marine/safety-zone-line.png"));