fix(flight-planner): display one-based waypoint numbers (#33)

* fix(flight-planner): display one-based waypoint numbers

* test(flight-planner): cover displayed waypoint numbering

* docs(porting): record waypoint numbering handoff

Author: obazna

Controls/FlightPlannerMap.cs

@@ -539,7 +539,7 @@ private static PointFeature BuildMarker(MPoint pt, int seq, Color fill, bool sel
       SymbolScale = selected ? 0.8 : 0.6,
     });
     f.Styles.Add(new LabelStyle {
-      Text = seq.ToString(),
+      Text = (seq + 1).ToString(),
       ForeColor = Color.Black,
       BackColor = new Brush(Color.Transparent),
       Font = new Font { Size = 11, Bold = true },

GCSViews/FlightPlannerView.axaml

@@ -71,7 +71,7 @@
                         CommandParameter="{Binding SelectedWaypoint}" />
           </DataGrid.KeyBindings>
           <DataGrid.Columns>
-            <DataGridTextColumn Header="#" Binding="{Binding Seq}" IsReadOnly="True" Width="40" />
+            <DataGridTextColumn Header="#" Binding="{Binding DisplayNumber}" IsReadOnly="True" Width="40" />
             <DataGridTemplateColumn Header="Command" Width="190">
               <DataGridTemplateColumn.CellTemplate>
                 <DataTemplate x:DataType="vm:WpRow">

MissionPlannerTests/Avalonia/MissionPlanner.Tests/FlightPlannerViewportTests.cs

@@ -10,6 +10,22 @@
 namespace MissionPlanner.Tests;
 
 public class FlightPlannerViewportTests {
+  [AvaloniaFact]
+  public void Waypoint_markers_use_one_based_display_numbers() {
+    var map = new FlightPlannerMap();
+
+    map.SetWaypoints(KyivWaypoints(2), 50, 80, Firmwares.ArduPlane);
+
+    WritableLayer waypoints = Assert.IsAssignableFrom<WritableLayer>(
+        Assert.Single(map.Map.Layers, candidate => candidate.Name == "Waypoints"));
+    string[] labels = waypoints.GetFeatures().OfType<PointFeature>()
+        .Select(feature =>
+            Assert.Single(feature.Styles.OfType<LabelStyle>()).GetLabelText(feature) ?? "")
+        .OrderBy(label => label, StringComparer.Ordinal)
+        .ToArray();
+    Assert.Equal(new[] { "1", "2" }, labels);
+  }
+
   [AvaloniaFact]
   public void Waypoint_redraw_preserves_an_initialized_viewport() {
     var map = new FlightPlannerMap();

MissionPlannerTests/Avalonia/MissionPlanner.Tests/WpRowTests.cs

@@ -6,6 +6,21 @@
 namespace MissionPlanner.Tests;
 
 public class WpRowTests {
+  [Fact]
+  public void Planner_display_number_is_one_based_without_changing_internal_sequence() {
+    var row = new WpRow { Seq = 0 };
+    var changes = new List<string>();
+    row.PropertyChanged += (_, args) => changes.Add(args.PropertyName ?? "");
+
+    Assert.Equal(1, row.DisplayNumber);
+
+    row.Seq = 4;
+
+    Assert.Equal(4, row.Seq);
+    Assert.Equal(5, row.DisplayNumber);
+    Assert.Contains(nameof(WpRow.DisplayNumber), changes);
+  }
+
   [Fact]
   public void From_then_ToLocationwp_round_trips_fields() {
     var src = new Locationwp {

Porting/STATUS.md

@@ -2,6 +2,35 @@
 
 Updated: **2026-08-31**.
 
+## Flight Planner waypoint display numbering
+
+- Dedicated branch `fix/flight-planner-waypoint-numbering` starts from merged `master`
+  `1cbe17b87`. Behavior commit `03fca7c64` makes human-facing Planner waypoint numbers
+  one-based; regression commit `054f9c7f1` covers the row model and map markers.
+- Official Mission Planner removes mission item zero (home) before building the Flight Data
+  waypoint overlay, labels the remaining items with `a + 1`, and numbers Flight Planner row
+  headers with `a + 1`. The Avalonia Plan grid and map instead exposed zero-based `WpRow.Seq`, so
+  its first planned point appeared as 0 while Flight Data correctly showed 1.
+- `WpRow.Seq` remains zero-based for editing, plugin APIs, mission transfer, `DO_JUMP`, map dragging
+  and mission files. New read-only `DisplayNumber` returns `Seq + 1` and raises a dependent property
+  notification whenever rows are renumbered. Only human-facing Plan grid, map-marker and KML labels
+  use the one-based value.
+- Focused `WpRowTests` plus `FlightPlannerViewportTests` pass **18/18**. The Release build succeeds
+  with **0 warnings / 0 errors**. The complete Avalonia suite rerun executed **1569** tests:
+  **1568 passed** and only the existing host-sensitive
+  `VideoSourceResolverTests.NormalizesCommonStreamSources` `/dev/video0` case failed. A serial/TCP
+  loopback timing test failed once during the first full run, then passed alone and in the complete
+  rerun; no bridge source or test changes on this branch.
+- Behavior, integration and test reviewers approve exact code/test head `054f9c7f1` with no
+  protocol, file-format, plugin or map-interaction blocker.
+- The worktree still contains only 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. Claude
+  remains disabled.
+- Manual acceptance: rebuild and relaunch, add at least two Plan points and confirm the grid and map
+  show 1 and 2; upload/read the mission and confirm Flight Data uses the same numbers while current
+  mission status may still correctly report sequence 0 when the vehicle is idle.
+
 ## Flight Data bearing-overlay zoom stability
 
 - Dedicated branch `fix/flight-data-bearing-overlay-zoom` starts from merged `master`

ViewModels/FlightPlannerViewModel.cs

@@ -1485,7 +1485,7 @@ public string GenerateMissionKmlAndOpen() {
     } catch (Exception ex) {
       string kml = Services.LocalKmlServer.BuildMissionKml(
           pts.Select(w => new Services.LocalKmlWaypoint(
-              $"WP {w.Seq}", w.Lat, w.Lng, w.Alt)));
+              $"WP {w.DisplayNumber}", w.Lat, w.Lng, w.Alt)));
       var path = Path.Combine(Path.GetTempPath(), "mission.kml");
       File.WriteAllText(path, kml);
       Services.Dialogs.OpenUrl(path);
@@ -1495,7 +1495,7 @@ public string GenerateMissionKmlAndOpen() {
 
   private void PublishLocalKmlMission() => AppState.LocalKml.UpdateMission(
       Waypoints.Select(w => new Services.LocalKmlWaypoint(
-          $"WP {w.Seq}", w.Lat, w.Lng, w.Alt)));
+          $"WP {w.DisplayNumber}", w.Lat, w.Lng, w.Alt)));
 
   [Obsolete]
   private void WriteRadiusParams() {
@@ -3174,6 +3174,10 @@ public WpRow() {
   [ObservableProperty]
   private int _seq;
 
+  public int DisplayNumber => Seq + 1;
+
+  partial void OnSeqChanged(int value) => OnPropertyChanged(nameof(DisplayNumber));
+
   [ObservableProperty]
   private ushort _command;