From 42837bc2ca60d19c8434909127f2b42b0c2796dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 10 May 2025 06:10:33 +0200 Subject: [PATCH] Fixed marine polygons draw order --- src/map/IMG/style.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/map/IMG/style.cpp b/src/map/IMG/style.cpp index dc983cb8..2dbb81ef 100644 --- a/src/map/IMG/style.cpp +++ b/src/map/IMG/style.cpp @@ -356,8 +356,6 @@ void Style::defaultPolygonStyle() Qt::FDiagPattern)); _polygons[0x10503] = Polygon(QBrush(QColor(0xff, 0x40, 0x40), Qt::FDiagPattern)); - _polygons[0x10504] = Polygon(QBrush(QColor(0xff, 0x40, 0x40), - Qt::FDiagPattern)); _polygons[0x10601] = Polygon(QBrush(QColor(0xaa, 0xaa, 0xaa))); _polygons[0x1060a] = Polygon(QBrush(QColor(0xfc, 0xb4, 0xfc))); _polygons[0x10614] = Polygon(QBrush(QColor(0xff, 0xff, 0xff))); @@ -366,7 +364,7 @@ void Style::defaultPolygonStyle() _drawOrder << TYPE(0x4b) << 0x10d01 << 0x10106 << 0x10104 << TYPE(0x4a) << 0x10614 << 0x10101 << 0x10102 << 0x10301 << 0x10302 << 0x10303 << 0x10304 - << 0x10305 << 0x10306 << 0x10307 << 0x10308 << 0x10601 << 0x1060a << 0x10105 + << 0x10305 << 0x10306 << 0x10307 << 0x10308 << 0x10601 << 0x1060a << TYPE(0x01) << 0x10800 << TYPE(0x02) << 0x10801 << TYPE(0x03) << 0x10802 << TYPE(0x17) << 0x10a04 << TYPE(0x18) << 0x1090c << TYPE(0x1a) << 0x1090e << TYPE(0x28) << 0x10b01 << TYPE(0x32) << 0x10b02 << TYPE(0x3c) << 0x10b03 @@ -381,9 +379,11 @@ void Style::defaultPolygonStyle() << TYPE(0x04) << 0x10901 << TYPE(0x05) << 0x10902 << TYPE(0x06) << 0x10903 << TYPE(0x07) << 0x10904 << TYPE(0x08) << 0x10905 << TYPE(0x09) << 0x10906 << TYPE(0x0a) << 0x10907 << TYPE(0x0b) << 0x10908 << TYPE(0x0c) << 0x10909 - << TYPE(0x26) << TYPE(0x0d) << 0x1090a << TYPE(0x0e) << 0x1090b << TYPE(0x0f) - << TYPE(0x10) << TYPE(0x11) << TYPE(0x12) << TYPE(0x19) << 0x1090d - << TYPE(0x13) << 0x10900 << 0x10407 << 0x10409 << 0x10503 << 0x10504; + << TYPE(0x26) << TYPE(0x0d) << 0x1090a << TYPE(0x0e) << 0x1090b + << TYPE(0x0f) << TYPE(0x10) << TYPE(0x11) << TYPE(0x12) + << TYPE(0x19) << 0x1090d << TYPE(0x13) << 0x10900 + << 0x10613 /*raster*/ << 0x1060a << 0x10407 << 0x10409 << 0x10503 + << 0x10105; } void Style::defaultLineStyle(qreal ratio)