Colored spar buoys

gpxsee.qrc

@@ -204,6 +204,32 @@
 		<file alias="beacon-black-green.png">icons/map/marine/beacon-black-green.png</file>
 		<file alias="beacon-black-yellow.png">icons/map/marine/beacon-black-yellow.png</file>
 		<file alias="beacon-black-yellow-black.png">icons/map/marine/beacon-black-yellow-black.png</file>
+		<file alias="spar-buoy.png">icons/map/marine/spar-buoy.png</file>
+		<file alias="spar-buoy-red.png">icons/map/marine/spar-buoy-red.png</file>
+		<file alias="spar-buoy-green.png">icons/map/marine/spar-buoy-green.png</file>
+		<file alias="spar-buoy-yellow.png">icons/map/marine/spar-buoy-yellow.png</file>
+		<file alias="spar-buoy-white.png">icons/map/marine/spar-buoy-white.png</file>
+		<file alias="spar-buoy-black-yellow.png">icons/map/marine/spar-buoy-black-yellow.png</file>
+		<file alias="spar-buoy-white-red.png">icons/map/marine/spar-buoy-white-red.png</file>
+		<file alias="spar-buoy-black-red.png">icons/map/marine/spar-buoy-black-red.png</file>
+		<file alias="spar-buoy-white-green.png">icons/map/marine/spar-buoy-white-green.png</file>
+		<file alias="spar-buoy-red-yellow.png">icons/map/marine/spar-buoy-red-yellow.png</file>
+		<file alias="spar-buoy-red-green.png">icons/map/marine/spar-buoy-red-green.png</file>
+		<file alias="spar-buoy-black-yellow-black.png">icons/map/marine/spar-buoy-black-yellow-black.png</file>
+		<file alias="spar-buoy-yellow-black.png">icons/map/marine/spar-buoy-yellow-black.png</file>
+		<file alias="spar-buoy-yellow-black-yellow.png">icons/map/marine/spar-buoy-yellow-black-yellow.png</file>
+		<file alias="spar-buoy-red-white.png">icons/map/marine/spar-buoy-red-white.png</file>
+		<file alias="spar-buoy-green-red-green.png">icons/map/marine/spar-buoy-green-red-green.png</file>
+		<file alias="spar-buoy-red-green-red.png">icons/map/marine/spar-buoy-red-green-red.png</file>
+		<file alias="spar-buoy-black-red-black.png">icons/map/marine/spar-buoy-black-red-black.png</file>
+		<file alias="spar-buoy-yellow-red-yellow.png">icons/map/marine/spar-buoy-yellow-red-yellow.png</file>
+		<file alias="spar-buoy-green-red.png">icons/map/marine/spar-buoy-green-red.png</file>
+		<file alias="spar-buoy-black-white.png">icons/map/marine/spar-buoy-black-white.png</file>
+		<file alias="spar-buoy-white-yellow.png">icons/map/marine/spar-buoy-white-yellow.png</file>
+		<file alias="spar-buoy-yellow-white.png">icons/map/marine/spar-buoy-yellow-white.png</file>
+		<file alias="spar-buoy-green-white.png">icons/map/marine/spar-buoy-green-white.png</file>
+		<file alias="mooring-buoy.png">icons/map/marine/mooring-buoy.png</file>
+		<file alias="platform.png">icons/map/marine/platform.png</file>
 		<file alias="rock-exposed.png">icons/map/marine/rock-exposed.png</file>
 		<file alias="rock-dangerous.png">icons/map/marine/rock-dangerous.png</file>
 		<file alias="wreck.png">icons/map/marine/wreck.png</file>
@@ -223,11 +249,8 @@
 		<file alias="yacht-harbor.png">icons/map/marine/yacht-harbor.png</file>
 		<file alias="fishing-harbor.png">icons/map/marine/fishing-harbor.png</file>
 		<file alias="pile.png">icons/map/marine/pile.png</file>
-		<file alias="spar-buoy.png">icons/map/marine/spar-buoy.png</file>
-		<file alias="mooring-buoy.png">icons/map/marine/mooring-buoy.png</file>
 		<file alias="tower.png">icons/map/marine/tower.png</file>
 		<file alias="chimney.png">icons/map/marine/chimney.png</file>
-		<file alias="platform.png">icons/map/marine/platform.png</file>
 		<file alias="ferry-line.png">icons/map/marine/ferry-line.png</file>
 		<file alias="dw-route-line.png">icons/map/marine/dw-route-line.png</file>
 		<file alias="fence-line.png">icons/map/marine/fence-line.png</file>

src/map/IMG/style.cpp

@@ -773,7 +773,7 @@ void Style::defaultPointStyle(qreal ratio)
 	COLORSET(0x10204, "buoy", 6, -6);
 	COLORSET(0x10205, "buoy", 6, -6);
 	COLORSET(0x10206, "beacon", 0, -8);
-	_points[0x10207] = Point(QImage(":/marine/spar-buoy.png"), QPoint(2, -9));
+	COLORSET(0x10207, "spar-buoy", 2, -8);
 	COLORSET(0x10208, "buoy", 6, -6);
 	COLORSET(0x10209, "buoy", 6, -6);
 	COLORSET(0x1020a, "buoy", 6, -6);

src/map/IMG/style.h

@@ -157,8 +157,7 @@ public:
 	static bool isMarina(quint32 type)
 	  {return type == 0x10703;}
 	static bool hasColorset(quint32 type)
-	  {return (isBuoy(type)
+	  {return (isBuoy(type) && !(type == 0x1020d || type == 0x10216));}
-		&& !(type == 0x10207 || type == 0x1020d || type == 0x10216));}
 
 	static QColor color(Light::Color c);