diff --git a/src/map/ENC/attributes.h b/src/map/ENC/attributes.h index 1a29de5b..833dca3f 100644 --- a/src/map/ENC/attributes.h +++ b/src/map/ENC/attributes.h @@ -5,6 +5,7 @@ #define CATHAF 30 #define CATLMK 35 #define CATMOR 40 +#define CATTRK 54 #define CATREA 56 #define CATWRK 71 #define DRVAL1 87 diff --git a/src/map/ENC/mapdata.cpp b/src/map/ENC/mapdata.cpp index b774e9c1..32ae1e6d 100644 --- a/src/map/ENC/mapdata.cpp +++ b/src/map/ENC/mapdata.cpp @@ -442,6 +442,8 @@ MapData::Attr MapData::lineAttr(const ISO8211::Record &r, uint OBJL) if ((OBJL == DEPCNT && key == VALDCO) || (OBJL == LNDELV && key == ELEVAT)) label = av.at(1).toString(); + if (OBJL == RECTRC && key == CATTRK) + subtype = av.at(1).toString().toUInt(); } return Attr(subtype, label); diff --git a/src/map/ENC/objects.h b/src/map/ENC/objects.h index d6204308..37bb29eb 100644 --- a/src/map/ENC/objects.h +++ b/src/map/ENC/objects.h @@ -44,6 +44,7 @@ #define PIPSOL 94 #define PONTON 95 #define RAILWY 106 +#define RECTRC 109 #define RESARE 112 #define RIVERS 114 #define ROADWY 116 diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index 02941299..481ce4d7 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -69,6 +69,7 @@ void Style::defaultPolygonStyle() void Style::defaultLineStyle() { + _lines[TYPE(BUISGL)] = Line(QPen(QColor("#966118"), 1.5)); _lines[TYPE(DEPCNT)] = Line(QPen(QColor("#659aef"), 1, Qt::SolidLine)); _lines[TYPE(DEPCNT)].setTextColor(QColor("#558adf")); _lines[TYPE(DEPCNT)].setTextFontSize(Small); @@ -94,6 +95,8 @@ void Style::defaultLineStyle() _lines[TYPE(ROADWY)] = Line(QPen(QColor("#000000"), 2, Qt::SolidLine)); _lines[TYPE(GATCON)] = Line(QPen(QColor("#000000"), 2, Qt::SolidLine)); _lines[TYPE(TSELNE)] = Line(QPen(QColor("#80fcb4fc"), 4, Qt::SolidLine)); + _lines[SUBTYPE(RECTRC, 1)] = Line(QPen(QColor("#000000"), 0, Qt::SolidLine)); + _lines[SUBTYPE(RECTRC, 2)] = Line(QPen(QColor("#000000"), 0, Qt::DashLine)); } void Style::defaultPointStyle()