Change the start time

backend/src/isochrone.rs

@@ -16,13 +16,21 @@ pub fn calculate(
     mode: Mode,
     contours: bool,
     public_transit: bool,
+    start_time: NaiveTime,
     mut timer: Timer,
 ) -> Result<String> {
     // 15 minutes
     let limit = Duration::from_secs(15 * 60);
 
     timer.step("get_costs");
-    let cost_per_road = get_costs(graph, req, mode, public_transit, limit);
+    let cost_per_road = get_costs(
+        graph,
+        req,
+        mode,
+        public_transit,
+        start_time,
+        start_time + limit,
+    );
     timer.push("render to GJ");
 
     // Show cost per road
@@ -58,12 +66,9 @@ fn get_costs(
     req: Coord,
     mode: Mode,
     public_transit: bool,
-    limit: Duration,
+    start_time: NaiveTime,
+    end_time: NaiveTime,
 ) -> HashMap<RoadID, Duration> {
-    // TODO plumb in
-    let start_time = NaiveTime::from_hms_opt(7, 0, 0).unwrap();
-    let end_time = start_time + limit;
-
     let start = graph.closest_intersection[mode]
         .nearest_neighbor(&[req.x, req.y])
         .unwrap()

backend/src/lib.rs

@@ -5,6 +5,7 @@ extern crate log;
 
 use std::sync::Once;
 
+use chrono::NaiveTime;
 use geo::Coord;
 use serde::Deserialize;
 use wasm_bindgen::prelude::*;
@@ -95,6 +96,7 @@ impl MapModel {
             mode,
             req.contours,
             req.mode == "transit",
+            NaiveTime::parse_from_str(&req.start_time, "%H:%M").map_err(err_to_js)?,
             Timer::new("isochrone request", None),
         )
         .map_err(err_to_js)
@@ -135,6 +137,7 @@ impl MapModel {
                 end,
                 req.debug_search,
                 req.use_heuristic,
+                NaiveTime::parse_from_str(&req.start_time, "%H:%M").map_err(err_to_js)?,
                 Timer::new("route request", None),
             )
             .map_err(err_to_js)
@@ -152,6 +155,7 @@ pub struct IsochroneRequest {
     y: f64,
     mode: String,
     contours: bool,
+    start_time: String,
 }
 
 #[derive(Deserialize)]
@@ -164,6 +168,7 @@ pub struct RouteRequest {
     // TODO Only works for transit
     debug_search: bool,
     use_heuristic: bool,
+    start_time: String,
 }
 
 fn err_to_js<E: std::fmt::Display>(err: E) -> JsValue {

backend/src/transit_route.rs

@@ -21,10 +21,9 @@ pub fn route(
     // like a good idea yet
     debug_search: bool,
     use_heuristic: bool,
+    start_time: NaiveTime,
     mut timer: Timer,
 ) -> Result<String> {
-    // TODO We'll need a start time too (and a day of the week)
-    let start_time = NaiveTime::from_hms_opt(7, 0, 0).unwrap();
     if start == end {
         bail!("start = end");
     }

web/src/IsochroneMode.svelte

@@ -13,6 +13,7 @@
   import { onMount } from "svelte";
 
   let travelMode: TravelMode = "foot";
+  let startTime = "07:00";
 
   let start: { lng: number; lat: number } | null = null;
   onMount(async () => {
@@ -35,13 +36,15 @@
     _x: { lng: number; lat: number } | null,
     _y: TravelMode,
     _z: boolean,
+    _t: string,
   ) {
     if (start) {
       try {
         isochroneGj = await $backend!.isochrone({
           start,
           mode: travelMode,
           contours,
+          startTime,
         });
         err = "";
       } catch (err: any) {
@@ -50,11 +53,12 @@
       }
     }
   }
-  $: updateIsochrone(start, travelMode, contours);
+  $: updateIsochrone(start, travelMode, contours, startTime);
 
   async function updateRoute(
     x: { lng: number; lat: number } | null,
     _y: Feature<Point> | null,
+    _t: string,
   ) {
     if (start && hoveredAmenity) {
       try {
@@ -64,6 +68,7 @@
           mode: travelMode,
           debugSearch: false,
           useHeuristic: false,
+          startTime,
         });
         err = "";
       } catch (err: any) {
@@ -74,7 +79,7 @@
       routeGj = null;
     }
   }
-  $: updateRoute(start, hoveredAmenity);
+  $: updateRoute(start, hoveredAmenity, startTime);
 
   function lerp(pct: number, a: number, b: number): number {
     return a + pct * (b - a);
@@ -102,6 +107,11 @@
 
     <PickTravelMode bind:travelMode />
 
+    <label>
+      Start time (PT only)
+      <input type="time" bind:value={startTime} />
+    </label>
+
     <label><input type="checkbox" bind:checked={contours} />Contours</label>
 
     <SequentialLegend {colorScale} limits={limitsMinutes} />

web/src/RouteMode.svelte

@@ -17,6 +17,7 @@
 
   let travelMode: TravelMode = "foot";
   let useHeuristic = true;
+  let startTime = "07:00";
 
   let start: { lng: number; lat: number } | null = null;
   let end: { lng: number; lat: number } | null = null;
@@ -41,6 +42,7 @@
     _y: { lng: number; lat: number } | null,
     mode: TravelMode,
     _z: boolean,
+    _t: string,
   ) {
     if (start && end) {
       try {
@@ -50,6 +52,7 @@
           mode,
           debugSearch: false,
           useHeuristic,
+          startTime,
         });
         err = "";
       } catch (error: any) {
@@ -58,7 +61,7 @@
       }
     }
   }
-  $: updateRoute(start, end, travelMode, useHeuristic);
+  $: updateRoute(start, end, travelMode, useHeuristic, startTime);
 
   function onRightClick(e: CustomEvent<MapMouseEvent>) {
     // Move the first marker, for convenience
@@ -77,6 +80,7 @@
         mode: travelMode,
         debugSearch: true,
         useHeuristic,
+        startTime,
       });
       $mode = {
         kind: "debug-route",
@@ -102,11 +106,19 @@
         >Isochrone mode</button
       >
     </div>
+
     <PickTravelMode bind:travelMode />
+
     <label>
       <input type="checkbox" bind:checked={useHeuristic} />
-      Use heuristic
+      Use heuristic (PT only)
+    </label>
+
+    <label>
+      Start time (PT only)
+      <input type="time" bind:value={startTime} />
     </label>
+
     <p>
       Move the <b>A</b> and <b>B</b> pins to find a route. (Hint: right-click to
       set the first pin somewhere.)
@@ -119,10 +131,15 @@
         {#each gj.features as f}
           {@const props = notNull(f.properties)}
           {#if props.kind == "road"}
-            <li>Walk</li>
+            {#if props.time1}
+              <li>[{props.time1} - {props.time2}] Walk</li>
+            {:else}
+              <li>Walk / cycle / drive</li>
+            {/if}
           {:else}
             <li>
-              Take {props.route} for {props.num_stops} stops
+              [{props.time1} - {props.time2}] Take {props.route} for {props.num_stops}
+              stops
             </li>
           {/if}
         {/each}

web/src/worker.ts

@@ -67,6 +67,7 @@ export class Backend {
     start: { lng: number; lat: number };
     mode: TravelMode;
     contours: boolean;
+    startTime: string;
   }): FeatureCollection {
     if (!this.inner) {
       throw new Error("Backend used without a file loaded");
@@ -78,6 +79,7 @@ export class Backend {
         y: req.start.lat,
         mode: req.mode,
         contours: req.contours,
+        start_time: req.startTime,
       }),
     );
   }
@@ -89,6 +91,7 @@ export class Backend {
     mode: TravelMode;
     debugSearch: boolean;
     useHeuristic: boolean;
+    startTime: string;
   }): FeatureCollection {
     if (!this.inner) {
       throw new Error("Backend used without a file loaded");
@@ -103,6 +106,7 @@ export class Backend {
         mode: req.mode,
         debug_search: req.debugSearch,
         use_heuristic: req.useHeuristic,
+        start_time: req.startTime,
       }),
     );
   }