Introduce crossing=no and crossing=informal for QA

- `is_crossing` now includes all `crossing=*`, including "informal"
- `is_explicit_crossing_no` (new) handles `crossing=no`
- on the QA map, `crossing=no` are purple circles
- …they are part of the count of crossings on a junction
- A junction is "green" when the sum of crossings and `crossing=no` are the same as edges
- The UI shows the crossings and `crossing=no` in the sentence

Author: tordans

backend/src/audit.rs

@@ -26,16 +26,28 @@ impl Speedwalk {
                 let edge = &graph.edges[&e];
                 debug_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();
-            for n in junction.crossings {
+            for n in &junction.crossings {
                 debug_crossings.push(
                     self.mercator
-                        .to_wgs84_gj(&Point::from(self.derived_nodes[&n].pt)),
+                        .to_wgs84_gj(&Point::from(self.derived_nodes[n].pt)),
                 );
             }
-            f.set_property("complete", debug_arms.len() == debug_crossings.len());
+            let mut debug_explicit_non_crossings = Vec::new();
+            for n in &junction.explicit_non_crossings {
+                debug_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);
 
             features.push(f);
         }
@@ -57,6 +69,7 @@ impl Speedwalk {
             let mut any_severances = false;
             let mut arms = Vec::new();
             let mut crossings = BTreeSet::new();
+            let mut explicit_non_crossings = BTreeSet::new();
             for e in &intersection.edges {
                 let edge = &graph.edges[e];
                 let way = &self.derived_ways[&edge.osm_way];
@@ -68,10 +81,26 @@ impl Speedwalk {
                 }
                 arms.push(*e);
 
-                // TODO Simple definition of "nearby crossings", with both false positives and
-                // negatives
-                for n in &edge.node_ids {
-                    if self.derived_nodes[n].is_crossing() {
+                // Iterate along the edge away from the intersection, stopping at crossing=no
+                let node_iter: Box<dyn Iterator<Item = &NodeID>> = if edge.src == *i {
+                    // Iterate forward from src to dst
+                    Box::new(edge.node_ids.iter().skip(1))
+                } else if edge.dst == *i {
+                    // 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())
+                };
+
+                for n in node_iter {
+                    let node = &self.derived_nodes[n];
+                    if node.is_explicit_crossing_no() {
+                        explicit_non_crossings.insert(*n);
+                        // Stop iterating along this edge when we hit crossing=no
+                        break;
+                    }
+                    if node.is_crossing() {
                         crossings.insert(*n);
                     }
                 }
@@ -82,6 +111,7 @@ impl Speedwalk {
                     i: *i,
                     arms,
                     crossings,
+                    explicit_non_crossings,
                 });
             }
         }
@@ -93,4 +123,5 @@ struct Junction {
     i: IntersectionID,
     arms: Vec<EdgeID>,
     crossings: BTreeSet<NodeID>,
+    explicit_non_crossings: BTreeSet<NodeID>,
 }

backend/src/lib.rs

@@ -87,10 +87,18 @@ pub struct Way {
 
 impl Node {
     pub fn is_crossing(&self) -> bool {
+        // Include any node with a crossing tag value != "no" (informal, traffic_signals, yes, etc.)
+        if let Some(value) = self.tags.get("crossing") {
+            return value != "no";
+        }
         self.tags.is("highway", "crossing")
             || (self.tags.is("highway", "traffic_signals")
                 && self.tags.is("crossing", "traffic_signals"))
     }
+
+    pub fn is_explicit_crossing_no(&self) -> bool {
+        self.tags.is("crossing", "no")
+    }
 }
 
 impl Way {

backend/src/wasm.rs

@@ -57,6 +57,7 @@ impl Speedwalk {
                 f.set_property("tags", serde_json::to_value(&node.tags).map_err(err_to_js)?);
             }
             f.set_property("is_crossing", node.is_crossing());
+            f.set_property("is_explicit_crossing_no", node.is_explicit_crossing_no());
             f.set_property("modified", node.modified);
             f.set_property(
                 "way_ids",

web/src/crossings/AuditCrossingsMode.svelte

@@ -28,10 +28,15 @@
   $: debugCrossings = hovered
     ? JSON.parse(hovered.properties!.crossings)
     : emptyGeojson();
+  $: debugExplicitNonCrossings = hovered
+    ? JSON.parse(hovered.properties!.explicit_non_crossings)
+    : emptyGeojson();
+  $: crossingCount = hovered?.properties?.crossing_count ?? 0;
+  $: explicitNonCrossingCount = hovered?.properties?.explicit_non_crossing_count ?? 0;
 
   let crossingNodes = JSON.parse($backend!.getNodes()) as FeatureCollection;
   crossingNodes.features = crossingNodes.features.filter(
-    (f) => f.properties!.is_crossing,
+    (f) => f.properties!.is_crossing || f.properties!.is_explicit_crossing_no,
   );
 </script>
 
@@ -48,8 +53,9 @@
 
     {#if hovered}
       <p class="mt-5">
-        Junction has {debugArms.features.length} arms, {debugCrossings.features
-          .length} crossings
+        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}
       </p>
     {/if}
   </div>
@@ -78,7 +84,12 @@
         manageHoverState
         paint={{
           "circle-radius": 7,
-          "circle-color": "yellow",
+          "circle-color": [
+            "case",
+            ["get", "is_explicit_crossing_no"],
+            "purple",
+            "yellow",
+          ],
           "circle-opacity": hoverStateFilter(0.3, 1.0),
           "circle-stroke-color": "black",
           "circle-stroke-width": 1,
@@ -111,5 +122,16 @@
         }}
       />
     </GeoJSON>
+
+    <GeoJSON data={debugExplicitNonCrossings}>
+      <CircleLayer
+        paint={{
+          "circle-radius": 10,
+          "circle-opacity": 0,
+          "circle-stroke-color": "purple",
+          "circle-stroke-width": 3,
+        }}
+      />
+    </GeoJSON>
   </div>
 </SplitComponent>

web/src/sidewalks/index.ts

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