debug tooltip showing how far an agent has traveled and how much

remains. seems to have small perf impact on initially calculating paths.
:(

abstutil/src/time.rs

@@ -391,6 +391,9 @@ impl<'a> std::ops::Drop for Timer<'a> {
             }
             self.println(String::new());
         }
+
+        // In case of lots of notes and warnings, repeat the overall timing.
+        Timer::selfless_println(&mut self.sink, self.results[0].clone());
     }
 }
 

geom/src/distance.rs

@@ -40,6 +40,10 @@ impl Distance {
         Distance::meters(1609.34 * value)
     }
 
+    pub fn centimeters(value: usize) -> Distance {
+        Distance::meters((value as f64) / 100.0)
+    }
+
     pub fn abs(self) -> Distance {
         if self.0 > 0.0 {
             self

map_model/src/pathfind/driving.rs

@@ -1,6 +1,7 @@
 use crate::pathfind::node_map::{deserialize_nodemap, NodeMap};
 use crate::{LaneID, LaneType, Map, Path, PathRequest, PathStep, TurnID};
 use fast_paths::{FastGraph, InputGraph, PathCalculator};
+use geom::Distance;
 use serde_derive::{Deserialize, Serialize};
 use std::cell::RefCell;
 use thread_local::ThreadLocal;
@@ -70,7 +71,12 @@ impl VehiclePathfinder {
             }));
         }
         steps.push(PathStep::Lane(req.end.lane()));
-        Some(Path::new(map, steps, req.end.dist_along()))
+        Some(Path::new(
+            map,
+            steps,
+            req.end.dist_along(),
+            Distance::centimeters(raw_path.get_weight()),
+        ))
     }
 
     pub fn apply_edits(&mut self, map: &Map) {

map_model/src/pathfind/mod.rs

@@ -88,11 +88,19 @@ impl PathStep {
 pub struct Path {
     steps: VecDeque<PathStep>,
     end_dist: Distance,
+
+    // Also track progress along the original path.
+    total_length: Distance,
+    crossed_so_far: Distance,
 }
 
 impl Path {
-    // TODO pub for DrawCarInput... bleh.
-    pub fn new(map: &Map, steps: Vec<PathStep>, end_dist: Distance) -> Path {
+    pub(crate) fn new(
+        map: &Map,
+        steps: Vec<PathStep>,
+        end_dist: Distance,
+        total_length: Distance,
+    ) -> Path {
         // Haven't seen problems here in a very long time. Noticeably saves some time to skip.
         if false {
             validate(map, &steps);
@@ -100,6 +108,8 @@ impl Path {
         Path {
             steps: VecDeque::from(steps),
             end_dist,
+            total_length,
+            crossed_so_far: Distance::ZERO,
         }
     }
 
@@ -114,6 +124,14 @@ impl Path {
         count
     }
 
+    pub fn crossed_so_far(&self) -> Distance {
+        self.crossed_so_far
+    }
+
+    pub fn total_length(&self) -> Distance {
+        self.total_length
+    }
+
     pub fn is_last_step(&self) -> bool {
         self.steps.len() == 1
     }
@@ -122,11 +140,14 @@ impl Path {
         self.steps.len() > 1
     }
 
-    pub fn shift(&mut self) -> PathStep {
-        self.steps.pop_front().unwrap()
+    pub fn shift(&mut self, map: &Map) -> PathStep {
+        let step = self.steps.pop_front().unwrap();
+        self.crossed_so_far += step.as_traversable().length(map);
+        step
     }
 
-    pub fn add(&mut self, step: PathStep) {
+    pub fn add(&mut self, step: PathStep, map: &Map) {
+        self.total_length += step.as_traversable().length(map);
         self.steps.push_back(step);
     }
 

map_model/src/pathfind/walking.rs

@@ -4,6 +4,7 @@ use crate::{
     PathRequest, PathStep, Position,
 };
 use fast_paths::{FastGraph, InputGraph, PathCalculator};
+use geom::Distance;
 use serde_derive::{Deserialize, Serialize};
 use std::cell::RefCell;
 use thread_local::ThreadLocal;
@@ -88,6 +89,7 @@ impl SidewalkPathfinder {
     pub fn pathfind(&self, req: &PathRequest, map: &Map) -> Option<Path> {
         // Special-case one-step paths.
         if req.start.lane() == req.end.lane() {
+            let len = map.get_l(req.start.lane()).length();
             // Weird case, but it can happen for walking from a building path to a bus stop that're
             // actually at the same spot.
             if req.start.dist_along() == req.end.dist_along() {
@@ -95,18 +97,21 @@ impl SidewalkPathfinder {
                     map,
                     vec![PathStep::Lane(req.start.lane())],
                     req.start.dist_along(),
+                    len,
                 ));
             } else if req.start.dist_along() < req.end.dist_along() {
                 return Some(Path::new(
                     map,
                     vec![PathStep::Lane(req.start.lane())],
                     req.end.dist_along(),
+                    len,
                 ));
             } else {
                 return Some(Path::new(
                     map,
                     vec![PathStep::ContraflowLane(req.start.lane())],
                     req.end.dist_along(),
+                    len,
                 ));
             }
         }
@@ -169,7 +174,12 @@ impl SidewalkPathfinder {
             unreachable!();
         }
 
-        Some(Path::new(map, steps, req.end.dist_along()))
+        Some(Path::new(
+            map,
+            steps,
+            req.end.dist_along(),
+            Distance::centimeters(raw_path.get_weight()),
+        ))
     }
 
     // Attempt the pathfinding and see if we should ride a bus.

sim/src/mechanics/driving.rs

@@ -776,10 +776,16 @@ impl DrivingSimState {
 
     pub fn tooltip_lines(&self, id: CarID, now: Duration) -> Option<Vec<String>> {
         let car = self.cars.get(&id)?;
+        let path = car.router.get_path();
         Some(vec![
             format!("{} on {}", id, car.router.head()),
             format!("Owned by {:?}", car.vehicle.owner),
-            format!("{} lanes left", car.router.get_path().num_lanes()),
+            format!("{} lanes left", path.num_lanes()),
+            format!(
+                "Crossed {} / {} of path",
+                path.crossed_so_far(),
+                path.total_length()
+            ),
             format!(
                 "Blocked for {}",
                 car.blocked_since.map(|t| now - t).unwrap_or(Duration::ZERO)

sim/src/mechanics/walking.rs

@@ -243,6 +243,11 @@ impl WalkingSimState {
         vec![
             format!("{} on {:?}", p.id, p.path.current_step()),
             format!("{} lanes left in path", p.path.num_lanes()),
+            format!(
+                "Crossed {} / {} of path",
+                p.path.crossed_so_far(),
+                p.path.total_length()
+            ),
             format!(
                 "Blocked for {}",
                 p.blocked_since.map(|t| now - t).unwrap_or(Duration::ZERO)
@@ -455,7 +460,7 @@ impl Pedestrian {
         }
 
         peds_per_traversable.remove(self.path.current_step().as_traversable(), self.id);
-        self.path.shift();
+        self.path.shift(map);
         let start_dist = match self.path.current_step() {
             PathStep::Lane(_) => Distance::ZERO,
             PathStep::ContraflowLane(l) => map.get_l(l).length(),

sim/src/router.rs

@@ -118,7 +118,7 @@ impl Router {
         parking: &ParkingSimState,
         map: &Map,
     ) -> Traversable {
-        let prev = self.path.shift().as_traversable();
+        let prev = self.path.shift(map).as_traversable();
         if self.last_step() {
             // Do this to trigger the side-effect of looking for parking.
             self.maybe_handle_end(Distance::ZERO, vehicle, parking, map);
@@ -228,7 +228,7 @@ impl Router {
             all_choices[0]
         };
         turns_attempted_while_roaming.insert(turn.id);
-        self.path.add(PathStep::Turn(turn.id));
-        self.path.add(PathStep::Lane(turn.id.dst));
+        self.path.add(PathStep::Turn(turn.id), map);
+        self.path.add(PathStep::Lane(turn.id.dst), map);
     }
 }