MAX_HOURS_PER_DAY

Author: Azgaar

src/controllers/journey/journeys-overview.ts

@@ -15,6 +15,7 @@ import { Layers } from "@/components/layers";
 import { tip } from "@/components/tooltips";
 import { Controllers } from "@/controllers";
 import { cellEndpointLabel, getCellPoint } from "@/controllers/journey/journey-cell-labels";
+import { MAX_HOURS_PER_DAY } from "@/generators/transports-generator";
 import { startJourneyTravel, stopJourneyTravel } from "@/renderers/journey-travel";
 import { highlightElement } from "@/renderers/overlays/highlight";
 import type { Journey } from "@/types/Journey";
@@ -199,7 +200,7 @@ function renderJourneysPage(view: TableView<Journey>): void {
   const totalHours = sum(totals.map(t => t.totalHours));
   // days are counted per transport, so the rate that reproduces them is what the total formats with
   const totalDays = sum(totals.map(t => t.totalDays));
-  const footerHoursPerDay = totalDays > 0 ? totalHours / totalDays : undefined;
+  const footerHoursPerDay = totalDays > 0 ? totalHours / totalDays : MAX_HOURS_PER_DAY;
   const footerTime = ensureEl("journeysFooterTime");
   footerTime.innerHTML = Journeys.formatTravelTime(totalHours, footerHoursPerDay);
   footerTime.parentElement!.dataset.tip = `Total travel time: ${Journeys.formatTravelTimeFull(totalHours, footerHoursPerDay)}. Days are counted from each transport's travel hours`;

src/generators/journeys-generator.test.ts

@@ -85,18 +85,18 @@ describe("journey metrics", () => {
     expect(Journeys.formatTravelTime(t.totalHours, t.hoursPerDay)).toBe("4d");
   });
 
-  it("formatTravelTime handles days/hours/minutes with default 8h/day", () => {
-    expect(Journeys.formatTravelTime(0)).toBe("0m");
-    expect(Journeys.formatTravelTime(0.5)).toBe("30m");
-    expect(Journeys.formatTravelTime(1.5)).toBe("1h 30m");
+  it("formatTravelTime handles days/hours/minutes", () => {
+    expect(Journeys.formatTravelTime(0, 8)).toBe("0m");
+    expect(Journeys.formatTravelTime(0.5, 8)).toBe("30m");
+    expect(Journeys.formatTravelTime(1.5, 8)).toBe("1h 30m");
     // 25h at 8h/day = 3d 1h
-    expect(Journeys.formatTravelTime(25)).toBe("3d 1h");
+    expect(Journeys.formatTravelTime(25, 8)).toBe("3d 1h");
   });
 
   it("formatTravelTime drops the smaller unit once the larger dominates", () => {
-    expect(Journeys.formatTravelTime(2400)).toBe("300d"); // 300 travel days at 8h/day
-    expect(Journeys.formatTravelTime(2404.15)).toBe("300d"); // the odd hours are noise
-    expect(Journeys.formatTravelTime(75)).toBe("9d 3h"); // under 10 days, hours still matter
+    expect(Journeys.formatTravelTime(2400, 8)).toBe("300d"); // 300 travel days at 8h/day
+    expect(Journeys.formatTravelTime(2404.15, 8)).toBe("300d"); // the odd hours are noise
+    expect(Journeys.formatTravelTime(75, 8)).toBe("9d 3h"); // under 10 days, hours still matter
     expect(Journeys.formatTravelTime(11.5, 24)).toBe("11h"); // hours-only above the threshold
     expect(Journeys.formatTravelTime(3.25, 24)).toBe("3h 15m"); // below it, minutes still show
   });
@@ -107,8 +107,8 @@ describe("journey metrics", () => {
   });
 
   it("formatTravelTimeFull keeps every unit for the tooltip", () => {
-    expect(Journeys.formatTravelTimeFull(2404.15)).toBe("300d 4h 9m");
-    expect(Journeys.formatTravelTimeFull(0)).toBe("0m");
+    expect(Journeys.formatTravelTimeFull(2404.15, 8)).toBe("300d 4h 9m");
+    expect(Journeys.formatTravelTimeFull(0, 8)).toBe("0m");
     expect(Journeys.formatTravelTimeFull(25, 24)).toBe("1d 1h");
   });
 

src/generators/journeys-generator.ts

@@ -5,9 +5,8 @@ import { getCardinalColor } from "../utils/colorUtils";
 import type { Burg } from "./burgs-generator";
 import { generateStoryJourney } from "./journey-story";
 import type { Route } from "./routes-generator";
-import type { TransportDomain } from "./transports-generator";
+import { MAX_HOURS_PER_DAY, type TransportDomain } from "./transports-generator";
 
-const DEFAULT_HOURS_PER_DAY = 8;
 const COARSE_UNIT_THRESHOLD = 10;
 const ON_ROAD_DISCOUNT = 0.5;
 const OFF_ROAD_PENALTY = 5;
@@ -110,12 +109,13 @@ class JourneysModule {
 
     // avgSpeed is km/h like every other stored speed, so the distance-unit ratio has to come back out
     const avgSpeed = movingHours > 0 ? totalDistance / movingHours / getDistanceUnitRatio() : 0;
-    const hoursPerDay = totalDays > 0 ? totalHours / totalDays : DEFAULT_HOURS_PER_DAY;
+    // the rate that reproduces the per-transport day count; with nothing to divide, any rate formats "0m"
+    const hoursPerDay = totalDays > 0 ? totalHours / totalDays : MAX_HOURS_PER_DAY;
     return { totalDistance, totalHours, avgSpeed, totalDays, hoursPerDay };
   }
 
   /** Readable duration, e.g. "2d 3h". Days are counted from `hoursPerDay` */
-  formatTravelTime(hours: number, hoursPerDay = DEFAULT_HOURS_PER_DAY): string {
+  formatTravelTime(hours: number, hoursPerDay: number): string {
     const { days, hours: restHours, minutes } = this.splitTravelTime(hours, hoursPerDay);
 
     if (days >= COARSE_UNIT_THRESHOLD) return `${days}d`;
@@ -126,7 +126,7 @@ class JourneysModule {
   }
 
   /** Exact duration down to the minute, e.g. "52d 4h 9m" — for tooltips */
-  formatTravelTimeFull(hours: number, hoursPerDay = DEFAULT_HOURS_PER_DAY): string {
+  formatTravelTimeFull(hours: number, hoursPerDay: number): string {
     const { days, hours: restHours, minutes } = this.splitTravelTime(hours, hoursPerDay);
 
     const parts: string[] = [];
@@ -137,7 +137,8 @@ class JourneysModule {
   }
 
   private splitTravelTime(hours: number, hoursPerDay: number): { days: number; hours: number; minutes: number } {
-    const minutesPerDay = (hoursPerDay > 0 ? hoursPerDay : DEFAULT_HOURS_PER_DAY) * 60;
+    // a corrupt rate must not inflate the day count, so fall back to the longest possible day
+    const minutesPerDay = (hoursPerDay > 0 ? hoursPerDay : MAX_HOURS_PER_DAY) * 60;
     const totalMinutes = Number.isFinite(hours) && hours > 0 ? Math.round(hours * 60) : 0;
     let days = Math.floor(totalMinutes / minutesPerDay);
     // a journey mixing transports has a fractional rate, so the remainder needs rounding to whole minutes