diff --git a/gpxsee.qrc b/gpxsee.qrc index 1c08bde5..5ea77cf5 100644 --- a/gpxsee.qrc +++ b/gpxsee.qrc @@ -218,6 +218,7 @@ icons/map/marine/nature-reserve-line.png icons/map/marine/sanctuary-line.png icons/map/marine/fishing-farm.png + icons/map/marine/shellfish-farm-line.png diff --git a/icons/map/marine/shellfish-farm-line.png b/icons/map/marine/shellfish-farm-line.png new file mode 100644 index 00000000..7236ec51 Binary files /dev/null and b/icons/map/marine/shellfish-farm-line.png differ diff --git a/src/map/ENC/mapdata.cpp b/src/map/ENC/mapdata.cpp index dd7cca0d..7c4af56c 100644 --- a/src/map/ENC/mapdata.cpp +++ b/src/map/ENC/mapdata.cpp @@ -375,7 +375,7 @@ 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) + else if (type == MARCUL) subtype = CATMFA; else if (type == I_BUNSTA) subtype = I_CATBUN; @@ -436,7 +436,7 @@ MapData::Poly::Poly(uint type, const Polygon &path, const Attributes &attr, subtype = I_CATACH; else if (type == HRBFAC) subtype = CATHAF; - else if (type == MARKUL) + else if (type == MARCUL) subtype = CATMFA; else if (type == I_BERTHS) subtype = I_CATBRT; diff --git a/src/map/ENC/objects.h b/src/map/ENC/objects.h index 2fa3568c..aea5ebce 100644 --- a/src/map/ENC/objects.h +++ b/src/map/ENC/objects.h @@ -55,7 +55,7 @@ #define LNDMRK 74 #define LIGHTS 75 #define LOKBSN 79 -#define MARKUL 82 +#define MARCUL 82 #define MORFAC 84 #define NAVLNE 85 #define OBSTRN 86 diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index f04ae791..113e3f4c 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -147,8 +147,10 @@ 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[SUBTYPE(MARCUL, 0)] = Polygon(QImage(":/marine/fishing-farm-line.png")); + _polygons[SUBTYPE(MARCUL, 1)] = Polygon(QImage(":/marine/shellfish-farm-line.png")); + _polygons[SUBTYPE(MARCUL, 2)] = Polygon(QImage(":/marine/shellfish-farm-line.png")); + _polygons[SUBTYPE(MARCUL, 3)] = Polygon(QImage(":/marine/fishing-farm-line.png")); _polygons[TYPE(BERTHS)] = Polygon(Qt::NoBrush, QPen(QColor(0xeb, 0x49, 0xeb), 1, Qt::DashLine)); _polygons[TYPE(I_BERTHS)] = _polygons[TYPE(BERTHS)]; @@ -189,7 +191,8 @@ void Style::polygonStyle() << SUBTYPE(RESARE, 23) << SUBTYPE(I_RESARE, 23) << SUBTYPE(RESARE, 25) << SUBTYPE(I_RESARE, 25) << SUBTYPE(RESARE, 26) << SUBTYPE(I_RESARE, 26) << TYPE(CBLARE) << TYPE(PIPARE) << TYPE(PRCARE) << TYPE(I_TRNBSN) - << SUBTYPE(MARKUL, 0) << SUBTYPE(MARKUL, 3) << TYPE(CONZNE); + << SUBTYPE(MARCUL, 0) << SUBTYPE(MARCUL, 1) << SUBTYPE(MARCUL, 2) + << SUBTYPE(MARCUL, 3) << TYPE(CONZNE); } void Style::lineStyle(qreal ratio) @@ -402,8 +405,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(MARCUL, 0)] = Point(QImage(":/marine/fishing-farm.png")); + _points[SUBTYPE(MARCUL, 3)] = Point(QImage(":/marine/fishing-farm.png")); _points[SUBTYPE(I_BERTHS, 6)] = Point(QImage(":/marine/fleeting-area.png"), Small);