Merge branch 'master' into route_stats

Author: karussell

src/pathDetails/elevationWidget/ChartRenderer.ts

@@ -1,5 +1,5 @@
 import { ChartConfig, ChartData, ChartHoverResult, ChartPathDetail, ElevationPoint } from './types'
-import { calculateNiceTicks, formatDistanceLabel, formatElevationLabel } from './axisUtils'
+import { calculateNiceTicks, formatDistanceLabel, formatElevationLabel, computeDetailYRange, formatDetailTick } from './axisUtils'
 import { getSlopeColor } from './colors'
 
 const DEFAULT_MARGIN = { top: 10, right: 15, bottom: 26, left: 48 }
@@ -497,19 +497,7 @@ export default class ChartRenderer {
         plotTop: number,
     ) {
         if (detail.minValue === undefined || detail.maxValue === undefined) return
-        let min = detail.minValue
-        let max = detail.maxValue
-        // Ensure minimum span
-        if (max - min < 10) {
-            const mid = (min + max) / 2
-            min = mid - 25
-            max = mid + 25
-        }
-        const pad = (max - min) * 0.1
-        min -= pad
-        max += pad
-        // Don't push min below 0 when all original values are non-negative
-        if (detail.minValue >= 0) min = Math.max(0, min)
+        const { min, max } = computeDetailYRange(detail.minValue, detail.maxValue)
 
         const lineY = (v: number) => plotBottom - detailBarH - ((v - min) / (max - min)) * plotHeight
 
@@ -552,7 +540,7 @@ export default class ChartRenderer {
         for (const t of ticks) {
             const y = lineY(t)
             if (y < plotTop || y > plotBottom - detailBarH) continue
-            ctx.fillText(String(Math.round(t)), rightX + 4, y)
+            ctx.fillText(formatDetailTick(t, ticks), rightX + 4, y)
         }
 
         // Draw unit label at top of axis

src/pathDetails/elevationWidget/ElevationWidget.tsx

@@ -175,7 +175,7 @@ export default function ElevationWidget({
     }, [alternativeCount])
 
     return (
-        <div className={`${styles.container}${isExpanded ? ' ' + styles.containerExpanded : ''}`} style={{ display: hasData ? undefined : 'none' }}>
+        <div className={`${styles.container}${isExpanded ? ' ' + styles.containerExpanded : ''}`}>
             <div className={styles.controls}>
                 <DetailSelector
                     details={data?.pathDetails || []}

src/pathDetails/elevationWidget/axisUtils.ts

@@ -67,3 +67,27 @@ function formatNumber(n: number): string {
     if (n >= 10) return (Math.round(n * 10) / 10).toString()
     return (Math.round(n * 100) / 100).toString()
 }
+
+/**
+ * Compute padded y-axis range for a detail line chart.
+ * Adds 10% padding on each side and clamps min to 0 when all values are non-negative.
+ */
+export function computeDetailYRange(dataMin: number, dataMax: number): { min: number; max: number } {
+    const range = dataMax - dataMin
+    const pad = (range > 0 ? range : Math.abs(dataMax) || 1) * 0.1
+    let min = dataMin - pad
+    let max = dataMax + pad
+    if (dataMin >= 0) min = Math.max(0, min)
+    return { min, max }
+}
+
+/**
+ * Format a detail y-axis tick value. Uses enough decimal places to avoid duplicate labels.
+ */
+export function formatDetailTick(value: number, ticks: number[]): string {
+    if (ticks.length < 2) return String(value)
+    const step = Math.abs(ticks[1] - ticks[0])
+    if (step >= 1) return String(Math.round(value))
+    const decimals = Math.min(4, Math.ceil(-Math.log10(step)))
+    return value.toFixed(decimals)
+}

src/pathDetails/elevationWidget/pathDetailData.ts

@@ -159,11 +159,14 @@ export function transformPathDetail(
                 coordinates: coordinates.slice(from, to + 1).map(c => [c[0], c[1]] as [number, number]),
             }
         })
-        const mid = Math.round((sanitizedInfo.minVal + sanitizedInfo.maxVal) / 2)
+        const range = sanitizedInfo.maxVal - sanitizedInfo.minVal
+        const precision = range >= 10 ? 1 : range >= 1 ? 100 : 10000
+        const round = (v: number) => Math.round(v * precision) / precision
+        const mid = round((sanitizedInfo.minVal + sanitizedInfo.maxVal) / 2)
         legend = [
-            { label: String(sanitizedInfo.minVal), color: getNumericGradientColor(0) },
+            { label: String(round(sanitizedInfo.minVal)), color: getNumericGradientColor(0) },
             { label: String(mid), color: getNumericGradientColor(0.5) },
-            { label: String(sanitizedInfo.maxVal), color: getNumericGradientColor(1) },
+            { label: String(round(sanitizedInfo.maxVal)), color: getNumericGradientColor(1) },
         ]
     } else {
         // Discrete values

src/stores/ErrorStore.ts

@@ -26,6 +26,7 @@ export default class ErrorStore extends Store<ErrorStoreState> {
                 isDismissed: false,
             }
         } else if (action instanceof DismissLastError || action instanceof RouteRequestSuccess) {
+            if (state.isDismissed) return state
             return {
                 ...state,
                 isDismissed: true,

src/stores/MapOptionsStore.ts

@@ -199,16 +199,19 @@ export default class MapOptionsStore extends Store<MapOptionsStoreState> {
                     selectedStyle: styleOption,
                 }
         } else if (action instanceof ToggleRoutingGraph) {
+            if (state.routingGraphEnabled === action.routingGraphEnabled) return state
             return {
                 ...state,
                 routingGraphEnabled: action.routingGraphEnabled,
             }
         } else if (action instanceof ToggleUrbanDensityLayer) {
+            if (state.urbanDensityEnabled === action.urbanDensityEnabled) return state
             return {
                 ...state,
                 urbanDensityEnabled: action.urbanDensityEnabled,
             }
         } else if (action instanceof ToggleExternalMVTLayer) {
+            if (state.externalMVTEnabled === action.externalMVTLayerEnabled) return state
             return {
                 ...state,
                 externalMVTEnabled: action.externalMVTLayerEnabled,

src/stores/RouteStore.ts

@@ -1,6 +1,6 @@
 import Store from '@/stores/Store'
 import { Action } from '@/stores/Dispatcher'
-import { ClearPoints, ClearRoute, RemovePoint, RouteRequestSuccess, SetPoint, SetSelectedPath } from '@/actions/Actions'
+import { AddPoint, ClearPoints, ClearRoute, RemovePoint, RouteRequestSuccess, SetPoint, SetSelectedPath } from '@/actions/Actions'
 import { Path, RoutingResult } from '@/api/graphhopper'
 
 export interface RouteStoreState {
@@ -66,6 +66,7 @@ export default class RouteStore extends Store<RouteStoreState> {
             }
         } else if (
             action instanceof SetPoint ||
+            action instanceof AddPoint ||
             action instanceof ClearRoute ||
             action instanceof ClearPoints ||
             action instanceof RemovePoint

test/pathDetails/elevationWidget/axisUtils.test.ts

@@ -1,4 +1,4 @@
-import { calculateNiceTicks, formatDistanceLabel, formatElevationLabel } from '@/pathDetails/elevationWidget/axisUtils'
+import { calculateNiceTicks, formatDistanceLabel, formatElevationLabel, computeDetailYRange, formatDetailTick } from '@/pathDetails/elevationWidget/axisUtils'
 
 describe('axisUtils', () => {
     describe('calculateNiceTicks', () => {
@@ -107,4 +107,26 @@ describe('axisUtils', () => {
             expect(formatElevationLabel(100.7, false)).toBe('101 m')
         })
     })
+
+    describe('computeDetailYRange', () => {
+        it('adds 10% padding and clamps non-negative min to 0', () => {
+            // curvature-like: 0.5–1.0, range=0.5, pad=0.05
+            expect(computeDetailYRange(0.5, 1.0)).toEqual({ min: expect.closeTo(0.45), max: expect.closeTo(1.05) })
+            // speed-like: non-negative min clamped to 0
+            expect(computeDetailYRange(10, 120).min).toBe(0)
+            // negative data: no clamping
+            expect(computeDetailYRange(-10, 10).min).toBeCloseTo(-12)
+            // equal min/max: uses fallback range
+            expect(computeDetailYRange(5, 5).min).toBeLessThan(5)
+        })
+    })
+
+    describe('formatDetailTick', () => {
+        it('uses enough decimals to keep ticks distinct', () => {
+            expect(formatDetailTick(10, [0, 10, 20])).toBe('10')
+            expect(formatDetailTick(0.6, [0.4, 0.6, 0.8, 1.0])).toBe('0.6')
+            expect(formatDetailTick(1.0, [0.4, 0.6, 0.8, 1.0])).toBe('1.0')
+            expect(formatDetailTick(0.01, [0.01, 0.02, 0.03])).toBe('0.01')
+        })
+    })
 })

test/pathDetails/elevationWidget/pathDetailData.test.ts

@@ -151,6 +151,17 @@ describe('pathDetailData', () => {
             expect(result.type).toBe('bars')
         })
 
+        it('produces distinct legend labels for small numeric ranges', () => {
+            const entries: [number, number, any][] = [
+                [0, 1, 0.5],
+                [1, 2, 1.0],
+            ]
+            const result = transformPathDetail('curvature', 'Curvature', entries, coords, cumDist)
+            expect(result.type).toBe('line')
+            const labels = result.legend.map(l => l.label)
+            expect(new Set(labels).size).toBe(labels.length)
+        })
+
         it('assigns missing color for special values', () => {
             const entries: [number, number, any][] = [
                 [0, 1, 'missing'],