diff --git a/src/map/ENC/mapdata.h b/src/map/ENC/mapdata.h index 558b91af..5370bc7a 100644 --- a/src/map/ENC/mapdata.h +++ b/src/map/ENC/mapdata.h @@ -132,6 +132,7 @@ private: }; struct Sounding { + Sounding() : depth(NAN) {} Sounding(const Coordinates &c, double depth) : c(c), depth(depth) {} Coordinates c; diff --git a/src/map/ENC/objects.h b/src/map/ENC/objects.h index 7516ac24..dc9269f3 100644 --- a/src/map/ENC/objects.h +++ b/src/map/ENC/objects.h @@ -1,6 +1,8 @@ #ifndef ENC_OBJECTS_H #define ENC_OBJECTS_H +#define AIRARE 2 +#define ACHBRT 3 #define ACHARE 4 #define BCNCAR 5 #define BCNISD 6 diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index 381b62dc..cfada75e 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -31,14 +31,15 @@ void Style::defaultPolygonStyle() _polygons[TYPE(LAKARE)] = Polygon(QBrush("#9fc4e1"), QPen(QColor("#000000"), 1)); _polygons[TYPE(RIVERS)] = Polygon(QBrush("#9fc4e1")); + _polygons[TYPE(AIRARE)] = Polygon(QBrush("#aaaaaa")); _drawOrder << TYPE(M_COVR) << TYPE(LNDARE) << TYPE(BUISGL) << SUBTYPE(DEPARE, 0) << SUBTYPE(DEPARE, 1) << SUBTYPE(DEPARE, 2) << SUBTYPE(DEPARE, 3) << SUBTYPE(DEPARE, 4) << SUBTYPE(DEPARE, 5) << SUBTYPE(DEPARE, 6) - << TYPE(LAKARE) << TYPE(RIVERS) << TYPE(FAIRWY) << TYPE(BRIDGE) - << TYPE(SLCONS) << TYPE(PONTON) << TYPE(DMPGRD) << TYPE(OBSTRN) - << TYPE(ACHARE); + << TYPE(LAKARE) << TYPE(RIVERS) << TYPE(FAIRWY) << TYPE(AIRARE) + << TYPE(BRIDGE) << TYPE(SLCONS) << TYPE(PONTON) << TYPE(DMPGRD) + << TYPE(OBSTRN) << TYPE(ACHARE); } void Style::defaultLineStyle() @@ -89,6 +90,7 @@ void Style::defaultPointStyle() _points[TYPE(UWTROC)] = Point(QImage(":/IMG/rock-dangerous.png"), Small); _points[SUBTYPE(HRBFAC, 5)] = Point(QImage(":/IMG/yacht-harbor.png")); _points[TYPE(PILPNT)] = Point(QImage(":/IMG/pile.png"), Small); + _points[TYPE(ACHBRT)] = Point(QImage(":/IMG/anchorage.png")); } Style::Style()