patch: format floats in chart min/max

acheronfail · Sep 28, 2024 · fae173f · fae173f
1 parent 39cbee2
commit fae173f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/components/Chart.svelte b/src/components/Chart.svelte
@@ -9,7 +9,7 @@
 
   import { ticks, type TickOptions } from '../lib/chart-helpers';
   import type { MouseEventHandler, TouchEventHandler } from 'svelte/elements';
-  import { assert } from '../lib/misc';
+  import { assert, formatFloat } from '../lib/misc';
   import { untrack } from 'svelte';
 
   const DEFAULT_COLOUR = 'red';
@@ -352,15 +352,15 @@
             {/if}
             {#if minShown}
               <div class="flex flex-row gap-2">
-                <span style:color={line.color}>min: {min}{unit}</span>
+                <span style:color={line.color}>min: {formatFloat(min)}{unit}</span>
               </div>
             {/if}
             {#if maxShown && minShown}
               <span class="text-slate-500">-</span>
             {/if}
             {#if maxShown}
               <div class="flex flex-row gap-2">
-                <span style:color={line.color}>max: {max}{unit}</span>
+                <span style:color={line.color}>max: {formatFloat(max)}{unit}</span>
               </div>
             {/if}
           {/if}

diff --git a/src/components/Details.svelte b/src/components/Details.svelte
@@ -18,15 +18,14 @@
   import Button from './Button.svelte';
   import { ChartColours } from '../lib/chart-helpers';
   import { empty, State } from '../lib/parse/types';
+  import { formatFloat } from '../lib/misc';
 
   let { data = empty, batterySpecs, mapSpeed, units }: Props = $props();
 
   let voltsPerCell = $derived(batterySpecs.cellCount ? data.voltage / batterySpecs.cellCount : NaN);
   let cellVoltsLow = $derived(voltsPerCell && batterySpecs.cellMinVolt && voltsPerCell < batterySpecs.cellMinVolt);
   let formatSpeed = $derived((x: number) => (Number.isNaN(x) ? '??' : mapSpeed(x).toFixed(1)));
 
-  const formatFloat = (n: number) => (Number.isNaN(n) ? '??' : n.toFixed(1));
-
   const getStateColor = (state: string): string | undefined => {
     switch (state.toLowerCase()) {
       case 'riding':

diff --git a/src/lib/misc.ts b/src/lib/misc.ts
@@ -20,3 +20,5 @@ export const speedMapper = (inUnit: Units, outUnit: Units): ((input: number) =>
   if (outUnit === Units.Imperial) return kmToMi;
   return miToKm;
 };
+
+export const formatFloat = (n: number) => (Number.isNaN(n) ? '??' : n.toFixed(1));