Click to switch routes! #743

Some quirks, but finally got this working.

game/src/ungap/route/mod.rs

@@ -1,3 +1,4 @@
+use map_model::RoutingParams;
 use widgetry::{EventCtx, GfxCtx, Outcome, Panel, Slider, State, TextExt, Widget};
 
 use self::results::{AltRouteResults, RouteResults};
@@ -45,15 +46,39 @@ impl RoutePlanner {
         Box::new(rp)
     }
 
-    fn update_input_panel(&mut self, ctx: &mut EventCtx, app: &App) {
+    fn recalculate_routes(&mut self, ctx: &mut EventCtx, app: &App) {
+        // Use the current session settings to determine "main" and alts
         self.main_route = RouteResults::main_route(ctx, app, self.waypoints.get_waypoints());
+
         self.alt_routes.clear();
-        let low_stress =
-            AltRouteResults::low_stress(ctx, app, self.waypoints.get_waypoints(), &self.main_route);
-        if low_stress.results.stats != self.main_route.stats {
-            self.alt_routes.push(low_stress);
+        for (name, params) in [
+            ("default", RoutingParams::default()),
+            (
+                "low-stress",
+                RoutingParams {
+                    avoid_high_stress: 2.0,
+                    ..Default::default()
+                },
+            ),
+        ] {
+            if app.session.routing_params == params {
+                continue;
+            }
+            let alt = AltRouteResults::new(
+                ctx,
+                app,
+                self.waypoints.get_waypoints(),
+                &self.main_route,
+                name,
+                params,
+            );
+            if alt.results.stats != self.main_route.stats {
+                self.alt_routes.push(alt);
+            }
+        }
     }
 
+    fn update_input_panel(&mut self, ctx: &mut EventCtx, app: &App) {
         let col = Widget::col(vec![
             self.files.get_panel_widget(ctx),
             Widget::col(vec![
@@ -92,6 +117,7 @@ impl RoutePlanner {
     fn sync_from_file_management(&mut self, ctx: &mut EventCtx, app: &App) {
         self.waypoints
             .overwrite(ctx, app, self.files.current.waypoints.clone());
+        self.recalculate_routes(ctx, app);
         self.update_input_panel(ctx, app);
     }
 }
@@ -112,7 +138,10 @@ impl State<App> for RoutePlanner {
             r.event(ctx);
             focused_on_alt_route |= r.has_focus();
             if r.has_focus() && ctx.normal_left_click() {
-                println!("SWITCH");
+                // Switch routes
+                app.session.routing_params = r.results.params.clone();
+                self.recalculate_routes(ctx, app);
+                self.update_input_panel(ctx, app);
                 return Transition::Keep;
             }
         }
@@ -139,6 +168,7 @@ impl State<App> for RoutePlanner {
                         .get_percent();
                 app.session.routing_params.avoid_high_stress =
                     MAX_AVOID_PARAM * self.input_panel.slider("avoid_high_stress").get_percent();
+                self.recalculate_routes(ctx, app);
                 self.update_input_panel(ctx, app);
                 return Transition::Keep;
             }
@@ -158,6 +188,7 @@ impl State<App> for RoutePlanner {
             // Sync from waypoints to file management
             // TODO Maaaybe this directly live in the InputWaypoints system?
             self.files.current.waypoints = self.waypoints.get_waypoints();
+            self.recalculate_routes(ctx, app);
             self.update_input_panel(ctx, app);
         }
 

game/src/ungap/route/results.rs

@@ -46,10 +46,13 @@ pub struct RouteStats {
 }
 
 impl RouteResults {
+    /// "main" is determined by `app.session.routing_params`
     pub fn main_route(ctx: &mut EventCtx, app: &App, waypoints: Vec<TripEndpoint>) -> RouteResults {
         RouteResults::new(
             ctx,
             app,
+            // TODO Actually we want to plumb around the name of those too... probably just want an
+            // enum and to ditch the custom params
             "main",
             waypoints,
             Color::CYAN,
@@ -399,23 +402,15 @@ pub struct AltRouteResults {
 }
 
 impl AltRouteResults {
-    pub fn low_stress(
+    pub fn new(
         ctx: &mut EventCtx,
         app: &App,
         waypoints: Vec<TripEndpoint>,
         main: &RouteResults,
+        name: &str,
+        params: RoutingParams,
     ) -> AltRouteResults {
-        let results = RouteResults::new(
-            ctx,
-            app,
-            "low-stress",
-            waypoints,
-            Color::grey(0.3),
-            RoutingParams {
-                avoid_high_stress: 2.0,
-                ..Default::default()
-            },
-        );
+        let results = RouteResults::new(ctx, app, name, waypoints, Color::grey(0.3), params);
         let tooltip = compare_routes(app, &main.stats, &results.stats, &results.name);
         AltRouteResults {
             results,