Small fixes for crossing audit

Author: dabreegster

backend/src/audit.rs

@@ -21,33 +21,38 @@ impl Speedwalk {
                 .mercator
                 .to_wgs84_gj(&graph.intersections[&junction.i].point);
 
-            let mut debug_arms = Vec::new();
+            let mut arms = Vec::new();
             for e in junction.arms {
                 let edge = &graph.edges[&e];
-                debug_arms.push(self.mercator.to_wgs84_gj(&edge.linestring));
+                arms.push(self.mercator.to_wgs84_gj(&edge.linestring));
             }
-            let crossing_count = junction.crossings.len();
-            let explicit_non_crossing_count = junction.explicit_non_crossings.len();
-            let mut debug_crossings = Vec::new();
+
+            let mut crossings = Vec::new();
             for n in &junction.crossings {
-                debug_crossings.push(
+                crossings.push(
                     self.mercator
                         .to_wgs84_gj(&Point::from(self.derived_nodes[n].pt)),
                 );
             }
-            let mut debug_explicit_non_crossings = Vec::new();
+
+            let mut explicit_non_crossings = Vec::new();
             for n in &junction.explicit_non_crossings {
-                debug_explicit_non_crossings.push(
+                explicit_non_crossings.push(
                     self.mercator
                         .to_wgs84_gj(&Point::from(self.derived_nodes[n].pt)),
                 );
             }
-            f.set_property("complete", debug_arms.len() == crossing_count + explicit_non_crossing_count);
-            f.set_property("arms", GeoJson::from(debug_arms));
-            f.set_property("crossings", GeoJson::from(debug_crossings));
-            f.set_property("explicit_non_crossings", GeoJson::from(debug_explicit_non_crossings));
-            f.set_property("crossing_count", crossing_count);
-            f.set_property("explicit_non_crossing_count", explicit_non_crossing_count);
+
+            f.set_property(
+                "complete",
+                arms.len() == crossings.len() + explicit_non_crossings.len(),
+            );
+            f.set_property("arms", GeoJson::from(arms));
+            f.set_property("crossings", GeoJson::from(crossings));
+            f.set_property(
+                "explicit_non_crossings",
+                GeoJson::from(explicit_non_crossings),
+            );
 
             features.push(f);
         }
@@ -89,8 +94,7 @@ impl Speedwalk {
                     // Iterate backward from dst to src
                     Box::new(edge.node_ids.iter().rev().skip(1))
                 } else {
-                    // Shouldn't happen, but fallback to all nodes
-                    Box::new(edge.node_ids.iter())
+                    unreachable!()
                 };
 
                 for n in node_iter {
@@ -102,6 +106,8 @@ impl Speedwalk {
                     }
                     if node.is_crossing() {
                         crossings.insert(*n);
+                        // Stop iterating along this edge when we hit the first crossing
+                        break;
                     }
                 }
             }

web/src/crossings/AuditCrossingsMode.svelte

@@ -31,8 +31,8 @@
   $: debugExplicitNonCrossings = hovered
     ? JSON.parse(hovered.properties!.explicit_non_crossings)
     : emptyGeojson();
-  $: crossingCount = hovered?.properties?.crossing_count ?? 0;
-  $: explicitNonCrossingCount = hovered?.properties?.explicit_non_crossing_count ?? 0;
+  $: crossingCount = debugCrossings.features.length;
+  $: explicitNonCrossingCount = debugExplicitNonCrossings.features.length;
 
   let crossingNodes = JSON.parse($backend!.getNodes()) as FeatureCollection;
   crossingNodes.features = crossingNodes.features.filter(
@@ -54,8 +54,13 @@
     {#if hovered}
       <p class="mt-5">
         Junction has {debugArms.features.length} arms,
-        {crossingCount} crossing{#if crossingCount !== 1}s{/if}
-        {#if explicitNonCrossingCount > 0}, {explicitNonCrossingCount} explicit non-crossing{#if explicitNonCrossingCount !== 1}s{/if}{/if}
+        {crossingCount}
+        {crossingCount == 1 ? "crossing" : "crossings"}
+        {#if explicitNonCrossingCount > 0}
+          , {explicitNonCrossingCount} explicit {explicitNonCrossingCount == 1
+            ? "non-crossing"
+            : "non-crossings"}
+        {/if}
       </p>
     {/if}
   </div>

web/src/sidewalks/index.ts

@@ -6,7 +6,7 @@ export interface NodeProps {
   id: number;
   tags?: Record<string, string>;
   is_crossing: boolean;
-  is_explicit_crossing_no?: boolean;
+  is_explicit_crossing_no: boolean;
   modified: boolean;
   way_ids: number[];
   problems: Problem[];