Untagged node and way validators

Author: CorruptComputer

Alidade.Osm/Validators/Warning/UntaggedNodeValidator.cs

@@ -0,0 +1,41 @@
+namespace Alidade.Osm.Validators.Warning;
+
+/// <summary>
+///   Warns when a locally edited node has no tags and is not a vertex of any way.
+///   Way vertices are geometry-only nodes and are expected to be untagged.
+/// </summary>
+public class UntaggedNodeValidator : ValidatorBase
+{
+    /// <inheritdoc />
+    public override string ValidatorName => "untagged_node";
+
+    /// <inheritdoc />
+    public override ValidationSeverities Severity => ValidationSeverities.Warning;
+
+    /// <inheritdoc />
+    public override IEnumerable<ValidationIssue> Check(EditBufferSnapshot snap, PresetService presets)
+    {
+        HashSet<long> vertexNodeIds = [];
+
+        foreach (OsmWay way in snap.Ways.Values)
+        {
+            foreach (long nodeId in way.NodeIds)
+            {
+                vertexNodeIds.Add(nodeId);
+            }
+        }
+
+        foreach (OsmNode node in snap.Nodes.Values)
+        {
+            if (!snap.EditStates.TryGetValue(node.Ref, out EditState es) || es == EditState.Fetched)
+            {
+                continue;
+            }
+
+            if (node.Tags.Count == 0 && !vertexNodeIds.Contains(node.Id))
+            {
+                yield return new(Severity, ValidatorName, $"Node {node.Id} has no tags", node.Ref, false);
+            }
+        }
+    }
+}

Alidade.Osm/Validators/Warning/UntaggedWayValidator.cs

@@ -0,0 +1,48 @@
+namespace Alidade.Osm.Validators.Warning;
+
+/// <summary>
+///   Warns when a locally edited way has no meaningful tags and is not a member of any relation.
+///   A way with only <c>area=yes</c> is treated as untagged because <c>area=yes</c> is a
+///   geometry hint, not a descriptive tag.
+/// </summary>
+public class UntaggedWayValidator : ValidatorBase
+{
+    /// <inheritdoc />
+    public override string ValidatorName => "untagged_way";
+
+    /// <inheritdoc />
+    public override ValidationSeverities Severity => ValidationSeverities.Warning;
+
+    /// <inheritdoc />
+    public override IEnumerable<ValidationIssue> Check(EditBufferSnapshot snap, PresetService presets)
+    {
+        HashSet<long> wayIdsInRelations = [];
+
+        foreach (OsmRelation relation in snap.Relations.Values)
+        {
+            foreach (OsmMember member in relation.Members)
+            {
+                if (member.Type == OsmElementTypes.Way)
+                {
+                    wayIdsInRelations.Add(member.Ref);
+                }
+            }
+        }
+
+        foreach (OsmWay way in snap.Ways.Values)
+        {
+            if (!snap.EditStates.TryGetValue(way.Ref, out EditState es) || es == EditState.Fetched)
+            {
+                continue;
+            }
+
+            bool isUntagged = way.Tags.Count == 0
+                || (way.Tags.Count == 1 && way.Tags.GetValueOrDefault("area") == "yes");
+
+            if (isUntagged && !wayIdsInRelations.Contains(way.Id))
+            {
+                yield return new(Severity, ValidatorName, $"Way {way.Id} has no tags", way.Ref, false);
+            }
+        }
+    }
+}

Alidade/Components/Panels/ValidationPanel.razor.cs

@@ -16,7 +16,7 @@ protected override void OnInitialized()
         validationState.StateChanged += OnStateChanged;
     }
 
-    private void OnStateChanged(object? sender, EventArgs e) => StateHasChanged();
+    private void OnStateChanged(object? sender, EventArgs e) => _ = InvokeAsync(StateHasChanged);
 
     private void Close()
         => _ = mediator.Send(new Handlers.Validation.ToggleValidationPanel.Command());

Alidade/Components/Toolbar.razor.cs

@@ -34,7 +34,7 @@ protected override void OnInitialized()
         validationState.StateChanged += OnStateChanged;
     }
 
-    private void OnStateChanged(object? sender, EventArgs e) => StateHasChanged();
+    private void OnStateChanged(object? sender, EventArgs e) => _ = InvokeAsync(StateHasChanged);
 
     private void SetTool(ActiveTools tool)
         => _ = mediator.Send(new Handlers.Tool.SetActiveTool.Command(tool));

Alidade/Handlers/Validation/ValidationResults.cs

@@ -1,20 +1,21 @@
-using Microsoft.AspNetCore.Components;
-
 namespace Alidade.Handlers.Validation;
 
 /// <inheritdoc />
-public class ValidationResults(ValidationStateService validationState, Dispatcher dispatcher) : INotificationHandler<ValidationResults.Notification>
+public class ValidationResults(ValidationStateService validationState) : INotificationHandler<ValidationResults.Notification>
 {
     /// <summary>
     ///   Replaces the issue list with the results of a completed validation pass.
     /// </summary>
     public record Notification(IReadOnlyList<ValidationIssue> Issues) : NotificationBase;
 
     /// <inheritdoc />
-    public async Task Handle(Notification notification, CancellationToken cancellationToken)
-        => await dispatcher.InvokeAsync(() => validationState.SetState(validationState.State with
+    public Task Handle(Notification notification, CancellationToken cancellationToken)
+    {
+        validationState.SetState(validationState.State with
         {
             Issues = [.. notification.Issues],
             IsRunning = false
-        }));
+        });
+        return Task.CompletedTask;
+    }
 }

Alidade/Handlers/Validation/ValidationStarted.cs

@@ -1,16 +1,17 @@
-using Microsoft.AspNetCore.Components;
-
 namespace Alidade.Handlers.Validation;
 
 /// <inheritdoc />
-public class ValidationStarted(ValidationStateService validationState, Dispatcher dispatcher) : INotificationHandler<ValidationStarted.Notification>
+public class ValidationStarted(ValidationStateService validationState) : INotificationHandler<ValidationStarted.Notification>
 {
     /// <summary>
     ///   Marks validation as running.
     /// </summary>
     public record Notification : NotificationBase;
 
     /// <inheritdoc />
-    public async Task Handle(Notification notification, CancellationToken cancellationToken)
-        => await dispatcher.InvokeAsync(() => validationState.SetState(validationState.State with { IsRunning = true }));
+    public Task Handle(Notification notification, CancellationToken cancellationToken)
+    {
+        validationState.SetState(validationState.State with { IsRunning = true });
+        return Task.CompletedTask;
+    }
 }

Alidade/Services/ValidationService.cs

@@ -29,6 +29,8 @@ public sealed class ValidationService : IAsyncDisposable
         new GeometryMismatchValidator(),
         new TagLengthValidator(),
         new DeprecatedTagValidator(),
+        new UntaggedWayValidator(),
+        new UntaggedNodeValidator(),
         // Info
         new SuspiciousNameValidator(),
     ];