Update the UI to show sim state.

https://github.com/dcs-liberation/dcs_liberation/issues/1704

resources/ui/air_assets/unspecified_blue.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="118" height="128" viewBox="41 26 118 128"><path d="M 155,150 C 155,50 115,30 100,30 85,30 45,50 45,150" stroke-width="4" stroke="black" fill="rgb(128,224,255)" fill-opacity="1" ></path></svg>

resources/ui/air_assets/unspecified_red.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" width="118" height="138" viewBox="41 16 118 138"><path d="M 45,150 L45,70 100,20 155,70 155,150" stroke-width="4" stroke="black" fill="rgb(255,128,128)" fill-opacity="1" ></path></svg>

resources/ui/map/map.js

@@ -104,9 +104,31 @@ class TgoIcons {
   }
 }
 
+class AirIcons {
+  constructor() {
+    this.icons = {};
+    for (const player of [true, false]) {
+      this.icons[player] = this.loadIcon("unspecified", player);
+    }
+  }
+
+  icon(_category, player, _state) {
+    return this.icons[player];
+  }
+
+  loadIcon(category, player) {
+    const color = player ? "blue" : "red";
+    return new L.Icon({
+      iconUrl: `../air_assets/${category}_${color}.svg`,
+      iconSize: [24, 24],
+    });
+  }
+}
+
 const Icons = Object.freeze({
   ControlPoints: new CpIcons(),
   Objectives: new TgoIcons(),
+  AirIcons: new AirIcons(),
 });
 
 function metersToNauticalMiles(meters) {
@@ -163,6 +185,7 @@ defaultBaseMap.addTo(map);
 
 // Enabled by default, so addTo(map).
 const controlPointsLayer = L.layerGroup().addTo(map);
+const aircraftLayer = L.layerGroup().addTo(map);
 const airDefensesLayer = L.layerGroup().addTo(map);
 const factoriesLayer = L.layerGroup().addTo(map);
 const shipsLayer = L.layerGroup().addTo(map);
@@ -249,8 +272,9 @@ L.control
   .groupedLayers(
     baseLayers,
     {
-      "Points of Interest": {
+      "Units and locations": {
         "Control points": controlPointsLayer,
+        Aircraft: aircraftLayer,
         "Air defenses": airDefensesLayer,
         Factories: factoriesLayer,
         Ships: shipsLayer,
@@ -307,7 +331,7 @@ new QWebChannel(qt.webChannelTransport, function (channel) {
   game.groundObjectsChanged.connect(drawGroundObjects);
   game.supplyRoutesChanged.connect(drawSupplyRoutes);
   game.frontLinesChanged.connect(drawFrontLines);
-  game.flightsChanged.connect(drawFlightPlans);
+  game.flightsChanged.connect(drawAircraft);
   game.threatZonesChanged.connect(drawThreatZones);
   game.navmeshesChanged.connect(drawNavmeshes);
   game.mapZonesChanged.connect(drawMapZones);
@@ -770,9 +794,11 @@ class Flight {
   constructor(flight) {
     this.flight = flight;
     this.flightPlan = this.flight.flightPlan.map((p) => new Waypoint(p, this));
+    this.aircraft = null;
     this.path = null;
     this.commitBoundary = null;
-    this.flight.flightPlanChanged.connect(() => this.draw());
+    this.flight.positionChanged.connect(() => this.drawAircraftLocation());
+    this.flight.flightPlanChanged.connect(() => this.drawFlightPlan());
     this.flight.commitBoundaryChanged.connect(() => this.drawCommitBoundary());
   }
 
@@ -808,6 +834,25 @@ class Flight {
     }
   }
 
+  draw() {
+    this.drawAircraftLocation();
+    this.drawFlightPlan();
+    this.drawCommitBoundary();
+  }
+
+  drawAircraftLocation() {
+    if (this.aircraft != null) {
+      this.aircraft.removeFrom(aircraftLayer);
+      this.aircraft = null;
+    }
+    const position = this.flight.position;
+    if (position.length > 0) {
+      this.aircraft = L.marker(position, {
+        icon: Icons.AirIcons.icon("fighter", this.flight.blue),
+      }).addTo(aircraftLayer);
+    }
+  }
+
   drawCommitBoundary() {
     if (this.commitBoundary != null) {
       this.commitBoundary
@@ -829,7 +874,7 @@ class Flight {
     }
   }
 
-  draw() {
+  drawFlightPlan() {
     const path = [];
     this.flightPlan.forEach((waypoint) => {
       if (waypoint.includeInPath()) {
@@ -844,11 +889,11 @@ class Flight {
     });
 
     this.drawPath(path);
-    this.drawCommitBoundary();
   }
 }
 
-function drawFlightPlans() {
+function drawAircraft() {
+  aircraftLayer.clearLayers();
   blueFlightPlansLayer.clearLayers();
   redFlightPlansLayer.clearLayers();
   selectedFlightPlansLayer.clearLayers();
@@ -1136,7 +1181,7 @@ function drawInitialMap() {
   drawGroundObjects();
   drawSupplyRoutes();
   drawFrontLines();
-  drawFlightPlans();
+  drawAircraft();
   drawThreatZones();
   drawNavmeshes();
   drawMapZones();