diff options
Diffstat (limited to 'web/static')
| -rw-r--r-- | web/static/ride-detail.js | 191 | ||||
| -rw-r--r-- | web/static/style.css | 52 |
2 files changed, 228 insertions, 15 deletions
diff --git a/web/static/ride-detail.js b/web/static/ride-detail.js index bd36da4..fc9c123 100644 --- a/web/static/ride-detail.js +++ b/web/static/ride-detail.js @@ -26,6 +26,12 @@ hoverLine: resolveColor("--color-hover-line"), climbRoute: resolveColor("--color-climb-route"), climbFocusFill: resolveColor("--color-climb-focus-fill"), + profileDownhill: resolveColor("--color-profile-downhill"), + profile0To3: resolveColor("--color-profile-0-3"), + profile3To6: resolveColor("--color-profile-3-6"), + profile6To9: resolveColor("--color-profile-6-9"), + profile9To12: resolveColor("--color-profile-9-12"), + profile12Plus: resolveColor("--color-profile-12-plus"), }; colorProbe.remove(); const route = JSON.parse(routeElement.textContent); @@ -47,6 +53,8 @@ const points = profile.points || []; if (points.length === 0) return; const climbItems = [...document.querySelectorAll("[data-climb-item]")]; + const climbItemIndices = climbItems.map((item) => Number.parseInt(item.dataset.climbIndex, 10)); + const officialProfileCanvases = [...document.querySelectorAll("[data-official-profile]")]; const previousClimbButton = document.querySelector("[data-climb-previous]"); const nextClimbButton = document.querySelector("[data-climb-next]"); const climbPosition = document.querySelector("[data-climb-position]"); @@ -73,7 +81,8 @@ if (!context) return; const state = { hoveredIndex: -1, - focusedClimbIndex: 0, + focusedClimbItemIndex: 0, + focusedClimbIndex: climbItemIndices[0] ?? 0, climbBounds: (profile.climbs || []).map((climb) => ({ startIndex: climb.startIndex, endIndex: climb.endIndex })), plot: null, width: 0, @@ -94,6 +103,157 @@ const formatDistance = (distance) => `${distance.toFixed(distance < 10 ? 1 : 0)} km`; const formatElevation = (elevation) => `${Math.round(elevation)} m`; const clamp = (value, min, max) => Math.max(min, Math.min(max, value)); + const profileStepSizesM = [100, 200, 500, 1000]; + const displayStepForLength = (lengthM) => profileStepSizesM.find((stepM) => Math.ceil(lengthM / stepM) <= 30) || profileStepSizesM[profileStepSizesM.length - 1]; + const profileBandForSlope = (slopePercent) => { + if (slopePercent < 0) return colors.profileDownhill; + if (slopePercent < 3) return colors.profile0To3; + if (slopePercent < 6) return colors.profile3To6; + if (slopePercent < 9) return colors.profile6To9; + if (slopePercent < 12) return colors.profile9To12; + return colors.profile12Plus; + }; + const officialProfileSections = (startIndex, endIndex, stepM) => { + const startDistanceM = points[startIndex].distanceKm * 1000; + const endDistanceM = points[endIndex].distanceKm * 1000; + const sections = []; + let pointIndex = startIndex; + const elevationAtDistance = (distanceM) => { + while (pointIndex < endIndex - 1 && points[pointIndex + 1].distanceKm * 1000 < distanceM) pointIndex++; + const nextIndex = Math.min(pointIndex + 1, endIndex); + const first = points[pointIndex]; + const next = points[nextIndex]; + const distanceSpan = next.distanceKm * 1000 - first.distanceKm * 1000; + if (distanceSpan <= 0) return first.elevationM; + const fraction = (distanceM - first.distanceKm * 1000) / distanceSpan; + return first.elevationM + clamp(fraction, 0, 1) * (next.elevationM - first.elevationM); + }; + for (let sectionStartM = startDistanceM; sectionStartM < endDistanceM; sectionStartM += stepM) { + const sectionEndM = Math.min(sectionStartM + stepM, endDistanceM); + const startElevation = elevationAtDistance(sectionStartM); + const endElevation = elevationAtDistance(sectionEndM); + const slopePercent = (endElevation - startElevation) / (sectionEndM - sectionStartM) * 100; + sections.push({ + startDistanceKm: sectionStartM / 1000, + endDistanceKm: sectionEndM / 1000, + startElevation, + endElevation, + slopePercent, + color: profileBandForSlope(slopePercent), + }); + } + return sections; + }; + const drawOfficialProfile = (profileCanvas) => { + const startIndex = Number.parseInt(profileCanvas.dataset.profileStart, 10); + const endIndex = Number.parseInt(profileCanvas.dataset.profileEnd, 10); + if (!Number.isInteger(startIndex) || !Number.isInteger(endIndex) || startIndex < 0 || endIndex >= points.length || startIndex >= endIndex) return; + const rect = profileCanvas.getBoundingClientRect(); + if (rect.width === 0 || rect.height === 0) return; + const context = profileCanvas.getContext("2d"); + if (!context) return; + const ratio = window.devicePixelRatio || 1; + profileCanvas.width = Math.floor(rect.width * ratio); + profileCanvas.height = Math.floor(rect.height * ratio); + context.setTransform(ratio, 0, 0, ratio, 0, 0); + const plot = { left: 10, right: rect.width - 10, top: 16, bottom: rect.height - 24 }; + const climbLengthM = (points[endIndex].distanceKm - points[startIndex].distanceKm) * 1000; + const sections = officialProfileSections(startIndex, endIndex, displayStepForLength(climbLengthM)); + if (sections.length === 0) return; + let minElevation = sections[0].startElevation; + let maxElevation = minElevation; + for (const section of sections) { + minElevation = Math.min(minElevation, section.startElevation, section.endElevation); + maxElevation = Math.max(maxElevation, section.startElevation, section.endElevation); + } + const elevationPadding = Math.max((maxElevation - minElevation) * 0.12, 8); + minElevation -= elevationPadding; + maxElevation += elevationPadding; + const minDistance = sections[0].startDistanceKm; + const maxDistance = sections[sections.length - 1].endDistanceKm; + const distanceSpan = Math.max(maxDistance - minDistance, 0.1); + const elevationSpan = Math.max(maxElevation - minElevation, 1); + const xForDistance = (distanceKm) => plot.left + (distanceKm - minDistance) / distanceSpan * (plot.right - plot.left); + const yForElevation = (elevationM) => plot.bottom - (elevationM - minElevation) / elevationSpan * (plot.bottom - plot.top); + context.clearRect(0, 0, rect.width, rect.height); + context.fillStyle = colors.plotSurface; + context.fillRect(0, 0, rect.width, rect.height); + context.strokeStyle = colors.grid; + context.lineWidth = 1; + context.beginPath(); + context.moveTo(plot.left, plot.bottom); + context.lineTo(plot.right, plot.bottom); + context.stroke(); + for (const section of sections) { + const startX = xForDistance(section.startDistanceKm); + const endX = xForDistance(section.endDistanceKm); + context.beginPath(); + context.moveTo(startX, plot.bottom); + context.lineTo(startX, yForElevation(section.startElevation)); + context.lineTo(endX, yForElevation(section.endElevation)); + context.lineTo(endX, plot.bottom); + context.closePath(); + context.globalAlpha = 0.25; + context.fillStyle = section.color; + context.fill(); + context.globalAlpha = 1; + context.beginPath(); + context.moveTo(startX, yForElevation(section.startElevation)); + context.lineTo(endX, yForElevation(section.endElevation)); + context.strokeStyle = section.color; + context.lineWidth = 2.5; + context.stroke(); + } + context.font = "9px system-ui, sans-serif"; + context.fillStyle = colors.subtle; + context.textBaseline = "bottom"; + context.textAlign = "center"; + context.save(); + context.beginPath(); + context.rect(plot.left, plot.top, plot.right - plot.left, plot.bottom - plot.top); + context.clip(); + for (const section of sections) { + const startX = xForDistance(section.startDistanceKm); + const endX = xForDistance(section.endDistanceKm); + const label = `${section.slopePercent.toFixed(1)}%`; + const labelY = Math.max(plot.top + 10, Math.min(yForElevation(section.startElevation), yForElevation(section.endElevation)) - 4); + context.fillText(label, (startX + endX) / 2, labelY); + } + context.restore(); + let topElevation = sections[0].startElevation; + let topDistance = sections[0].startDistanceKm; + for (const section of sections) { + if (section.startElevation > topElevation) { + topElevation = section.startElevation; + topDistance = section.startDistanceKm; + } + if (section.endElevation > topElevation) { + topElevation = section.endElevation; + topDistance = section.endDistanceKm; + } + } + context.fillStyle = colors.accent; + context.beginPath(); + context.arc(xForDistance(topDistance), yForElevation(topElevation), 3.5, 0, 2 * Math.PI); + context.fill(); + context.font = "11px system-ui, sans-serif"; + context.fillStyle = colors.subtle; + context.textBaseline = "top"; + context.textAlign = "left"; + context.fillText(formatDistance(0), plot.left, rect.height - 16); + context.textAlign = "right"; + context.fillText(formatDistance(maxDistance - minDistance), plot.right, rect.height - 16); + }; + for (const card of document.querySelectorAll("[data-official-climb-card]")) { + card.addEventListener("toggle", () => { + if (!card.open) return; + for (const other of document.querySelectorAll("[data-official-climb-card]")) { + if (other !== card) other.open = false; + } + const profileCanvas = card.querySelector("[data-official-profile]"); + if (profileCanvas) drawOfficialProfile(profileCanvas); + }); + } const xForDistance = (distance) => { const span = Math.max(maxDistance - minDistance, 1); return state.plot.left + (distance - minDistance) / span * (state.plot.right - state.plot.left); @@ -383,24 +543,27 @@ }; const updateClimbFocus = (index, zoom) => { if (climbItems.length === 0) return; - state.focusedClimbIndex = clamp(index, 0, climbItems.length - 1); + state.focusedClimbItemIndex = clamp(index, 0, climbItems.length - 1); + state.focusedClimbIndex = climbItemIndices[state.focusedClimbItemIndex]; for (let itemIndex = 0; itemIndex < climbItems.length; itemIndex++) { - const active = itemIndex === state.focusedClimbIndex; + const active = itemIndex === state.focusedClimbItemIndex; climbItems[itemIndex].hidden = !active; climbItems[itemIndex].setAttribute("aria-hidden", String(!active)); - if (climbLayers[itemIndex]) { - updateClimbLayer(itemIndex); + climbItems[itemIndex].classList.toggle("focused", active); + const climbIndex = climbItemIndices[itemIndex]; + if (climbLayers[climbIndex]) { + updateClimbLayer(climbIndex); } } - if (climbPosition) climbPosition.textContent = `Climb ${state.focusedClimbIndex + 1} of ${climbItems.length}`; - if (previousClimbButton) previousClimbButton.disabled = state.focusedClimbIndex === 0; - if (nextClimbButton) nextClimbButton.disabled = state.focusedClimbIndex === climbItems.length - 1; + if (climbPosition) climbPosition.textContent = `Climb ${state.focusedClimbItemIndex + 1} of ${climbItems.length}`; + if (previousClimbButton) previousClimbButton.disabled = state.focusedClimbItemIndex === 0; + if (nextClimbButton) nextClimbButton.disabled = state.focusedClimbItemIndex === climbItems.length - 1; clearBoundarySelection(); draw(); if (zoom) zoomToClimb(state.focusedClimbIndex); }; - if (previousClimbButton) previousClimbButton.addEventListener("click", () => updateClimbFocus(state.focusedClimbIndex - 1, true)); - if (nextClimbButton) nextClimbButton.addEventListener("click", () => updateClimbFocus(state.focusedClimbIndex + 1, true)); + if (previousClimbButton) previousClimbButton.addEventListener("click", () => updateClimbFocus(state.focusedClimbItemIndex - 1, true)); + if (nextClimbButton) nextClimbButton.addEventListener("click", () => updateClimbFocus(state.focusedClimbItemIndex + 1, true)); canvas.addEventListener("pointermove", (event) => { if (!state.plot) return; const rect = canvas.getBoundingClientRect(); @@ -433,7 +596,13 @@ const index = state.hoveredIndex < 0 ? (direction > 0 ? 0 : points.length - 1) : state.hoveredIndex + direction; showPoint(index); }); - window.addEventListener("resize", draw); + window.addEventListener("resize", () => { + draw(); + for (const profileCanvas of officialProfileCanvases) { + const card = profileCanvas.closest("[data-official-climb-card]"); + if (card?.open) drawOfficialProfile(profileCanvas); + } + }); if (climbItems.length > 0) updateClimbFocus(0, false); else draw(); })(); diff --git a/web/static/style.css b/web/static/style.css index 8a35844..c867501 100644 --- a/web/static/style.css +++ b/web/static/style.css @@ -38,6 +38,12 @@ --color-hover-line: oklch(from var(--palette-forest) l c h / 60%); --color-climb-route: var(--palette-leaf); --color-climb-focus-fill: oklch(from var(--palette-leaf) l c h / 18%); + --color-profile-downhill: oklch(58% 0.12 245); + --color-profile-0-3: oklch(66% 0.13 145); + --color-profile-3-6: oklch(72% 0.16 112); + --color-profile-6-9: oklch(78% 0.16 91); + --color-profile-9-12: oklch(70% 0.17 57); + --color-profile-12-plus: oklch(60% 0.18 32); } * { box-sizing: border-box; } @@ -64,8 +70,10 @@ input { border: 1px solid var(--color-input-border); border-radius: .55rem; padd progress { width: 100%; height: .8rem; accent-color: var(--color-accent); } .notice { margin: 1rem 0 0; border-radius: .6rem; padding: .75rem 1rem; background: var(--color-notice-surface); color: var(--color-notice-text); } .error { margin: 1rem 0 0; border-radius: .6rem; padding: .75rem 1rem; background: var(--color-error-surface); color: var(--color-error-text); } -.ride-detail-grid { display: grid; grid-template-columns: minmax(16rem, .85fr) minmax(0, 1.75fr); gap: 1.25rem; margin-top: 2rem; align-items: start; } -.ride-detail-sidebar, .ride-detail-main { display: grid; gap: 1.25rem; min-width: 0; } +.ride-detail-grid { display: grid; grid-template-columns: 1fr; gap: 1.25rem; margin-top: 2rem; align-items: start; } +.ride-detail-columns { display: grid; grid-template-columns: minmax(16rem, .85fr) minmax(0, 1.75fr); gap: 1.25rem; align-items: start; min-width: 0; } +.ride-detail-columns-single > .ride-detail-main { grid-column: 1 / -1; } +.ride-detail-main { display: grid; gap: 1.25rem; min-width: 0; } .ride-detail-grid .panel { margin-top: 0; } table { width: 100%; border-collapse: collapse; } th, td { padding: .85rem .5rem; border-bottom: 1px solid var(--color-border-subtle); text-align: left; } @@ -85,9 +93,45 @@ th { color: var(--color-subtle); font-size: .78rem; letter-spacing: .08em; text- .profile-chart canvas { display: block; width: 100%; height: 22rem; border-radius: .65rem; background: var(--color-plot-surface); outline: none; } .profile-chart canvas:focus-visible { box-shadow: 0 0 0 .2rem var(--color-focus); } .profile-hover { display: block; min-height: 1.4rem; margin: .7rem 0 0; color: var(--color-muted); font-size: .9rem; } +.section-heading { display: flex; align-items: center; justify-content: space-between; gap: 1rem; } +.section-heading .eyebrow { margin-bottom: .2rem; } +.section-heading h2 { margin: 0; font-size: 1.2rem; } +.section-count { display: grid; place-items: center; min-width: 2rem; height: 2rem; border-radius: 999px; background: var(--color-secondary-surface); color: var(--color-forest); font-weight: 800; } +.official-climbs-panel { padding: 0; border: 0; background: transparent; box-shadow: none; } +.official-climbs-panel .section-heading { margin-bottom: .75rem; } +.official-climb-list { display: grid; gap: 0; } +.official-climb-card { overflow: hidden; border: 1px solid var(--color-border); border-bottom: 0; border-radius: 0; background: var(--color-plot-surface); } +.official-climb-card:last-child { border-bottom: 1px solid var(--color-border); } +.official-climb-card > summary { display: flex; align-items: center; justify-content: space-between; gap: 1rem; padding: .9rem 1rem; color: var(--color-forest); cursor: pointer; list-style: none; } +.official-climb-card > summary::-webkit-details-marker { display: none; } +.official-climb-card > summary::marker { display: none; } +.official-climb-card > summary:hover, .official-climb-card > summary:focus-visible { background: var(--color-secondary-surface); } +.official-climb-card > summary:focus-visible { outline: .2rem solid var(--color-focus); outline-offset: -.2rem; } +.official-climb-card-title { display: flex; align-items: baseline; gap: .2rem; min-width: 0; } +.official-climb-card-title strong { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.official-climb-summary-stats { display: flex; gap: .8rem; margin: 0 0 0 auto; } +.official-climb-summary-stats dt { font-size: .6rem; } +.official-climb-summary-stats dd { margin-top: .1rem; font-size: .85rem; } +.official-climb-chevron { color: var(--color-accent); font-size: 1.5rem; font-weight: 500; line-height: 1; } +.official-climb-card[open] .official-climb-chevron { transform: rotate(180deg); } +.official-climb-card-body { padding: .9rem 1rem 1rem; border-top: 1px solid var(--color-border-subtle); background: var(--color-surface); } +.official-climb-profile { display: block; width: 100%; height: 10rem; margin-top: .75rem; border-radius: .55rem; background: var(--color-plot-surface); outline: none; } +.official-climb-profile:focus-visible { box-shadow: 0 0 0 .2rem var(--color-focus); } +.official-climb-profile-legend { display: flex; flex-wrap: wrap; gap: .45rem .8rem; margin-top: .65rem; color: var(--color-muted); font-size: .72rem; } +.official-climb-profile-legend > span { display: inline-flex; align-items: center; gap: .3rem; } +.profile-band-swatch { display: inline-block; width: .65rem; height: .65rem; border-radius: .15rem; } +.profile-band-downhill { background: var(--color-profile-downhill); } +.profile-band-0-3 { background: var(--color-profile-0-3); } +.profile-band-3-6 { background: var(--color-profile-3-6); } +.profile-band-6-9 { background: var(--color-profile-6-9); } +.profile-band-9-12 { background: var(--color-profile-9-12); } +.profile-band-12-plus { background: var(--color-profile-12-plus); } .climb-list { display: grid; gap: 1rem; margin-top: 1.25rem; } .climb-item { padding-top: 1rem; border-top: 1px solid var(--color-border-subtle); } .climb-item-heading { display: flex; justify-content: space-between; gap: 1rem; flex-wrap: wrap; } +.todo-item { padding-left: .8rem; border-left: .2rem solid var(--color-accent); } +.todo-item.focused { border-left-color: var(--color-forest); background: var(--color-plot-surface); } +.todo-check { display: inline-block; width: .9rem; height: .9rem; margin-right: .5rem; border: 2px solid var(--color-accent); border-radius: .2rem; vertical-align: -.05rem; } .climb-number { display: inline-block; margin-right: .45rem; color: var(--color-accent); font-size: .78rem; letter-spacing: .08em; text-transform: uppercase; } .climb-item-heading > span, .climb-status { color: var(--color-muted); font-size: .9rem; } .climb-metrics { margin: .35rem 0 0; color: var(--color-muted); font-size: .9rem; } @@ -107,6 +151,6 @@ th { color: var(--color-subtle); font-size: .78rem; letter-spacing: .08em; text- dl { display: grid; grid-template-columns: repeat(3, 1fr); gap: 1rem; margin: 0; } dt { color: var(--color-subtle); font-size: .78rem; font-weight: 700; letter-spacing: .08em; text-transform: uppercase; } dd { margin: .25rem 0 0; font-size: 1.2rem; font-weight: 700; } -@media (max-width: 900px) { .ride-detail-grid { grid-template-columns: 1fr; } } +@media (max-width: 900px) { .ride-detail-columns { grid-template-columns: 1fr; } } @media (max-width: 700px) { .container { width: min(100% - 1rem, 70rem); padding-top: 1.5rem; } .site-header { padding-inline: 1rem; } th:nth-child(n+4), td:nth-child(n+4) { display: none; } .panel { padding: .8rem; } } -@media (max-width: 500px) { dl { grid-template-columns: repeat(2, 1fr); } } +@media (max-width: 500px) { dl { grid-template-columns: repeat(2, 1fr); } .official-climb-summary-stats { gap: .55rem; } .official-climb-card-title { display: block; } } |