diff --git a/src/map/IMG/rastertile.cpp b/src/map/IMG/rastertile.cpp index 564cdf5f..4c898d25 100644 --- a/src/map/IMG/rastertile.cpp +++ b/src/map/IMG/rastertile.cpp @@ -534,7 +534,7 @@ static Light::Color ordinaryLight(const QVector &lights) static quint32 pointType(quint32 type, quint32 flags) { - if (Style::hasColorset(type)) + if (Style::hasColorset(type) || Style::isDHPoint(type)) return type | (flags & 0xFF000000); else if (Style::isLabelPoint(type)) return type | (flags & 0xFFF00000); diff --git a/src/map/IMG/style.cpp b/src/map/IMG/style.cpp index 3c6c869a..a695dff0 100644 --- a/src/map/IMG/style.cpp +++ b/src/map/IMG/style.cpp @@ -869,6 +869,9 @@ void Style::defaultPointStyle(qreal ratio) _points[0x10217] = Point(QImage(":/marine/pylon.png")); _points[0x10218] = Point(QImage(":/marine/pylon.png")); + _points[0x10300 | 29<<24] = Point(QImage(":/marine/flagstaff.png")); + _points[0x10300 | 30<<24] = Point(QImage(":/marine/monument.png")); + _points[0x10300 | 83<<24] = Point(QImage(":/marine/crane.png")); _points[0x10304] = Point(QImage(":/marine/building.png")); _points[0x10305] = Point(QImage(":/marine/chimney.png"), QPoint(0, -11)); _points[0x10306] = Point(QImage(":/marine/church.png")); diff --git a/src/map/IMG/style.h b/src/map/IMG/style.h index 93ed37bb..9d81c36f 100644 --- a/src/map/IMG/style.h +++ b/src/map/IMG/style.h @@ -147,7 +147,7 @@ public: static bool isRaster(quint32 type) {return (type == 0x10613);} static bool isDepthPoint(quint32 type) - {return (type == 0x10301);} + {return (type >= 0x10301 && type <= 0x10302);} static bool isObstructionPoint(quint32 type) {return (type >= 0x10400 && type <= 0x10401);} static bool isBuoy(quint32 type) @@ -156,6 +156,8 @@ public: {return (type >= 0x10100 && type < 0x10200);} static bool isLabelPoint(quint32 type) {return type == 0x10500;} + static bool isDHPoint(quint32 type) + {return type == 0x10300;} static bool isMarinePoint(quint32 type) {return type >= 0x10100 && type < 0x10a00;} static bool isStyledLine(quint32 type)