fix(flight-data): stop duplicated vehicle overlay markers (#27)

* fix(flight-data): scope vehicle marker to its point

* test(flight-data): prevent overlay marker duplication

* docs(porting): record vehicle overlay rendering handoff

* test(flight-data): exercise live overlay composition

* docs(porting): refresh vehicle overlay verification

Author: obazna

Controls/MapView.cs

@@ -165,7 +165,6 @@ public MapView() {
     map.Layers.Add(_movingBase);
     map.Layers.Add(_cameraTarget);
     map.Layers.Add(_otherVehicles);
-    _vehicle.Style = MavMarker.Vehicle(0);
     map.Layers.Add(_vehicle);
 
     map.Navigator.Limiter = new Mapsui.Limiting.ViewportLimiterKeepWithinExtent();
@@ -336,12 +335,7 @@ private void UpdateVehicle() {
 
     var (x, y) = SphericalMercator.FromLonLat(cs.lng, cs.lat);
     var pt = new MPoint(x, y);
-    _vehicle.Style = MavMarker.Vehicle(cs.yaw);
-    _vehicle.Clear();
-    _vehicle.Add(new PointFeature(pt));
-
-    DrawBearingOverlays(mav, pt);
-    _vehicle.DataHasChanged();
+    PopulateVehicleLayer(mav, pt, Map.Navigator.Viewport.Resolution);
 
     UpdateMapRotation(cs);
 
@@ -1120,9 +1114,14 @@ private void ClearGimbalTarget() {
     Line = new Pen(new Color(255, 105, 180), 2),
   };
 
-  private void DrawBearingOverlays(MAVState mav, MPoint pt) {
+  internal void PopulateVehicleLayer(MAVState mav, MPoint point, double resolution) {
+    SetVehicleMarker(point, mav.cs.yaw);
+    DrawBearingOverlays(mav, point, resolution);
+    _vehicle.DataHasChanged();
+  }
+
+  private void DrawBearingOverlays(MAVState mav, MPoint pt, double resMpp) {
     MissionPlanner.CurrentState cs = mav.cs;
-    double resMpp = Map.Navigator.Viewport.Resolution;
     if (resMpp <= 0) {
       return;
     }
@@ -1165,6 +1164,16 @@ private void AddBearingLine(MPoint pt, double bearingDeg, double len, VectorStyl
     _vehicle.Add(line);
   }
 
+  private void SetVehicleMarker(MPoint point, double headingDeg) {
+    // Keep the symbol on the point feature. A layer-level symbol is also applied to the
+    // bearing-line and turn-radius geometries, which renders duplicate aircraft along them.
+    _vehicle.Style = null;
+    _vehicle.Clear();
+    var marker = new PointFeature(point);
+    marker.Styles.Add(MavMarker.Vehicle(headingDeg));
+    _vehicle.Add(marker);
+  }
+
   private void AddRadiusArc(MPoint pt, double cogDeg, double radius, double resMpp) {
     if (Math.Abs(radius) <= 1) {
       return;
@@ -1254,9 +1263,7 @@ public void ShowSampleMarker(double lat, double lng) {
     }
     var (x, y) = SphericalMercator.FromLonLat(lng, lat);
     var pt = new MPoint(x, y);
-    _vehicle.Style = MavMarker.Vehicle(0);
-    _vehicle.Clear();
-    _vehicle.Add(new PointFeature(pt));
+    SetVehicleMarker(pt, 0);
     _vehicle.DataHasChanged();
     Map.Navigator.CenterOn(pt);
   }

MissionPlannerTests/Avalonia/MissionPlanner.Tests/FlightMapOverlayTests.cs

@@ -55,6 +55,71 @@ public void Flight_map_contains_operational_overlay_layers() {
     Assert.Contains("Other vehicles", names);
   }
 
+  [AvaloniaFact]
+  public void Flight_map_scopes_vehicle_symbol_to_the_point_feature() {
+    var map = new MapView();
+
+    map.ShowSampleMarker(34, 33);
+
+    Mapsui.Layers.WritableLayer layer = Assert.IsType<Mapsui.Layers.WritableLayer>(
+        Assert.Single(map.Map.Layers, candidate => candidate.Name == "Vehicle"));
+    Assert.Null(layer.Style);
+    Mapsui.Layers.PointFeature marker = Assert.Single(
+        layer.GetFeatures().OfType<Mapsui.Layers.PointFeature>());
+    Mapsui.Styles.SymbolStyle style = Assert.Single(
+        marker.Styles.OfType<Mapsui.Styles.SymbolStyle>());
+    Assert.Equal(Mapsui.Styles.SymbolType.Triangle, style.SymbolType);
+  }
+
+  [AvaloniaFact]
+  public void Live_vehicle_bearing_and_radius_overlays_do_not_duplicate_the_symbol() {
+    string[] settingKeys = {
+      "GMapMarkerBase_DisplayHeading",
+      "GMapMarkerBase_DisplayNavBearing",
+      "GMapMarkerBase_DisplayCOG",
+      "GMapMarkerBase_DisplayTarget",
+      "GMapMarkerBase_DisplayRadius",
+    };
+    var saved = settingKeys.ToDictionary(key => key, key => Utilities.Settings.Instance[key]);
+    try {
+      foreach (string key in settingKeys) {
+        Utilities.Settings.Instance[key] = bool.TrueString;
+      }
+
+      using var link = new MAVLinkInterface();
+      MAVState mav = link.MAV;
+      mav.aptype = MAVLink.MAV_TYPE.FIXED_WING;
+      mav.cs.yaw = 10;
+      mav.cs.nav_bearing = 20;
+      mav.cs.groundcourse = 30;
+      mav.cs.target_bearing = 40;
+      mav.cs.groundspeed = 20;
+      mav.cs.roll = 20;
+      var map = new MapView();
+
+      map.PopulateVehicleLayer(mav, new Mapsui.MPoint(1000, 2000), resolution: 2);
+
+      Mapsui.Layers.WritableLayer layer = Assert.IsType<Mapsui.Layers.WritableLayer>(
+          Assert.Single(map.Map.Layers, candidate => candidate.Name == "Vehicle"));
+      Assert.Null(layer.Style);
+      Mapsui.IFeature[] features = layer.GetFeatures().ToArray();
+      Mapsui.Layers.PointFeature marker = Assert.Single(
+          features.OfType<Mapsui.Layers.PointFeature>());
+      Assert.Single(marker.Styles.OfType<Mapsui.Styles.SymbolStyle>());
+      Mapsui.Nts.GeometryFeature[] overlays =
+          features.OfType<Mapsui.Nts.GeometryFeature>().ToArray();
+      Assert.Equal(5, overlays.Length);
+      Assert.All(overlays, overlay => {
+        Assert.Contains(overlay.Styles, style => style is Mapsui.Styles.VectorStyle);
+        Assert.DoesNotContain(overlay.Styles, style => style is Mapsui.Styles.SymbolStyle);
+      });
+    } finally {
+      foreach ((string key, string? value) in saved) {
+        Utilities.Settings.Instance[key] = value;
+      }
+    }
+  }
+
   [Theory]
   [InlineData(Firmwares.ArduCopter2, 1, 2, 150, true)]
   [InlineData(Firmwares.ArduCopter2, 1, 3, 150, true)]

Porting/STATUS.md

@@ -2,6 +2,33 @@
 
 Updated: **2026-08-31**.
 
+## Flight Data vehicle-overlay marker rendering
+
+- Dedicated branch `fix/flight-data-vehicle-overlay-rendering` starts from pulled `master`
+  `5a1c11ea3`. Commit `7379e6dde` scopes the active aircraft triangle to its point feature;
+  commit `109872c5e` adds the rendering regression test, and reviewer follow-up `a4f218da0`
+  exercises the complete live fixed-wing layer with all four bearing lines and its radius arc.
+- Flight Data previously assigned `MavMarker.Vehicle` as the style of the complete `Vehicle`
+  layer, then added heading, course, navigation-bearing, target-bearing and turn-radius geometries
+  to that same layer. Mapsui consequently painted the aircraft symbol on those geometries too,
+  producing duplicated arrowheads and a striped fan along the turn-radius arc. The layer now has
+  no shared symbol style, while its aircraft point owns the triangle style; bearing and radius
+  features retain only their vector styles. Log Browse sample markers use the same safe path.
+- `dotnet build MissionPlanner.csproj -c Release -m:1 --no-restore` succeeds with **0 warnings / 0
+  errors**, and the focused `FlightMapOverlayTests` pass **28/28**. The complete Avalonia suite ran
+  **1555** cases: **1554 passed** and only the existing environment-sensitive
+  `VideoSourceResolverTests.NormalizesCommonStreamSources` `/dev/video0` case failed. Neither the
+  resolver nor its test changes on this branch.
+- The worktree still contains the user's five pre-existing modifications in
+  `Drivers/inf2cat.bat`, `Drivers/uninstall_drivers.bat`, `ExtLibs/Mavlink/regenerate.bat`,
+  `ExtLibs/Mavlink/updatexmls.bat` and `graphs/updatexmls.bat`; none is staged or included in these
+  commits. Claude remains disabled.
+- No code blocker remains. The next executable acceptance step is a fixed-wing SITL flight with
+  bearing and turn-radius overlays enabled: confirm exactly one aircraft triangle is rendered and
+  the colored guide lines and radius arc remain clean. The separately observed Flight Planner
+  viewport jump between a distant persisted home and new waypoints is intentionally excluded from
+  this branch and should be handled after this fix lands.
+
 ## Flight Data Auto Pan settings parity
 
 - Dedicated branch `fix/flight-data-autopan-settings` carries four granular code/test commits: