diff --git a/Shared/AgOpenWeb.RemoteServer/wwwroot/js/field-builder.js b/Shared/AgOpenWeb.RemoteServer/wwwroot/js/field-builder.js
index 2cff40df..15673fbf 100644
--- a/Shared/AgOpenWeb.RemoteServer/wwwroot/js/field-builder.js
+++ b/Shared/AgOpenWeb.RemoteServer/wwwroot/js/field-builder.js
@@ -285,6 +285,8 @@ for (const b of document.querySelectorAll('#fb-tramedit [data-tmode]')) b.addEve
for (const b of document.querySelectorAll('#fb-tramedit [data-tdir]')) b.addEventListener('pointerdown', e => { e.stopPropagation(); tramSet('dir', b.dataset.tdir); });
document.getElementById('bm-delete').addEventListener('pointerdown', e => {
e.stopPropagation();
+ // Obstacles ticked in the list: those, all together (one confirmation), not the selected row.
+ if (bmTickedRows().size) { deleteTickedObstacles(); return; }
if (!boundary || boundary.selectedIndex < 0) return;
const it = boundary.items.find(i => i.index === boundary.selectedIndex);
showConfirm(tr('Delete Boundary'), tr('Delete the {type} boundary? This cannot be undone.', { type: it ? it.boundaryType : tr('selected', {}) }),
diff --git a/Shared/AgOpenWeb.RemoteServer/wwwroot/js/frame.js b/Shared/AgOpenWeb.RemoteServer/wwwroot/js/frame.js
index ad20787f..caf3597f 100644
--- a/Shared/AgOpenWeb.RemoteServer/wwwroot/js/frame.js
+++ b/Shared/AgOpenWeb.RemoteServer/wwwroot/js/frame.js
@@ -17,8 +17,9 @@ function renderSkia(canvas, rp) {
drawGridSk(canvas);
const outOfBounds = !!(tick && tick.op && tick.op.outOfBounds); // #494
if (scene) {
- const selRing = boundaryMenuSelectedRing();
+ const selRing = boundaryMenuSelectedRing(), ticked = boundaryMenuTickedRings();
for (let bi = 0; bi < scene.boundaries.length; bi++) {
+ if (ticked && ticked.has(bi)) strokeFixedPtsSk(canvas, scene.boundaries[bi], true, SKP.boundaryTicked);
if (bi === selRing) strokeFixedPtsSk(canvas, scene.boundaries[bi], true, SKP.boundarySel);
strokeFixedPtsSk(canvas, scene.boundaries[bi], true, outOfBounds ? SKP.boundaryOut : boundaryRingPaint(bi));
}
diff --git a/Shared/AgOpenWeb.RemoteServer/wwwroot/js/hud-tools.js b/Shared/AgOpenWeb.RemoteServer/wwwroot/js/hud-tools.js
index 6131afb0..bbd24dc6 100644
--- a/Shared/AgOpenWeb.RemoteServer/wwwroot/js/hud-tools.js
+++ b/Shared/AgOpenWeb.RemoteServer/wwwroot/js/hud-tools.js
@@ -341,13 +341,35 @@ function renderRecPath() {
// it: a U-turn, go around, or drive through, one lit cell of three. The obstacles are listed by
// size, smallest first, so the few big ones sit together at the end. Tap a row to select it
// (its obstacle is outlined on the map), a cell to give that obstacle the choice, a column
-// title to give it to all of them.
+// title to give it to all of them. The box in front of an obstacle ticks it, for deleting
+// several at once (a field's trees drawn again).
const OBSTACLE_ACTIONS = ['turn', 'goRound', 'driveThrough']; // ObstacleAction 0, 1, 2
let bmShownSel = -1;
+// The ticked obstacles, by list row, and the list they were ticked on. The rows are numbered
+// by place, so when the list changes (a row added or deleted, an obstacle resized or made
+// round, another field) every tick goes: a tick never moves onto another obstacle. A choice or
+// the Hard flag changed keeps them. The host checks the row count again before it deletes.
+const bmTicks = new Set();
+let bmTickList = '';
+function bmListKey(items) {
+ return items.map(i => i.index + ':' + i.boundaryType + ':' + i.sizeM + ':' + i.circleD + ':' + i.areaHa).join(';');
+}
+function bmTickedRows() {
+ const key = boundary ? bmListKey(boundary.items) : '';
+ if (key !== bmTickList) { bmTicks.clear(); bmTickList = key; }
+ return bmTicks;
+}
+function bmToggleTick(index) {
+ const t = bmTickedRows();
+ if (t.has(index)) t.delete(index); else t.add(index);
+ renderBoundaryMenu();
+}
function renderBoundaryMenu() {
const b = boundary;
const list = document.getElementById('bm-list'); list.innerHTML = '';
const items = b ? b.items.slice() : [];
+ const ticks = bmTickedRows();
+ renderTickBar(items);
if (!items.length) { list.innerHTML = '
No boundaries yet — drive around the field to record one.
'; return; }
items.sort((x, y) => (x.isInner - y.isInner) || (x.isInner ? x.sizeM - y.sizeM : 0) || x.index - y.index);
let selRow = null;
@@ -356,10 +378,20 @@ function renderBoundaryMenu() {
const sel = b && it.index === b.selectedIndex;
row.className = 'bm-row' + (sel ? ' sel' : '');
if (sel) selRow = row;
+ let tick;
+ if (it.isInner) {
+ tick = document.createElement('button');
+ tick.className = 'bm-tick' + (ticks.has(it.index) ? ' on' : '');
+ tick.title = tr('Tick to delete with the others ticked');
+ tick.innerHTML = '
';
+ tick.addEventListener('pointerdown', ev => { ev.stopPropagation(); bmToggleTick(it.index); });
+ } else {
+ tick = document.createElement('span'); // the outer boundary is never deleted with the obstacles
+ }
const name = document.createElement('span'); name.className = 'bm-name'; name.textContent = it.boundaryType;
const size = document.createElement('span'); size.className = 'bm-area';
size.textContent = it.circleD > 0 ? '⌀ ' + fmtUnit(it.circleD, 'm', 1) : it.isInner ? fmtUnit(it.sizeM, 'm', 1) : fmtUnit(it.areaHa, 'ha');
- row.append(name, size);
+ row.append(tick, name, size);
if (it.isInner) {
OBSTACLE_ACTIONS.forEach((act, k) => {
const c = document.createElement('button');
@@ -393,6 +425,47 @@ function renderBoundaryMenu() {
bmShownSel = selIndex;
renderCircleBar();
}
+// The title's box (all ticked, some, none) and the bar under the list: how many are ticked,
+// Untick all and Delete ticked, shown instead of the hint while any is ticked.
+function renderTickBar(items) {
+ const n = bmTicks.size, inner = items.filter(i => i.isInner).length;
+ const all = document.getElementById('bm-tickall');
+ all.classList.toggle('on', n > 0 && n === inner);
+ all.classList.toggle('some', n > 0 && n < inner);
+ document.getElementById('bm-tickbar').style.display = n ? 'flex' : 'none';
+ document.getElementById('bm-hint').style.display = n ? 'none' : '';
+ document.getElementById('bm-tickcount').textContent = n === 1 ? tr('1 obstacle ticked') : tr('{n} obstacles ticked', { n });
+}
+// The ticked obstacles, deleted together after one confirmation; the outer boundary stays.
+function deleteTickedObstacles() {
+ const ticks = bmTickedRows();
+ if (!ticks.size || !boundary) return;
+ const rows = [...ticks].sort((x, y) => x - y), count = boundary.items.length;
+ const msg = rows.length === 1
+ ? tr('Delete the ticked obstacle? The outer boundary stays. This cannot be undone.')
+ : tr('Delete the {n} ticked obstacles? The outer boundary stays. This cannot be undone.', { n: rows.length });
+ showConfirm(tr('Delete obstacles'), msg, () => {
+ transport.send('boundary.deleteObstacles|' + count + ':' + rows.join(','));
+ bmTicks.clear();
+ renderBoundaryMenu();
+ });
+}
+document.getElementById('bm-tickall').addEventListener('pointerdown', e => {
+ e.stopPropagation();
+ const ticks = bmTickedRows();
+ const inner = boundary ? boundary.items.filter(i => i.isInner) : [];
+ if (!inner.length) { showToast(tr('The field has no obstacles')); return; }
+ if (ticks.size === inner.length) ticks.clear();
+ else for (const i of inner) ticks.add(i.index);
+ renderBoundaryMenu();
+});
+document.getElementById('bm-untick').addEventListener('pointerdown', e => { e.stopPropagation(); bmTicks.clear(); renderBoundaryMenu(); });
+document.getElementById('bm-delticked').addEventListener('pointerdown', e => { e.stopPropagation(); deleteTickedObstacles(); });
+// The rings ticked in the open boundary menu (the list and the rings share their index), outlined
+// red on the map. Every frame: the ticks were checked against the list when it last drew.
+function boundaryMenuTickedRings() {
+ return bmTicks.size && document.getElementById('boundarymenu').classList.contains('open') ? bmTicks : null;
+}
function choiceLabel(k) { return k === 1 ? tr('Go around') : k === 2 ? tr('Drive through') : tr('U-turn'); }
for (const h of document.querySelectorAll('#boundarymenu .bm-colhdr')) h.addEventListener('pointerdown', e => {
e.stopPropagation();
diff --git a/Shared/AgOpenWeb.RemoteServer/wwwroot/js/map-draw.js b/Shared/AgOpenWeb.RemoteServer/wwwroot/js/map-draw.js
index 517e2360..f9634ec5 100644
--- a/Shared/AgOpenWeb.RemoteServer/wwwroot/js/map-draw.js
+++ b/Shared/AgOpenWeb.RemoteServer/wwwroot/js/map-draw.js
@@ -615,6 +615,7 @@ function updateLineWidths() {
SKP.boundaryInner.setStrokeWidth(wb(3.0)); // boundaryInner 1 × 3
SKP.boundaryGoRound.setStrokeWidth(wb(3.0)); SKP.boundaryDriveThru.setStrokeWidth(wb(3.0));
SKP.boundarySel.setStrokeWidth(wb(3.0) + 5);
+ SKP.boundaryTicked.setStrokeWidth(wb(3.0) + 7);
SKP.boundaryOut.setStrokeWidth(3 * 2 * k); // out of bounds: AgOpenGPS ABLine.lineWidth × 3 (#494)
SKP.headland.setStrokeWidth(w(3.0)); // headland 1 × 3
SKP.guidance.setStrokeWidth(w(1.5)); // trackActive 0.5 × 3
diff --git a/Shared/AgOpenWeb.RemoteServer/wwwroot/js/skia-setup.js b/Shared/AgOpenWeb.RemoteServer/wwwroot/js/skia-setup.js
index 4891f3fd..6fadbddb 100644
--- a/Shared/AgOpenWeb.RemoteServer/wwwroot/js/skia-setup.js
+++ b/Shared/AgOpenWeb.RemoteServer/wwwroot/js/skia-setup.js
@@ -172,9 +172,10 @@ function buildSkPaints() {
// Widths are set per frame in updateLineWidths() (world metres × pxPerM).
boundary: mk('rgba(242,112,89,0.8)', 5), boundaryInner: mk('rgb(245,245,77)', 5), headland: mk('rgb(251,235,107)', 4),
// An obstacle's colour is its choice: a U-turn yellow (boundaryInner), go around blue, drive
- // through grey and dashed; the one selected in the boundary menu is outlined white.
+ // through grey and dashed; the one selected in the boundary menu is outlined white, the
+ // ones ticked there for deleting red.
boundaryGoRound: mk('rgb(77,208,245)', 5), boundaryDriveThru: mk('rgb(176,176,176)', 5, [6, 5]),
- boundarySel: mk('rgb(255,255,255)', 9),
+ boundarySel: mk('rgb(255,255,255)', 9), boundaryTicked: mk('rgb(229,57,53)', 11),
// Out of bounds (#494, AgOpenGPS CFence / OpenGL.Designer): every boundary thick and red,
// and an orange frame round the map.
boundaryOut: mk('rgb(242,64,64)', 6), outFrame: mk('rgb(255,168,84)', 8),
diff --git a/Shared/AgOpenWeb.RemoteWiring/RemoteServerWiring.cs b/Shared/AgOpenWeb.RemoteWiring/RemoteServerWiring.cs
index ace8b885..3294a51a 100644
--- a/Shared/AgOpenWeb.RemoteWiring/RemoteServerWiring.cs
+++ b/Shared/AgOpenWeb.RemoteWiring/RemoteServerWiring.cs
@@ -318,6 +318,19 @@ void CaptureBoundaryImagery(System.Collections.Generic.IReadOnlyList<(double E,
vm.RemoteSetObstacleAction(boi, boa);
return;
}
+ case "boundary.deleteObstacles": // arg = "rows:i,j,k": the obstacles on list
+ { // rows i, j, k, the list being that many rows long
+ var bdc = arg.IndexOf(':');
+ if (bdc <= 0 || !int.TryParse(arg[..bdc], out var bdn)) return;
+ var bdr = new List
();
+ foreach (var s in arg[(bdc + 1)..].Split(',', StringSplitOptions.RemoveEmptyEntries))
+ {
+ if (!int.TryParse(s, out var r)) return; // a bad row: nothing deleted
+ bdr.Add(r);
+ }
+ vm.RemoteDeleteObstacles(bdn, bdr);
+ return;
+ }
case "boundary.atObstacleAll": // arg = turn|goRound|driveThrough: every
if (AgOpenWeb.Models.ObstacleActionNames.Parse(arg) is { } baa) // obstacle (a
vm.RemoteSetAllObstacleActions(baa); // column title)
diff --git a/Shared/AgOpenWeb.ViewModels/MainViewModel.Obstacles.Remote.cs b/Shared/AgOpenWeb.ViewModels/MainViewModel.Obstacles.Remote.cs
index 311997c5..d1049c2e 100644
--- a/Shared/AgOpenWeb.ViewModels/MainViewModel.Obstacles.Remote.cs
+++ b/Shared/AgOpenWeb.ViewModels/MainViewModel.Obstacles.Remote.cs
@@ -10,7 +10,8 @@ namespace AgOpenWeb.ViewModels;
///
/// MainViewModel partial: the boundary list's choice per obstacle (what the tractor does at an
/// inner boundary, ), one row at a time or every obstacle at once
-/// from a column's title. Saved with the field like the drive-through and hard flags.
+/// from a column's title. Saved with the field like the drive-through and hard flags. Also the
+/// obstacles ticked in the list, deleted together.
///
public partial class MainViewModel
{
@@ -54,6 +55,54 @@ public void RemoteSetAllObstacleActions(ObstacleAction action)
StatusMessage = $"All {count} inner boundaries: {Describe(action)}";
}
+ ///
+ /// The obstacles on boundary list rows are deleted at once, with
+ /// one confirmation in the web client instead of one per row: a field's trees drawn again (a
+ /// tester had over 40 to delete one by one). Only obstacles: the outer boundary is never
+ /// deleted this way (on its own it can go only when it is the last one, as AgOpenGPS).
+ /// is how many rows the client's list had when the operator
+ /// ticked them; a list of another length (a row added or deleted in between) changes nothing,
+ /// as does a row that is not an obstacle, so a row number never names another obstacle. Fork only.
+ ///
+ public void RemoteDeleteObstacles(int listRowCount, IReadOnlyCollection listRows)
+ {
+ if (!TryLoadBoundaryForEdit(out var boundary, out var fieldPath)) return;
+ int rows = (boundary.OuterBoundary is { IsValid: true } ? 1 : 0) + boundary.InnerBoundaries.Count(b => b.IsValid);
+ if (listRowCount != rows)
+ {
+ ReportFailure("The boundary list changed: tick the obstacles again");
+ return;
+ }
+
+ var inner = new SortedSet();
+ foreach (int row in listRows)
+ {
+ int i = InnerIndexOfListRow(boundary, row);
+ if (i < 0)
+ {
+ ReportFailure("Only obstacles can be deleted together: nothing deleted");
+ return;
+ }
+ inner.Add(i);
+ }
+ if (inner.Count == 0)
+ {
+ ReportFailure("Tick the obstacles to delete");
+ return;
+ }
+
+ foreach (int i in inner.Reverse()) boundary.InnerBoundaries.RemoveAt(i);
+ SaveFieldBoundary(boundary, fieldPath);
+ RefreshBoundaryList();
+ SetCurrentBoundary(boundary);
+
+ // As one delete: with no boundary left, the background photo placed on it goes too.
+ bool left = boundary.OuterBoundary is { IsValid: true } || boundary.InnerBoundaries.Any(b => b.IsValid);
+ if (!left) DeleteBackgroundImage(fieldPath);
+ StatusMessage = (inner.Count == 1 ? "1 obstacle deleted" : $"{inner.Count} obstacles deleted")
+ + (left ? "" : "; background image removed");
+ }
+
private bool TryLoadBoundaryForEdit(out Boundary boundary, out string fieldPath)
{
boundary = null!;
diff --git a/Tests/AgOpenWeb.ViewModels.Tests/DeleteTickedObstaclesTests.cs b/Tests/AgOpenWeb.ViewModels.Tests/DeleteTickedObstaclesTests.cs
new file mode 100644
index 00000000..e5e9b8f3
--- /dev/null
+++ b/Tests/AgOpenWeb.ViewModels.Tests/DeleteTickedObstaclesTests.cs
@@ -0,0 +1,156 @@
+// AgOpenWeb
+// Copyright (C) 2024-2026 AgOpenWeb Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+using AgOpenWeb.Models;
+using AgOpenWeb.Models.Configuration;
+using AgOpenWeb.Services;
+using AgOpenWeb.Services.GeoJson;
+using NSubstitute;
+
+namespace AgOpenWeb.ViewModels.Tests;
+
+///
+/// The obstacles ticked in the boundary list are deleted together, after one confirmation in the
+/// web client (a tester redrawing a field's trees had over 40 to delete one by one). The outer
+/// boundary is never deleted this way, and a list that changed since the ticks were made (another
+/// length) or a row that is not an obstacle deletes nothing, so a row number never names another
+/// obstacle.
+///
+[TestFixture]
+[NonParallelizable] // ConfigurationStore is a singleton
+public class DeleteTickedObstaclesTests
+{
+ private string _root = null!;
+ private string _dir = null!;
+ private MainViewModelBuilder _b = null!;
+
+ private static BoundaryPolygon Square(double e0, double n0, double side)
+ {
+ var p = new BoundaryPolygon();
+ foreach (var (e, n) in new[] { (e0, n0), (e0 + side, n0), (e0 + side, n0 + side), (e0, n0 + side) })
+ p.Points.Add(new BoundaryPoint(e, n, 0));
+ p.UpdateBounds();
+ return p;
+ }
+
+ [SetUp]
+ public void SetUp()
+ {
+ ConfigurationStore.SetInstance(new ConfigurationStore());
+ _root = Path.Combine(Path.GetTempPath(), "aow-delticked-" + Guid.NewGuid().ToString("N"));
+ _dir = Path.Combine(_root, "F");
+ Directory.CreateDirectory(_dir);
+ var b = new Boundary { OuterBoundary = Square(0, 0, 200) };
+ b.InnerBoundaries.Add(Square(20, 20, 4)); // Inner 1, list row 1
+ b.InnerBoundaries.Add(Square(60, 20, 5)); // Inner 2, row 2
+ b.InnerBoundaries.Add(Square(100, 20, 6)); // Inner 3, row 3
+ b.InnerBoundaries.Add(Square(140, 20, 30)); // Inner 4, row 4: a big patch that stays
+ GeoJsonFieldService.Save(new Field
+ {
+ Name = "F", DirectoryPath = _dir, Origin = new Position { Latitude = 39.42, Longitude = -7.53 }, Boundary = b,
+ }, tracks: null);
+ _b = new MainViewModelBuilder { FieldService = new FieldService() };
+ _b.SettingsService.Settings.Returns(new AppSettings { FieldsDirectory = _root });
+ }
+
+ [TearDown]
+ public void TearDown()
+ {
+ try { Directory.Delete(_root, true); } catch { }
+ ConfigurationStore.SetInstance(new ConfigurationStore());
+ }
+
+ private static Boundary OnDisk(string dir) => new FieldService().LoadField(dir).Boundary!;
+
+ private async Task Open()
+ {
+ var vm = _b.Build();
+ await vm.OpenFieldAsync(_dir, "F");
+ vm.RefreshBoundaryList();
+ return vm;
+ }
+
+ private static double[] Easting(Boundary b) => b.InnerBoundaries.Select(i => i.Points.Min(p => p.Easting)).ToArray();
+
+ [Test]
+ public async Task The_ticked_obstacles_go_together_and_the_rest_stay()
+ {
+ var vm = await Open();
+ vm.SelectedBoundaryIndex = 2;
+
+ vm.RemoteDeleteObstacles(5, new[] { 3, 1 });
+
+ var disk = OnDisk(_dir);
+ Assert.Multiple(() =>
+ {
+ Assert.That(Easting(disk), Is.EqualTo(new double[] { 60, 140 }).Within(0.01), "Inner 1 and 3 gone, 2 and 4 kept, in order");
+ Assert.That(disk.OuterBoundary, Is.Not.Null.And.Property(nameof(BoundaryPolygon.IsValid)).True, "the outer boundary stays");
+ Assert.That(vm.State.Field.CurrentBoundary!.InnerBoundaries, Has.Count.EqualTo(2), "in the live boundary");
+ Assert.That(vm.BoundaryItems.Select(i => i.BoundaryType), Is.EqualTo(new[] { "Outer", "Inner 1", "Inner 2" }));
+ Assert.That(vm.SelectedBoundaryIndex, Is.EqualTo(-1), "the rows moved: nothing stays selected");
+ Assert.That(vm.StatusMessage, Is.EqualTo("2 obstacles deleted"));
+ });
+ }
+
+ [Test]
+ public async Task Every_obstacle_ticked_leaves_the_outer_boundary_alone()
+ {
+ var vm = await Open();
+
+ vm.RemoteDeleteObstacles(5, new[] { 1, 2, 3, 4 });
+
+ var disk = OnDisk(_dir);
+ Assert.That(disk.InnerBoundaries, Is.Empty);
+ Assert.That(disk.OuterBoundary!.IsValid, Is.True);
+ Assert.That(vm.BoundaryItems.Select(i => i.BoundaryType), Is.EqualTo(new[] { "Outer" }));
+ Assert.That(vm.StatusMessage, Is.EqualTo("4 obstacles deleted"));
+ }
+
+ [Test]
+ public async Task The_outer_boundary_among_the_rows_deletes_nothing()
+ {
+ var vm = await Open();
+
+ vm.RemoteDeleteObstacles(5, new[] { 0, 1 });
+
+ Assert.That(OnDisk(_dir).InnerBoundaries, Has.Count.EqualTo(4));
+ Assert.That(OnDisk(_dir).OuterBoundary!.IsValid, Is.True);
+ Assert.That(vm.StatusMessage, Does.Contain("Only obstacles"));
+ }
+
+ [Test]
+ public async Task A_list_of_another_length_deletes_nothing()
+ {
+ var vm = await Open();
+
+ vm.RemoteDeleteObstacles(4, new[] { 1 }); // ticked before a row was added or deleted
+
+ Assert.That(OnDisk(_dir).InnerBoundaries, Has.Count.EqualTo(4));
+ Assert.That(vm.StatusMessage, Does.Contain("list changed"));
+ }
+
+ [Test]
+ public async Task A_row_past_the_end_or_no_row_deletes_nothing()
+ {
+ var vm = await Open();
+
+ vm.RemoteDeleteObstacles(5, new[] { 1, 5 });
+ Assert.That(OnDisk(_dir).InnerBoundaries, Has.Count.EqualTo(4));
+
+ vm.RemoteDeleteObstacles(5, Array.Empty());
+ Assert.That(OnDisk(_dir).InnerBoundaries, Has.Count.EqualTo(4));
+ Assert.That(vm.StatusMessage, Does.Contain("Tick the obstacles"));
+ }
+
+ [Test]
+ public async Task A_row_ticked_twice_is_one_obstacle()
+ {
+ var vm = await Open();
+
+ vm.RemoteDeleteObstacles(5, new[] { 2, 2 });
+
+ Assert.That(Easting(OnDisk(_dir)), Is.EqualTo(new double[] { 20, 100, 140 }).Within(0.01));
+ Assert.That(vm.StatusMessage, Is.EqualTo("1 obstacle deleted"));
+ }
+}