diff --git a/gpxsee.qrc b/gpxsee.qrc index 1708da6f..fd883090 100644 --- a/gpxsee.qrc +++ b/gpxsee.qrc @@ -216,6 +216,7 @@ icons/map/marine/tanker-anchorage.png icons/map/marine/nature-reserve-line.png icons/map/marine/sanctuary-line.png + icons/map/marine/fishing-farm.png diff --git a/icons/map/marine/fishing-farm.png b/icons/map/marine/fishing-farm.png new file mode 100644 index 00000000..b348c37d Binary files /dev/null and b/icons/map/marine/fishing-farm.png differ diff --git a/src/map/ENC/mapdata.cpp b/src/map/ENC/mapdata.cpp index ad46b72a..775dee72 100644 --- a/src/map/ENC/mapdata.cpp +++ b/src/map/ENC/mapdata.cpp @@ -362,6 +362,8 @@ MapData::Point::Point(uint type, const Coordinates &c, const Attributes &attr, subtype = CATACH; else if (type == I_ACHARE) subtype = I_CATACH; + else if (type == MARKUL) + subtype = CATMFA; QList list(_attr.value(subtype).split(',')); std::sort(list.begin(), list.end()); diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index 6d052e63..011aaafe 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -141,6 +141,7 @@ void Style::polygonStyle() 1.5, Qt::DashLine)); _polygons[TYPE(CBLARE)] = Polygon(QImage(":/marine/cable-area-line.png")); _polygons[TYPE(PIPARE)] = Polygon(QImage(":/marine/pipeline-area-line.png")); + _polygons[SUBTYPE(MARKUL, 0)] = Polygon(QImage(":/marine/fishing-farm-line.png")); _polygons[SUBTYPE(MARKUL, 3)] = Polygon(QImage(":/marine/fishing-farm-line.png")); _polygons[TYPE(BERTHS)] = Polygon(Qt::NoBrush, QPen(QColor(0xeb, 0x49, 0xeb), 1, Qt::DashLine)); @@ -180,7 +181,8 @@ void Style::polygonStyle() << 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); + << TYPE(I_TRNBSN) << SUBTYPE(MARKUL, 0) << SUBTYPE(MARKUL, 3) + << TYPE(CONZNE); } void Style::lineStyle(qreal ratio) @@ -393,6 +395,8 @@ void Style::pointStyle(qreal ratio) _points[TYPE(LNDARE)].setHaloColor(QColor()); _points[TYPE(LNDRGN)].setHaloColor(QColor()); _points[TYPE(RADRFL)] = Point(QImage(":/marine/radar-reflector.png")); + _points[SUBTYPE(MARKUL, 0)] = Point(QImage(":/marine/fishing-farm.png")); + _points[SUBTYPE(MARKUL, 3)] = Point(QImage(":/marine/fishing-farm.png")); _points[SUBTYPE(I_BERTHS, 6)] = Point(QImage(":/marine/fleeting-area.png"), Small);