From 6e45918e74a2fa67dce6914f5efd5ac3ae3dabcd Mon Sep 17 00:00:00 2001 From: larssand Date: Fri, 13 Nov 2026 16:23:19 +0100 Subject: [PATCH] feat(drivers): country flag before the driver's name in timing, overlay, results, printouts and PDF (1.89.20) --- CHANGELOG.md | 10 + README.md | 1 + README.sv.md | 1 + docs/javascript-architecture.md | 13 + package-lock.json | 4 +- package.json | 2 +- server.js | 2 + server/pdf_flags.js | 66 ++++ server/pdf_render.js | 47 ++- src/app.js | 44 ++- src/core_views.js | 9 +- src/country_flags.js | 84 +++++ src/day_schedule_view.js | 5 +- src/flags/LICENSE | 21 ++ src/flags/README.md | 2 + src/flags/ad.svg | 150 ++++++++ src/flags/ae.svg | 6 + src/flags/al.svg | 5 + src/flags/ar.svg | 32 ++ src/flags/at.svg | 4 + src/flags/au.svg | 8 + src/flags/ba.svg | 12 + src/flags/be.svg | 7 + src/flags/bg.svg | 5 + src/flags/br.svg | 45 +++ src/flags/by.svg | 18 + src/flags/ca.svg | 4 + src/flags/ch.svg | 9 + src/flags/cl.svg | 13 + src/flags/cn.svg | 11 + src/flags/cy.svg | 6 + src/flags/cz.svg | 5 + src/flags/de.svg | 5 + src/flags/dk.svg | 5 + src/flags/ee.svg | 5 + src/flags/es.svg | 544 ++++++++++++++++++++++++++++++ src/flags/fi.svg | 5 + src/flags/fr.svg | 5 + src/flags/gb-eng.svg | 5 + src/flags/gb-sct.svg | 4 + src/flags/gb-wls.svg | 9 + src/flags/gb.svg | 7 + src/flags/gr.svg | 16 + src/flags/hk.svg | 8 + src/flags/hr.svg | 58 ++++ src/flags/hu.svg | 7 + src/flags/id.svg | 4 + src/flags/ie.svg | 7 + src/flags/il.svg | 14 + src/flags/in.svg | 25 ++ src/flags/is.svg | 12 + src/flags/it.svg | 7 + src/flags/jp.svg | 11 + src/flags/kr.svg | 24 ++ src/flags/li.svg | 43 +++ src/flags/lt.svg | 7 + src/flags/lu.svg | 5 + src/flags/lv.svg | 6 + src/flags/mc.svg | 6 + src/flags/md.svg | 70 ++++ src/flags/me.svg | 116 +++++++ src/flags/mk.svg | 5 + src/flags/mt.svg | 58 ++++ src/flags/mx.svg | 382 +++++++++++++++++++++ src/flags/my.svg | 26 ++ src/flags/nl.svg | 5 + src/flags/no.svg | 7 + src/flags/nz.svg | 36 ++ src/flags/ph.svg | 6 + src/flags/pl.svg | 6 + src/flags/pt.svg | 57 ++++ src/flags/qa.svg | 4 + src/flags/ro.svg | 7 + src/flags/rs.svg | 292 ++++++++++++++++ src/flags/ru.svg | 5 + src/flags/sa.svg | 25 ++ src/flags/se.svg | 4 + src/flags/sg.svg | 13 + src/flags/si.svg | 18 + src/flags/sk.svg | 9 + src/flags/sm.svg | 75 ++++ src/flags/th.svg | 7 + src/flags/tr.svg | 8 + src/flags/tw.svg | 34 ++ src/flags/ua.svg | 6 + src/flags/us.svg | 9 + src/flags/uy.svg | 28 ++ src/flags/za.svg | 17 + src/overlays.js | 9 +- src/race_day_view.js | 3 +- src/race_overview_view.js | 3 +- src/race_render_helpers.js | 5 +- src/race_setup_ui.js | 3 +- src/settings.js | 2 + src/styles.css | 4 + src/timing_logic.js | 2 + src/timing_views.js | 7 +- tests/country_flags.test.js | 29 ++ tests/overlay_leaderboard.test.js | 6 + tests/pdf_flags.test.js | 28 ++ tests/run.js | 2 + 101 files changed, 2898 insertions(+), 45 deletions(-) create mode 100644 server/pdf_flags.js create mode 100644 src/country_flags.js create mode 100644 src/flags/LICENSE create mode 100644 src/flags/README.md create mode 100644 src/flags/ad.svg create mode 100644 src/flags/ae.svg create mode 100644 src/flags/al.svg create mode 100644 src/flags/ar.svg create mode 100644 src/flags/at.svg create mode 100644 src/flags/au.svg create mode 100644 src/flags/ba.svg create mode 100644 src/flags/be.svg create mode 100644 src/flags/bg.svg create mode 100644 src/flags/br.svg create mode 100644 src/flags/by.svg create mode 100644 src/flags/ca.svg create mode 100644 src/flags/ch.svg create mode 100644 src/flags/cl.svg create mode 100644 src/flags/cn.svg create mode 100644 src/flags/cy.svg create mode 100644 src/flags/cz.svg create mode 100644 src/flags/de.svg create mode 100644 src/flags/dk.svg create mode 100644 src/flags/ee.svg create mode 100644 src/flags/es.svg create mode 100644 src/flags/fi.svg create mode 100644 src/flags/fr.svg create mode 100644 src/flags/gb-eng.svg create mode 100644 src/flags/gb-sct.svg create mode 100644 src/flags/gb-wls.svg create mode 100644 src/flags/gb.svg create mode 100644 src/flags/gr.svg create mode 100644 src/flags/hk.svg create mode 100644 src/flags/hr.svg create mode 100644 src/flags/hu.svg create mode 100644 src/flags/id.svg create mode 100644 src/flags/ie.svg create mode 100644 src/flags/il.svg create mode 100644 src/flags/in.svg create mode 100644 src/flags/is.svg create mode 100644 src/flags/it.svg create mode 100644 src/flags/jp.svg create mode 100644 src/flags/kr.svg create mode 100644 src/flags/li.svg create mode 100644 src/flags/lt.svg create mode 100644 src/flags/lu.svg create mode 100644 src/flags/lv.svg create mode 100644 src/flags/mc.svg create mode 100644 src/flags/md.svg create mode 100644 src/flags/me.svg create mode 100644 src/flags/mk.svg create mode 100644 src/flags/mt.svg create mode 100644 src/flags/mx.svg create mode 100644 src/flags/my.svg create mode 100644 src/flags/nl.svg create mode 100644 src/flags/no.svg create mode 100644 src/flags/nz.svg create mode 100644 src/flags/ph.svg create mode 100644 src/flags/pl.svg create mode 100644 src/flags/pt.svg create mode 100644 src/flags/qa.svg create mode 100644 src/flags/ro.svg create mode 100644 src/flags/rs.svg create mode 100644 src/flags/ru.svg create mode 100644 src/flags/sa.svg create mode 100644 src/flags/se.svg create mode 100644 src/flags/sg.svg create mode 100644 src/flags/si.svg create mode 100644 src/flags/sk.svg create mode 100644 src/flags/sm.svg create mode 100644 src/flags/th.svg create mode 100644 src/flags/tr.svg create mode 100644 src/flags/tw.svg create mode 100644 src/flags/ua.svg create mode 100644 src/flags/us.svg create mode 100644 src/flags/uy.svg create mode 100644 src/flags/za.svg create mode 100644 tests/country_flags.test.js create mode 100644 tests/pdf_flags.test.js diff --git a/CHANGELOG.md b/CHANGELOG.md index d987d09..ceb189c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.89.20 - 2026-11-13 + +### Added + +- Country flags: a driver with a country gets a small flag before the name in timing, Race Day, the overlay and OBS tower, the race overview, standings, start lists, the drivers' board, printouts and PDFs, and in the driver list. No country, no flag. The country is picked from a list or typed ("Sverige", "Sweden", "SE", "SWE"); set once, it also counts for the same person's other classes. The flags are local SVGs in `src/flags` (flag-icons, MIT), so they work offline and in OBS on Windows. OBS has a "Show flags" setting. In PDFs the flag is drawn as vector shapes; a flag not drawn there shows its country code. + +### Fixed + +- Start list PDF: the Brand column was always "-". + ## 1.89.19 - 2026-11-13 ### Fixed diff --git a/README.md b/README.md index cb9fdc2..2ad6868 100644 --- a/README.md +++ b/README.md @@ -307,6 +307,7 @@ The **Overlay** menu has leaderboard, speaker, results, TV and team modes, plus - **Drivers** lists every driver grouped per class (folds open and closed; untick **Group by class** for one list). - **Search** on name, transponder, brand, club or country, **Class** to show just one class, and **Sort by** name, class, club, transponder or brand (↑/↓ reverses). Sort and grouping are remembered in the browser. +- **Country** (optional): pick from the list or type it ("Sweden", "SE" and "SWE" work too). The driver then gets a small flag before the name in timing, Race Day, the overlay and OBS, start lists, results, printouts and PDFs. No country, no flag. The flags are in the repo (`src/flags`), so they work offline. OBS can turn them off under **Show flags**. - **Select** drivers with the boxes (or **Select all shown**) and **Delete selected**; a confirm names them first. Deleting, one or many, also removes the drivers from every heat, participant list and team. ### Data, backups and import/export diff --git a/README.sv.md b/README.sv.md index a403a5f..51366f4 100644 --- a/README.sv.md +++ b/README.sv.md @@ -320,6 +320,7 @@ Menyn **Overlay** har lägena leaderboard, speaker, resultat, TV och lag, plus e - **Förare** listar alla förare grupperade per klass (grupperna fälls ut och ihop; bocka ur **Gruppera per klass** för en lista). - **Sök** på namn, transponder, märke, klubb eller land, **Klass** för att bara visa en klass och **Sortera på** namn, klass, klubb, transponder eller märke (↑/↓ vänder). Sortering och gruppering sparas i webbläsaren. +- **Land** (valfritt): välj i listan eller skriv ("Sverige", "SE" och "SWE" fungerar också). Föraren får då en liten flagga före namnet i tidtagning, Race Day, overlay och OBS, startlistor, resultat, utskrifter och PDF. Inget land, ingen flagga. Flaggorna ligger i repot (`src/flags`), så de fungerar utan internet. OBS kan stänga av dem med **Visa flaggor**. - **Markera** förare med rutorna (eller **Markera alla som visas**) och **Radera markerade**; en bekräftelse visar namnen först. Radering, en eller flera, tar också bort förarna från alla heat, deltagarlistor och team. ### Data, backup och export/import diff --git a/docs/javascript-architecture.md b/docs/javascript-architecture.md index cd28555..c91a743 100644 --- a/docs/javascript-architecture.md +++ b/docs/javascript-architecture.md @@ -517,9 +517,22 @@ Type: Owns: - search (`filterDrivers`), sorting with empty values last (`sortDrivers`) and grouping per class (`groupDriversByClass`) - `removeDrivers()`: deletes drivers from the register and from every heat, participant list and team (single and bulk delete) +- `trainingRowVisible()`: search, class and "only drivers who trained" for the training stats club table (`renderTrainingOverview` in `src/training_views.js` filters the rows in place) Used by `renderDriversView` in `src/core_views.js`, which keeps the list's view settings (sort and grouping in localStorage, class filter and selection for the open page). +### `src/country_flags.js` +Type: +- pure country and flag helpers + +Owns: +- the country list (code, 3-letter code, Swedish and English name) and `countryCode()`, which reads the driver's free-text country ("Sverige", "Sweden", "SE", "SWE") +- `flagHtml()`: a small `` from `src/flags/` (flag-icons SVGs, MIT, in the repo so it works offline and in OBS on Windows) +- `driverCountryCode()`: the driver's country, else one set on the same person's other class entry +- `rowFlag(row)`: the flag for any row with `countryCode` or `driverId`; `app.js` sets the lookup once with `setDriverCountryResolver()` + +Used by overlays, timing, Race Day, race overview, standings, start lists, the drivers' board and the driver list. PDFs get a `flags` list per table; `server/pdf_flags.js` draws them as vector shapes (stripes, Nordic crosses), and a flag it doesn't know prints as its code. + ### `src/session_replay.js` Type: - pure transient replay logic diff --git a/package-lock.json b/package-lock.json index f5c141b..1bcf713 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.89.19", + "version": "1.89.20", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.89.19", + "version": "1.89.20", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index 95c1ba7..0ba6942 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.89.19", + "version": "1.89.20", "private": true, "description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence", "engines": { diff --git a/server.js b/server.js index ec63c72..42ac3ab 100644 --- a/server.js +++ b/server.js @@ -926,6 +926,8 @@ function normalizePdfExportPayload(input = {}) { rows: Array.isArray(section?.rows) ? section.rows.map((row) => (Array.isArray(row) ? row.map((value) => String(value ?? "").trim()) : [String(row ?? "").trim()])) : [], + // A country code per row for the flag before the driver's name ("SE", "GB-ENG"); anything else is dropped. + flags: Array.isArray(section?.flags) ? section.flags.map((code) => (/^[A-Z]{2}(-[A-Z]{3})?$/.test(String(code || "")) ? String(code) : "")) : [], })) : []; diff --git a/server/pdf_flags.js b/server/pdf_flags.js new file mode 100644 index 0000000..d99b5ba --- /dev/null +++ b/server/pdf_flags.js @@ -0,0 +1,66 @@ +// Country flags drawn as vector shapes in the PDF (the PDF writer draws rectangles, not SVG): +// stripes, Nordic crosses, the Swiss cross and Japan's disc cover most of the countries at +// club races. A flag not drawn here shows its country code instead. +const h = (...colors) => ({ type: "h", colors }); // horizontal stripes, top first +const v = (...colors) => ({ type: "v", colors }); // vertical stripes, left first +const nordic = (field, cross, inner) => ({ type: "nordic", field, cross, inner }); + +const FLAGS = { + SE: nordic("#006aa7", "#fecc00"), NO: nordic("#ba0c2f", "#ffffff", "#00205b"), DK: nordic("#c8102e", "#ffffff"), + FI: nordic("#ffffff", "#002f6c"), IS: nordic("#02529c", "#ffffff", "#dc1e35"), + DE: h("#000000", "#dd0000", "#ffce00"), AT: h("#ed2939", "#ffffff", "#ed2939"), NL: h("#ae1c28", "#ffffff", "#21468b"), + LU: h("#ed2939", "#ffffff", "#00a1de"), HU: h("#ce2939", "#ffffff", "#477050"), EE: h("#0072ce", "#000000", "#ffffff"), + LT: h("#fdb913", "#006a44", "#c1272d"), LV: { type: "h", colors: ["#9e3039", "#ffffff", "#9e3039"], weights: [2, 1, 2] }, + RU: h("#ffffff", "#0039a6", "#d52b1e"), BG: h("#ffffff", "#00966e", "#d62612"), PL: h("#ffffff", "#dc143c"), + UA: h("#0057b7", "#ffd700"), ID: h("#ce1126", "#ffffff"), MC: h("#ce1126", "#ffffff"), + FR: v("#0055a4", "#ffffff", "#ef4135"), IT: v("#009246", "#ffffff", "#ce2b37"), BE: v("#000000", "#fdda24", "#ef3340"), + IE: v("#169b62", "#ffffff", "#ff883e"), RO: v("#002b7f", "#fcd116", "#ce1126"), MD: v("#0046ae", "#ffd200", "#cc092f"), + CH: { type: "swiss" }, JP: { type: "disc", field: "#ffffff", disc: "#bc002d" }, +}; + +// Draws the flag with its lower-left corner at (x, y). Returns false when it isn't known. +function drawPdfFlag(writer, code, x, y, w, ht) { + const flag = FLAGS[String(code || "").toUpperCase()]; + if (!flag) return false; + if (flag.type === "h" || flag.type === "v") { + const weights = flag.weights || flag.colors.map(() => 1); + const total = weights.reduce((sum, value) => sum + value, 0); + let offset = 0; + flag.colors.forEach((color, index) => { + const part = weights[index] / total; + if (flag.type === "h") writer.rect(x, y + ht * (1 - offset - part), w, ht * part, color); + else writer.rect(x + w * offset, y, w * part, ht, color); + offset += part; + }); + } else if (flag.type === "nordic") { + // Cross a bit left of centre, like the real flags (proportions simplified). + const cx = x + w * 0.36; + const cy = y + ht / 2; + const arm = ht * 0.25; + writer.rect(x, y, w, ht, flag.field); + writer.rect(x, cy - arm / 2, w, arm, flag.cross); + writer.rect(cx - arm / 2, y, arm, ht, flag.cross); + if (flag.inner) { + const thin = arm * 0.5; + writer.rect(x, cy - thin / 2, w, thin, flag.inner); + writer.rect(cx - thin / 2, y, thin, ht, flag.inner); + } + } else if (flag.type === "swiss") { + writer.rect(x, y, w, ht, "#da291c"); + const s = ht * 0.6; + const bar = s * 0.32; + writer.rect(x + w / 2 - s / 2, y + ht / 2 - bar / 2, s, bar, "#ffffff"); + writer.rect(x + w / 2 - bar / 2, y + ht / 2 - s / 2, bar, s, "#ffffff"); + } else if (flag.type === "disc") { + writer.rect(x, y, w, ht, flag.field); + writer.circle(x + w / 2, y + ht / 2, ht * 0.3, flag.disc); + } + // A thin edge so white flags (Finland, Japan) don't vanish on white paper. + writer.line(x, y, x + w, y, "#9aa3ad", 0.3); + writer.line(x, y + ht, x + w, y + ht, "#9aa3ad", 0.3); + writer.line(x, y, x, y + ht, "#9aa3ad", 0.3); + writer.line(x + w, y, x + w, y + ht, "#9aa3ad", 0.3); + return true; +} + +module.exports = { drawPdfFlag, PDF_FLAG_CODES: Object.keys(FLAGS) }; diff --git a/server/pdf_render.js b/server/pdf_render.js index ddc7a1f..0ed0f8a 100644 --- a/server/pdf_render.js +++ b/server/pdf_render.js @@ -1,6 +1,7 @@ // Styled A4 PDF for result lists, start lists and standings: a branded header, real tables // (coloured header row, striped rows, podium marks), page numbers. Uses the PDF standard fonts // Helvetica / Helvetica-Bold with WinAnsiEncoding so Swedish å/ä/ö print without embedding fonts. +const { drawPdfFlag } = require("./pdf_flags"); const THEMES = { classic: { band: "#14213d", accent: "#2f6fde", headFill: "#14213d", headText: "#ffffff", zebra: "#f2f5fa" }, @@ -94,10 +95,31 @@ const PORTRAIT_WIDTH = 595 - MARGIN * 2; const NUMERIC = /^[-+()0-9.:,\s%/]+$/; const POS_HEADER = /^(pos|plac|placering|place|rank|#|nr)\.?$/i; +// Which columns hold numbers or places, and which one is the driver name (the first that is neither). +function analyzeColumns(section) { + const numeric = section.headers.map((_h, index) => { + const values = section.rows.map((row) => String(row[index] || "").trim()).filter(Boolean); + return values.length > 0 && values.every((value) => NUMERIC.test(value)); + }); + const placeColumn = section.headers.map((_h, index) => { + const values = section.rows.map((row) => String(row[index] || "").trim()).filter(Boolean); + return values.length > 0 && values.every((value) => /^(TQ|[A-Z]?\d+|-)$/.test(value)); + }); + const first = section.headers.findIndex((_h, index) => index > 0 && !numeric[index] && !placeColumn[index]); + // A table whose first column is the driver (channel analysis) has no place column before it. + const nameIndex = first >= 0 ? first : (!numeric[0] && !placeColumn[0] ? 0 : -1); + return { numeric, placeColumn, nameIndex }; +} + +// Room for the small country flag before the driver's name. +const FLAG_SPACE = 15; +const hasFlags = (section) => Array.isArray(section.flags) && section.flags.some(Boolean); + function naturalWidths(section) { - return section.headers.map((header, index) => Math.min(230, Math.max( + const flagColumn = hasFlags(section) ? analyzeColumns(section).nameIndex : -1; + return section.headers.map((header, index) => Math.min(230 + (index === flagColumn ? FLAG_SPACE : 0), Math.max( textWidth(header, HEAD_SIZE, true), - ...section.rows.map((row) => textWidth(row[index], CELL_SIZE, false)), + ...section.rows.map((row) => textWidth(row[index], CELL_SIZE, false) + (index === flagColumn ? FLAG_SPACE / 1.08 : 0)), ) * 1.08 + PAD * 2 + 2)); } @@ -226,17 +248,10 @@ function drawSectionTitle(writer, title, theme) { function drawTable(writer, section, theme) { const widths = columnWidths(section, writer.width); - const numeric = section.headers.map((_h, index) => { - const values = section.rows.map((row) => String(row[index] || "").trim()).filter(Boolean); - return values.length > 0 && values.every((value) => NUMERIC.test(value)); - }); const hasPos = POS_HEADER.test(String(section.headers[0] || "").trim()); - const placeColumn = section.headers.map((_h, index) => { - const values = section.rows.map((row) => String(row[index] || "").trim()).filter(Boolean); - return values.length > 0 && values.every((value) => /^(TQ|[A-Z]?\d+|-)$/.test(value)); - }); // The driver name is the first column that is not a place or a number; podium rows make it bold. - const nameIndex = section.headers.findIndex((_h, index) => index > 0 && !numeric[index] && !placeColumn[index]); + const { numeric, placeColumn, nameIndex } = analyzeColumns(section); + const flags = hasFlags(section) ? section.flags : []; const align = (index) => (placeColumn[index] && index < 3 ? "center" : numeric[index] ? "right" : "left"); const headHeight = 19; const rowHeight = 16.5; @@ -277,7 +292,15 @@ function drawTable(writer, section, theme) { return; } const tq = String(row[index] || "").trim() === "TQ"; - writer.text(x + PAD, top - 11.5, fitText(row[index], CELL_SIZE, bold || tq, widths[index] - PAD * 2), CELL_SIZE, { bold: bold || tq, color: tq ? "#b07d00" : TEXT, align: align(index), width: widths[index] - PAD * 2 }); + let shift = 0; + if (index === nameIndex && flags[rowIndex]) { + // The country flag before the name; a country without a drawn flag shows its code. + if (!drawPdfFlag(writer, flags[rowIndex], x + PAD, top - 12.6, 12, 8.4)) { + writer.text(x + PAD, top - 11.2, String(flags[rowIndex]).slice(0, 3), 6, { bold: true, color: MUTED }); + } + shift = FLAG_SPACE; + } + writer.text(x + PAD + shift, top - 11.5, fitText(row[index], CELL_SIZE, bold || tq, widths[index] - PAD * 2 - shift), CELL_SIZE, { bold: bold || tq, color: tq ? "#b07d00" : TEXT, align: align(index), width: widths[index] - PAD * 2 - shift }); x += widths[index]; }); writer.line(MARGIN, top - rowHeight, MARGIN + writer.width, top - rowHeight, RULE, 0.4); diff --git a/src/app.js b/src/app.js index d21da07..efd3823 100644 --- a/src/app.js +++ b/src/app.js @@ -11,6 +11,7 @@ import { findHouseOfRcAutoSends } from "./houseofrc_logic.js"; import { sendHouseOfRcResults, renderHouseOfRcSendStatus } from "./houseofrc_view.js"; import { recordTransponderSighting, buildWarmupCheck, createPrologue, getPrologueRemainingMs, holdPrologue, resumePrologue, setPrologueRemaining, takeDuePrologueCall, formatPrologueTime, getPrologueHandoverMs, normalizePrologueSec, getPrologueMarks } from "./prologue_logic.js"; import { findTransponderConflict, getDriverProfileId } from "./driver_profile_logic.js"; +import { flagHtml, driverCountryCode, countryChoices, setDriverCountryResolver, rowFlag } from "./country_flags.js"; import { renderRaceDayView, refreshRaceDayWarmup, refreshRaceDayPrologueClock, updateRaceDayStartDisplay, refreshRaceDayLive } from "./race_day_view.js"; import { normalizeRaceDays, getRaceDay, upsertRaceDay, orderDaySessions, buildDaySchedule, getAutopilotAction, moveInDayOrder, pickBoardDate, getDueCall, withRaceSetupStart, eventScheduleFromDayRows } from "./day_schedule_logic.js"; import { buildRaceOverview, buildRaceOverviewCsvRows, withQualifyingPlaces, qualifyingPlaces } from "./race_overview_logic.js"; @@ -121,7 +122,10 @@ const getCompetitorElapsedMs = (session, row) => getCompetitorElapsedMsLogic(ses const getCompetitorPassings = (session, row, options = {}) => getCompetitorPassingsLogic(session, row, options, { ensureSessionResult, isCountedPassing }); const getCompetitorSeedMetric = (session, row) => getCompetitorSeedMetricLogic(session, row, { getCompetitorPassings }); const getSessionEntrants = (session) => getSessionEntrantsLogic(session, { state, getEventDrivers }); -const buildLeaderboard = (session) => buildLeaderboardLogic(session, { ensureSessionResult, getSessionTargetMs, getCompetitorPassings, isCountedPassing, getCompetitorElapsedMs, getCompetitorSeedMetric, getSessionLapWindow, getPassingValidationLabel, formatSeedMetric, formatRaceClock, formatLeaderboardGap, formatLapDelta, formatLap, t }); +// Each row carries the driver's country code for the small flag (team rows have none). +const getDriverCountry = (driverId) => driverCountryCode(state.drivers, driverId, getDriverProfileId); +setDriverCountryResolver(getDriverCountry); +const buildLeaderboard = (session) => buildLeaderboardLogic(session, { ensureSessionResult, getSessionTargetMs, getCompetitorPassings, isCountedPassing, getCompetitorElapsedMs, getCompetitorSeedMetric, getSessionLapWindow, getPassingValidationLabel, formatSeedMetric, formatRaceClock, formatLeaderboardGap, formatLapDelta, formatLap, t }).map((row) => ({ ...row, countryCode: row.driverId ? getDriverCountry(row.driverId) : "" })); const buildPracticeStandings = (event) => buildPracticeStandingsLogic(event, { getSessionsForEvent, buildLeaderboard, getCompetitorSeedMetric, formatSeedMetric, formatRaceClock }); const getQualifyingPointsValue = (place, fieldSize, tableType) => getQualifyingPointsValueLogic(place, fieldSize, tableType); const isHighPointsTable = (tableType) => isHighPointsTableLogic(tableType); @@ -185,7 +189,7 @@ const renderRaceOverviewHeatsHtml = (event, onlySessionId = "") => getOverviewHe `).join(""); const buildHeatPdfSection = ({ session, rows, phase }) => { const withCar = rows.some((row) => row.car); @@ -193,7 +197,8 @@ const buildHeatPdfSection = ({ session, rows, phase }) => { return buildPdfSection( `${raceOverviewPhaseLabel(phase.type)} • ${session.name}`, [t("table.pos"), ...(withQual ? [t("table.qual")] : []), t("table.driver"), ...(withCar ? [t("race_overview.car")] : []), t("table.laps"), t("table.result"), t("table.best_lap")], - rows.map((row) => [String(row.pos), ...(withQual ? [row.qual || "-"] : []), row.name, ...(withCar ? [row.car || "-"] : []), String(row.laps), row.result, row.bestLapMs ? formatLap(row.bestLapMs) : "-"]) + rows.map((row) => [String(row.pos), ...(withQual ? [row.qual || "-"] : []), row.name, ...(withCar ? [row.car || "-"] : []), String(row.laps), row.result, row.bestLapMs ? formatLap(row.bestLapMs) : "-"]), + pdfFlags(rows) ); }; // One finished heat or final on its own page: for the board in the pits right after it. @@ -3386,7 +3391,7 @@ const TRANSLATIONS = { "guide.dashboard_3": "Det gör det lättare att se om tävlingsdagen ligger före eller efter schema direkt från dashboarden.", "guide.dashboard_4": "Kom igång-korten och den grupperade sidomenyn följer samma ordning: anslut systemet, registrera vid behov, skapa körning och öppna sedan Tidtagning/Overlay.", "guide.training_title": "Träning, utveckling och belöningar", - "guide.training_1": "1. Registrera föraren och transpondern under Förare. Klubb och land är valfria profilfält. Har personen flera klasser väljer du samma Träningsprofil på varje förarpost.", + "guide.training_1": "1. Registrera föraren och transpondern under Förare. Klubb och land är valfria profilfält; med land får föraren en liten flagga före namnet i tidtagning, overlay, resultat och PDF. Har personen flera klasser väljer du samma Träningsprofil på varje förarpost.", "guide.training_2": "2. Kör Free Practice eller Open Practice. Giltiga varv kopieras automatiskt till en beständig träningslogg; korta/långa ogiltiga varv räknas inte. Varv från kval, heat och final sparas också men räknas bara när du väljer Underlag: Race eller Alla - de märks 🏁 med tävling, pass och serie, och visas per racepass i stället för stints.", "guide.training_3": "3. Öppna Träning och välj förare. Grundvyn visar bara totalvarv, träningsdagar, personbästa, jämnhet, nästa mål och dagens pass. Öppna Mer statistik eller Klubbens träningsöversikt bara när det behövs. I Klubbens träningsöversikt längst ner kan du söka förare, välja en klass, visa bara förare som tränat och gruppera per klass.", "guide.training_4": "4. Nästa automatiska nivå räknas utan konfiguration. Skapa egna delmål om klubben eller en förälder vill koppla en fysisk belöning till exempelvis 500, 1000 eller 1500 varv.", @@ -3506,6 +3511,7 @@ const TRANSLATIONS = { "overlay.obs_show_last": "Visa senaste varv", "overlay.col_last": "Senaste", "overlay.obs_show_gap": "Visa gap", + "overlay.obs_show_flags": "Visa flaggor", "overlay.obs_copy_url": "Kopiera OBS-url", "overlay.obs_layout": "OBS-layout", "overlay.obs_theme": "OBS-tema", @@ -5689,7 +5695,7 @@ const TRANSLATIONS = { "guide.dashboard_3": "That makes it easier to see whether the race day is running ahead or behind schedule directly from the dashboard.", "guide.dashboard_4": "The Getting started cards and grouped side navigation follow the same order: connect the system, register entries when needed, create a run, then open Timing/Overlay.", "guide.training_title": "Practice, development and rewards", - "guide.training_1": "1. Register the driver and transponder under Drivers. Club and country are optional profile fields. If the person races several classes, select the same Practice profile on every driver entry.", + "guide.training_1": "1. Register the driver and transponder under Drivers. Club and country are optional profile fields; with a country the driver gets a small flag before the name in timing, the overlay, results and PDFs. If the person races several classes, select the same Practice profile on every driver entry.", "guide.training_2": "2. Run Free Practice or Open Practice. Valid laps are copied automatically to a durable training ledger; invalid short or long laps do not count. Laps from qualifying, heats and finals are kept too but only count when you pick Based on: Races or All - they are marked 🏁 with race, session and series, and shown per race session instead of as stints.", "guide.training_3": "3. Open Training and select a driver. The default view only shows total laps, practice days, personal best, consistency, the next target and today's session. Open More statistics or Club practice overview only when needed. In the club practice overview at the bottom you can search for a driver, pick one class, show only drivers who trained and group by class.", "guide.training_4": "4. The next automatic level needs no configuration. Add custom milestones when the club or a parent wants to attach a physical reward to targets such as 500, 1000 or 1500 laps.", @@ -5809,6 +5815,7 @@ const TRANSLATIONS = { "overlay.obs_show_last": "Show last lap", "overlay.col_last": "Last", "overlay.obs_show_gap": "Show gap", + "overlay.obs_show_flags": "Show flags", "overlay.obs_copy_url": "Copy OBS URL", "overlay.obs_layout": "OBS layout", "overlay.obs_theme": "OBS theme", @@ -5968,6 +5975,7 @@ function createDefaultObsOverlaySettings() { showResult: true, showBest: true, showGap: true, + showFlags: true, showPositionChange: true, showStart: true, layout: "leaderboard", @@ -5996,6 +6004,7 @@ function normalizeObsOverlaySettings(raw = {}) { showResult: raw?.showResult !== false, showBest: raw?.showBest !== false, showGap: raw?.showGap !== false, + showFlags: raw?.showFlags !== false, showPositionChange: raw?.showPositionChange !== false, showStart: raw?.showStart !== false, layout, @@ -6109,6 +6118,7 @@ function getObsOverlayConfig() { showResult: parseOverlayBooleanParam("showResult", base.showResult), showBest: parseOverlayBooleanParam("showBest", base.showBest), showGap: parseOverlayBooleanParam("showGap", base.showGap), + showFlags: parseOverlayBooleanParam("showFlags", base.showFlags), showPositionChange: parseOverlayBooleanParam("showPositionChange", base.showPositionChange), showStart: parseOverlayBooleanParam("showStart", base.showStart), layout: getObsLayouts().includes(String(urlParams.get("layout") || "").toLowerCase()) ? String(urlParams.get("layout")).toLowerCase() : base.layout, @@ -6128,6 +6138,7 @@ function writeObsOverlayParams(url, config) { url.searchParams.set("showResult", normalized.showResult ? "1" : "0"); url.searchParams.set("showBest", normalized.showBest ? "1" : "0"); url.searchParams.set("showGap", normalized.showGap ? "1" : "0"); + url.searchParams.set("showFlags", normalized.showFlags ? "1" : "0"); url.searchParams.set("showPositionChange", normalized.showPositionChange ? "1" : "0"); url.searchParams.set("showStart", normalized.showStart ? "1" : "0"); url.searchParams.set("layout", normalized.layout); @@ -8117,9 +8128,11 @@ function openPrintWindow(title, bodyHtml) { }, 150); } -function buildPdfSection(title, headers, rows) { - return { title, headers, rows }; +// flags: the country code per row ("" for none); the PDF draws it before the driver's name. +function buildPdfSection(title, headers, rows, flags) { + return flags && flags.some(Boolean) ? { title, headers, rows, flags } : { title, headers, rows }; } +const pdfFlags = (items) => items.map((item) => item?.countryCode || (item?.driverId ? getDriverCountry(item.driverId) : "")); async function requestPdfExport(payload) { try { @@ -8197,9 +8210,10 @@ async function exportRaceStartListsPdf(event) { `${session.name} • ${getSessionTypeLabel(session.type)}`, [t("events.slot"), t("table.driver"), t("table.brand"), t("table.transponder")], getSessionGridEntries(session).map((entry) => { - const driver = state.drivers.find((item) => item.id === entry.id); + const driver = state.drivers.find((item) => item.id === entry.driverId); return [String(entry.slot), entry.name, driver?.brand || "-", entry.meta || "-"]; - }) + }), + pdfFlags(getSessionGridEntries(session)) ) ); @@ -8237,6 +8251,7 @@ async function exportRaceResultsPdf(event) { return [ [t("table.pos"), ...(withQual ? [t("table.qual")] : []), t("table.driver"), t("table.score")], rows.map((row) => [String(row.rank), ...(withQual ? [row.qual || "-"] : []), row.driverName || "-", row.score || "-"]), + pdfFlags(rows), ]; })() ), @@ -8247,12 +8262,14 @@ async function exportRaceResultsPdf(event) { String(row.rank), row.driverName || "-", row.scoreNote ? `${row.score || "-"} | ${row.scoreNote}` : row.score || "-", - ]) + ]), + pdfFlags(buildQualifyingStandings(event)) ), buildPdfSection( t("events.practice_standings"), [t("table.pos"), t("table.driver"), t("table.score")], - buildPracticeStandings(event).map((row) => [String(row.rank), row.driverName || "-", row.score || "-"]) + buildPracticeStandings(event).map((row) => [String(row.rank), row.driverName || "-", row.score || "-"]), + pdfFlags(buildPracticeStandings(event)) ), ...getOverviewHeats(event).map(buildHeatPdfSection), ...buildTeamRaceStandings(event).map(({ session, rows }) => @@ -8397,9 +8414,10 @@ async function exportSessionHeatSheetPdf(session) { `${session.name} • ${getSessionTypeLabel(session.type)}`, [t("events.slot"), t("table.driver"), t("table.brand"), t("table.transponder")], getSessionGridEntries(session).map((entry) => { - const driver = state.drivers.find((item) => item.id === entry.id); + const driver = state.drivers.find((item) => item.id === entry.driverId); return [String(entry.slot), entry.name, driver?.brand || "-", entry.meta || "-"]; - }) + }), + pdfFlags(getSessionGridEntries(session)) ), ], }); diff --git a/src/core_views.js b/src/core_views.js index c80755b..28bb79b 100644 --- a/src/core_views.js +++ b/src/core_views.js @@ -1,3 +1,4 @@ +import { flagHtml, countryChoices } from "./country_flags.js"; import { getDriverProfileGroups, getDriverProfileId, findTransponderConflict } from "./driver_profile_logic.js"; import { filterDrivers, sortDrivers, groupDriversByClass, removeDrivers, DRIVER_SORT_KEYS } from "./driver_list_logic.js"; @@ -434,10 +435,12 @@ export function renderDriversView(deps) { const editingProfileId = editingDriver ? getDriverProfileId(editingDriver) : ""; const passingSoundOptions = (selected = "") => [``, ...Array.from({ length: 8 }, (_item, index) => { const value = `pass_${String(index + 1).padStart(2, "0")}.wav`; return ``; })].join(""); const existingClubs = [...new Set(state.drivers.map((driver) => String(driver.club || "").trim()).filter(Boolean))].sort(); + // Every country with a flag, in the app's language; anything else typed before stays offered. + const flagLanguage = state.settings?.language === "en" ? "en" : "sv"; const existingCountries = [...new Set([ - "Sverige", "Norge", "Finland", "Danmark", "Island", "Tyskland", "Nederländerna", "Belgien", "Frankrike", "Storbritannien", "Polen", "Tjeckien", "Österrike", "Schweiz", + ...countryChoices(flagLanguage), ...state.drivers.map((driver) => String(driver.country || "").trim()).filter(Boolean), - ])].sort(); + ])].sort((a, b) => a.localeCompare(b, flagLanguage)); dom.view.innerHTML = `
@@ -496,7 +499,7 @@ export function renderDriversView(deps) { ${escapeHtml(d.name)} ${showClass ? `${escapeHtml(getClassName(d.classId))}` : ""} ${escapeHtml(profile?.club || d.club || "-")} - ${escapeHtml(profile?.country || d.country || "-")} + ${flagHtml(profile?.country || d.country, flagLanguage)}${escapeHtml(profile?.country || d.country || "-")} ${escapeHtml(d.brand || "-")} ${escapeHtml(d.transponder || "-")} ${escapeHtml(profile?.representative?.name || d.name)}${profile?.drivers.length > 1 ? ` · ${profile.drivers.length}` : ""} diff --git a/src/country_flags.js b/src/country_flags.js new file mode 100644 index 0000000..8fbd935 --- /dev/null +++ b/src/country_flags.js @@ -0,0 +1,84 @@ +// Country flags for drivers. The driver's "country" is free text ("Sverige", "Sweden", "SE", +// "SWE" all work); countryCode() turns it into a code, flagHtml() into a small flag image from +// src/flags (flag-icons, MIT - local, so it works offline and in OBS on Windows, which shows +// emoji flags as letters). No country, or one not in the list: no flag. + +// [code, IOC/3-letter, Swedish name, English name] +export const COUNTRIES = [ + ["SE", "SWE", "Sverige", "Sweden"], ["NO", "NOR", "Norge", "Norway"], ["DK", "DEN", "Danmark", "Denmark"], + ["FI", "FIN", "Finland", "Finland"], ["IS", "ISL", "Island", "Iceland"], ["EE", "EST", "Estland", "Estonia"], + ["LV", "LAT", "Lettland", "Latvia"], ["LT", "LTU", "Litauen", "Lithuania"], ["DE", "GER", "Tyskland", "Germany"], + ["AT", "AUT", "Österrike", "Austria"], ["CH", "SUI", "Schweiz", "Switzerland"], ["LI", "LIE", "Liechtenstein", "Liechtenstein"], + ["NL", "NED", "Nederländerna", "Netherlands"], ["BE", "BEL", "Belgien", "Belgium"], ["LU", "LUX", "Luxemburg", "Luxembourg"], + ["FR", "FRA", "Frankrike", "France"], ["IT", "ITA", "Italien", "Italy"], ["ES", "ESP", "Spanien", "Spain"], + ["PT", "POR", "Portugal", "Portugal"], ["AD", "AND", "Andorra", "Andorra"], ["MC", "MON", "Monaco", "Monaco"], + ["SM", "SMR", "San Marino", "San Marino"], ["GB", "GBR", "Storbritannien", "United Kingdom"], ["IE", "IRL", "Irland", "Ireland"], + ["GB-ENG", "ENG", "England", "England"], ["GB-SCT", "SCO", "Skottland", "Scotland"], ["GB-WLS", "WAL", "Wales", "Wales"], + ["PL", "POL", "Polen", "Poland"], ["CZ", "CZE", "Tjeckien", "Czechia"], ["SK", "SVK", "Slovakien", "Slovakia"], + ["HU", "HUN", "Ungern", "Hungary"], ["SI", "SLO", "Slovenien", "Slovenia"], ["HR", "CRO", "Kroatien", "Croatia"], + ["BA", "BIH", "Bosnien och Hercegovina", "Bosnia and Herzegovina"], ["RS", "SRB", "Serbien", "Serbia"], ["ME", "MNE", "Montenegro", "Montenegro"], + ["MK", "MKD", "Nordmakedonien", "North Macedonia"], ["AL", "ALB", "Albanien", "Albania"], ["GR", "GRE", "Grekland", "Greece"], + ["BG", "BUL", "Bulgarien", "Bulgaria"], ["RO", "ROU", "Rumänien", "Romania"], ["MD", "MDA", "Moldavien", "Moldova"], + ["UA", "UKR", "Ukraina", "Ukraine"], ["BY", "BLR", "Belarus", "Belarus"], ["RU", "RUS", "Ryssland", "Russia"], + ["MT", "MLT", "Malta", "Malta"], ["CY", "CYP", "Cypern", "Cyprus"], ["TR", "TUR", "Turkiet", "Türkiye"], + ["US", "USA", "USA", "United States"], ["CA", "CAN", "Kanada", "Canada"], ["MX", "MEX", "Mexiko", "Mexico"], + ["BR", "BRA", "Brasilien", "Brazil"], ["AR", "ARG", "Argentina", "Argentina"], ["CL", "CHI", "Chile", "Chile"], + ["UY", "URU", "Uruguay", "Uruguay"], ["AU", "AUS", "Australien", "Australia"], ["NZ", "NZL", "Nya Zeeland", "New Zealand"], + ["ZA", "RSA", "Sydafrika", "South Africa"], ["JP", "JPN", "Japan", "Japan"], ["CN", "CHN", "Kina", "China"], + ["KR", "KOR", "Sydkorea", "South Korea"], ["TW", "TPE", "Taiwan", "Taiwan"], ["HK", "HKG", "Hongkong", "Hong Kong"], + ["TH", "THA", "Thailand", "Thailand"], ["MY", "MAS", "Malaysia", "Malaysia"], ["SG", "SGP", "Singapore", "Singapore"], + ["IN", "IND", "Indien", "India"], ["ID", "INA", "Indonesien", "Indonesia"], ["PH", "PHI", "Filippinerna", "Philippines"], + ["AE", "UAE", "Förenade Arabemiraten", "United Arab Emirates"], ["IL", "ISR", "Israel", "Israel"], ["SA", "KSA", "Saudiarabien", "Saudi Arabia"], + ["QA", "QAT", "Qatar", "Qatar"], +]; + +const lookup = new Map(); +COUNTRIES.forEach(([code, ioc, sv, en]) => [code, ioc, sv, en].forEach((key) => lookup.set(key.toLowerCase(), code))); +// Common other spellings. +[["sweden", "SE"], ["swe", "SE"], ["sverige", "SE"], ["norway", "NO"], ["noreg", "NO"], ["dnk", "DK"], ["deu", "DE"], ["deutschland", "DE"], + ["uk", "GB"], ["great britain", "GB"], ["storbritannien", "GB"], ["holland", "NL"], ["nld", "NL"], ["che", "CH"], ["usa", "US"], + ["united states of america", "US"], ["suomi", "FI"], ["danmark", "DK"], ["österreich", "AT"], ["schweiz", "CH"], ["turkey", "TR"]] + .forEach(([key, code]) => lookup.set(key, code)); + +export function countryCode(value) { + return lookup.get(String(value || "").trim().toLowerCase()) || ""; +} + +export function countryName(code, language = "sv") { + const country = COUNTRIES.find((item) => item[0] === countryCode(code)); + return country ? (language === "en" ? country[3] : country[2]) : ""; +} + +// The names the driver form offers (in the app's language), sorted. +export function countryChoices(language = "sv") { + const index = language === "en" ? 3 : 2; + return COUNTRIES.map((item) => item[index]).sort((a, b) => a.localeCompare(b, language)); +} + +// A small flag before a name; "" without a known country. The title gives the name on hover. +export function flagHtml(value, language = "sv") { + const code = countryCode(value); + if (!code) return ""; + return `${code}`; +} + +// A driver's country: their own, else one set on another class entry of the same person +// (same profile), so it only has to be filled in once. +export function driverCountryCode(drivers, driverId, getProfileId = (driver) => driver?.profileId || "") { + const list = Array.isArray(drivers) ? drivers : []; + const driver = list.find((item) => item.id === driverId); + if (!driver) return ""; + if (countryCode(driver.country)) return countryCode(driver.country); + const profileId = getProfileId(driver); + return countryCode(list.find((item) => item.country && profileId && getProfileId(item) === profileId)?.country); +} + +// The app tells this module how to find a driver's country once; renderers then call rowFlag(row) +// for any row with a driverId (leaderboard, standings, heat lists) without passing it around. +let resolveDriverCountry = () => ""; +export function setDriverCountryResolver(fn) { + resolveDriverCountry = typeof fn === "function" ? fn : () => ""; +} +export function rowFlag(row, language = "sv") { + return flagHtml(row?.countryCode || (row?.driverId ? resolveDriverCountry(row.driverId) : ""), language); +} diff --git a/src/day_schedule_view.js b/src/day_schedule_view.js index 361cd14..2d8f2e2 100644 --- a/src/day_schedule_view.js +++ b/src/day_schedule_view.js @@ -1,3 +1,4 @@ +import { rowFlag } from "./country_flags.js"; // The race day schedule on screen: the panel on Race Day (plan, order, autopilot, pause), the // printable running order for the board in the pits, and the drivers' board // (/public-overlay/schedule). Logic in day_schedule_logic.js, the autopilot runner in app.js. @@ -155,7 +156,7 @@ export function buildDaySchedulePrintHtml({ t, escapeHtml, date, rows, getClassL ${rows.map((row) => `${row.afterFixedBreak ? `${escapeHtml(fixedBreakText(day, t))}` : ""} ${formatClockTime(row.start)} ${escapeHtml(rowLabel(row, getClassLabel))} -
    ${getSessionGridEntries(row.session).map((entry) => `
  1. ${escapeHtml(entry.name)}
  2. `).join("")}
+
    ${getSessionGridEntries(row.session).map((entry) => `
  1. ${rowFlag(entry)}${escapeHtml(entry.name)}
  2. `).join("")}
`).join("")} @@ -181,7 +182,7 @@ export function renderDriverBoard({ t, escapeHtml, date, rows, getClassLabel, ge ${row.afterFixedBreak ? `

${escapeHtml(fixedBreakText(day, t))}

` : ""}

${escapeHtml(rowLabel(row, getClassLabel))}

${called ? `

📢 ${escapeHtml(t("day.board_heads_up"))}

` : ""} -
    ${getSessionGridEntries(row.session).map((entry) => `
  1. ${escapeHtml(entry.name)}
  2. `).join("") || `
  3. ${escapeHtml(t("race_day.no_start_list"))}
  4. `}
+
    ${getSessionGridEntries(row.session).map((entry) => `
  1. ${rowFlag(entry)}${escapeHtml(entry.name)}
  2. `).join("") || `
  3. ${escapeHtml(t("race_day.no_start_list"))}
  4. `}
`; }; return ` diff --git a/src/flags/LICENSE b/src/flags/LICENSE new file mode 100644 index 0000000..ee959dc --- /dev/null +++ b/src/flags/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013 Panayiotis Lipiridis + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/src/flags/README.md b/src/flags/README.md new file mode 100644 index 0000000..16f896c --- /dev/null +++ b/src/flags/README.md @@ -0,0 +1,2 @@ +Country flags from flag-icons 7.2.3 (https://github.com/lipis/flag-icons), MIT licence - see LICENSE. +Only the countries listed in src/country_flags.js are included. To add one, copy flags/4x3/.svg from the package here and add the country to the list. diff --git a/src/flags/ad.svg b/src/flags/ad.svg new file mode 100644 index 0000000..067ab77 --- /dev/null +++ b/src/flags/ad.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/ae.svg b/src/flags/ae.svg new file mode 100644 index 0000000..651ac85 --- /dev/null +++ b/src/flags/ae.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/flags/al.svg b/src/flags/al.svg new file mode 100644 index 0000000..1135b4b --- /dev/null +++ b/src/flags/al.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/flags/ar.svg b/src/flags/ar.svg new file mode 100644 index 0000000..d20cbbd --- /dev/null +++ b/src/flags/ar.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/at.svg b/src/flags/at.svg new file mode 100644 index 0000000..9d2775c --- /dev/null +++ b/src/flags/at.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/flags/au.svg b/src/flags/au.svg new file mode 100644 index 0000000..96e8076 --- /dev/null +++ b/src/flags/au.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/flags/ba.svg b/src/flags/ba.svg new file mode 100644 index 0000000..93bd9cf --- /dev/null +++ b/src/flags/ba.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/flags/be.svg b/src/flags/be.svg new file mode 100644 index 0000000..ac706a0 --- /dev/null +++ b/src/flags/be.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/flags/bg.svg b/src/flags/bg.svg new file mode 100644 index 0000000..af2d0d0 --- /dev/null +++ b/src/flags/bg.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/flags/br.svg b/src/flags/br.svg new file mode 100644 index 0000000..22c908e --- /dev/null +++ b/src/flags/br.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/by.svg b/src/flags/by.svg new file mode 100644 index 0000000..7e90ff2 --- /dev/null +++ b/src/flags/by.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/flags/ca.svg b/src/flags/ca.svg new file mode 100644 index 0000000..89da5b7 --- /dev/null +++ b/src/flags/ca.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/flags/ch.svg b/src/flags/ch.svg new file mode 100644 index 0000000..b42d670 --- /dev/null +++ b/src/flags/ch.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/flags/cl.svg b/src/flags/cl.svg new file mode 100644 index 0000000..5b3c72f --- /dev/null +++ b/src/flags/cl.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/flags/cn.svg b/src/flags/cn.svg new file mode 100644 index 0000000..10d3489 --- /dev/null +++ b/src/flags/cn.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/flags/cy.svg b/src/flags/cy.svg new file mode 100644 index 0000000..7e3d883 --- /dev/null +++ b/src/flags/cy.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/flags/cz.svg b/src/flags/cz.svg new file mode 100644 index 0000000..7913de3 --- /dev/null +++ b/src/flags/cz.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/flags/de.svg b/src/flags/de.svg new file mode 100644 index 0000000..71aa2d2 --- /dev/null +++ b/src/flags/de.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/flags/dk.svg b/src/flags/dk.svg new file mode 100644 index 0000000..563277f --- /dev/null +++ b/src/flags/dk.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/flags/ee.svg b/src/flags/ee.svg new file mode 100644 index 0000000..8b98c2c --- /dev/null +++ b/src/flags/ee.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/flags/es.svg b/src/flags/es.svg new file mode 100644 index 0000000..acdf927 --- /dev/null +++ b/src/flags/es.svg @@ -0,0 +1,544 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/fi.svg b/src/flags/fi.svg new file mode 100644 index 0000000..470be2d --- /dev/null +++ b/src/flags/fi.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/flags/fr.svg b/src/flags/fr.svg new file mode 100644 index 0000000..4110e59 --- /dev/null +++ b/src/flags/fr.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/flags/gb-eng.svg b/src/flags/gb-eng.svg new file mode 100644 index 0000000..12e3b67 --- /dev/null +++ b/src/flags/gb-eng.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/flags/gb-sct.svg b/src/flags/gb-sct.svg new file mode 100644 index 0000000..f50cd32 --- /dev/null +++ b/src/flags/gb-sct.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/flags/gb-wls.svg b/src/flags/gb-wls.svg new file mode 100644 index 0000000..6e15fd0 --- /dev/null +++ b/src/flags/gb-wls.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/flags/gb.svg b/src/flags/gb.svg new file mode 100644 index 0000000..7991383 --- /dev/null +++ b/src/flags/gb.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/flags/gr.svg b/src/flags/gr.svg new file mode 100644 index 0000000..599741e --- /dev/null +++ b/src/flags/gr.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/flags/hk.svg b/src/flags/hk.svg new file mode 100644 index 0000000..4fd55bc --- /dev/null +++ b/src/flags/hk.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/flags/hr.svg b/src/flags/hr.svg new file mode 100644 index 0000000..44fed27 --- /dev/null +++ b/src/flags/hr.svg @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/hu.svg b/src/flags/hu.svg new file mode 100644 index 0000000..baddf7f --- /dev/null +++ b/src/flags/hu.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/flags/id.svg b/src/flags/id.svg new file mode 100644 index 0000000..3b7c8fc --- /dev/null +++ b/src/flags/id.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/flags/ie.svg b/src/flags/ie.svg new file mode 100644 index 0000000..049be14 --- /dev/null +++ b/src/flags/ie.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/flags/il.svg b/src/flags/il.svg new file mode 100644 index 0000000..f43be7e --- /dev/null +++ b/src/flags/il.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src/flags/in.svg b/src/flags/in.svg new file mode 100644 index 0000000..bc47d74 --- /dev/null +++ b/src/flags/in.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/is.svg b/src/flags/is.svg new file mode 100644 index 0000000..a6588af --- /dev/null +++ b/src/flags/is.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/flags/it.svg b/src/flags/it.svg new file mode 100644 index 0000000..20a8bfd --- /dev/null +++ b/src/flags/it.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/flags/jp.svg b/src/flags/jp.svg new file mode 100644 index 0000000..cc1c181 --- /dev/null +++ b/src/flags/jp.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/flags/kr.svg b/src/flags/kr.svg new file mode 100644 index 0000000..6947eab --- /dev/null +++ b/src/flags/kr.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/li.svg b/src/flags/li.svg new file mode 100644 index 0000000..68ea26f --- /dev/null +++ b/src/flags/li.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/lt.svg b/src/flags/lt.svg new file mode 100644 index 0000000..90ec5d2 --- /dev/null +++ b/src/flags/lt.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/flags/lu.svg b/src/flags/lu.svg new file mode 100644 index 0000000..cc12206 --- /dev/null +++ b/src/flags/lu.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/flags/lv.svg b/src/flags/lv.svg new file mode 100644 index 0000000..6a9e75e --- /dev/null +++ b/src/flags/lv.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/flags/mc.svg b/src/flags/mc.svg new file mode 100644 index 0000000..9cb6c9e --- /dev/null +++ b/src/flags/mc.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/flags/md.svg b/src/flags/md.svg new file mode 100644 index 0000000..6dc441e --- /dev/null +++ b/src/flags/md.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/me.svg b/src/flags/me.svg new file mode 100644 index 0000000..d891890 --- /dev/null +++ b/src/flags/me.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/mk.svg b/src/flags/mk.svg new file mode 100644 index 0000000..4f5cae7 --- /dev/null +++ b/src/flags/mk.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/flags/mt.svg b/src/flags/mt.svg new file mode 100644 index 0000000..c597266 --- /dev/null +++ b/src/flags/mt.svg @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/mx.svg b/src/flags/mx.svg new file mode 100644 index 0000000..f98a89e --- /dev/null +++ b/src/flags/mx.svg @@ -0,0 +1,382 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/my.svg b/src/flags/my.svg new file mode 100644 index 0000000..89576f6 --- /dev/null +++ b/src/flags/my.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/nl.svg b/src/flags/nl.svg new file mode 100644 index 0000000..e90f5b0 --- /dev/null +++ b/src/flags/nl.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/flags/no.svg b/src/flags/no.svg new file mode 100644 index 0000000..a5f2a15 --- /dev/null +++ b/src/flags/no.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/flags/nz.svg b/src/flags/nz.svg new file mode 100644 index 0000000..935d8a7 --- /dev/null +++ b/src/flags/nz.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/ph.svg b/src/flags/ph.svg new file mode 100644 index 0000000..65489e1 --- /dev/null +++ b/src/flags/ph.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/flags/pl.svg b/src/flags/pl.svg new file mode 100644 index 0000000..0fa5145 --- /dev/null +++ b/src/flags/pl.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/flags/pt.svg b/src/flags/pt.svg new file mode 100644 index 0000000..445cf7f --- /dev/null +++ b/src/flags/pt.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/qa.svg b/src/flags/qa.svg new file mode 100644 index 0000000..901f3fa --- /dev/null +++ b/src/flags/qa.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/flags/ro.svg b/src/flags/ro.svg new file mode 100644 index 0000000..fda0f7b --- /dev/null +++ b/src/flags/ro.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/flags/rs.svg b/src/flags/rs.svg new file mode 100644 index 0000000..2f97102 --- /dev/null +++ b/src/flags/rs.svg @@ -0,0 +1,292 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/ru.svg b/src/flags/ru.svg new file mode 100644 index 0000000..cf24301 --- /dev/null +++ b/src/flags/ru.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/flags/sa.svg b/src/flags/sa.svg new file mode 100644 index 0000000..c0a1486 --- /dev/null +++ b/src/flags/sa.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/se.svg b/src/flags/se.svg new file mode 100644 index 0000000..8ba745a --- /dev/null +++ b/src/flags/se.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/flags/sg.svg b/src/flags/sg.svg new file mode 100644 index 0000000..c4dd4ac --- /dev/null +++ b/src/flags/sg.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/flags/si.svg b/src/flags/si.svg new file mode 100644 index 0000000..66a390d --- /dev/null +++ b/src/flags/si.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/flags/sk.svg b/src/flags/sk.svg new file mode 100644 index 0000000..8147694 --- /dev/null +++ b/src/flags/sk.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/flags/sm.svg b/src/flags/sm.svg new file mode 100644 index 0000000..00e9286 --- /dev/null +++ b/src/flags/sm.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/th.svg b/src/flags/th.svg new file mode 100644 index 0000000..1e93a61 --- /dev/null +++ b/src/flags/th.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/flags/tr.svg b/src/flags/tr.svg new file mode 100644 index 0000000..b96da21 --- /dev/null +++ b/src/flags/tr.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/flags/tw.svg b/src/flags/tw.svg new file mode 100644 index 0000000..57fd98b --- /dev/null +++ b/src/flags/tw.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/ua.svg b/src/flags/ua.svg new file mode 100644 index 0000000..a339eb1 --- /dev/null +++ b/src/flags/ua.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/flags/us.svg b/src/flags/us.svg new file mode 100644 index 0000000..9cfd0c9 --- /dev/null +++ b/src/flags/us.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/flags/uy.svg b/src/flags/uy.svg new file mode 100644 index 0000000..62c36f8 --- /dev/null +++ b/src/flags/uy.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/flags/za.svg b/src/flags/za.svg new file mode 100644 index 0000000..d563adb --- /dev/null +++ b/src/flags/za.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/overlays.js b/src/overlays.js index d0ceb5e..4fbe810 100644 --- a/src/overlays.js +++ b/src/overlays.js @@ -1,3 +1,4 @@ +import { rowFlag } from "./country_flags.js"; import { sortValuesAttribute } from "./list_sorting.js"; import { escapeHtml as escapeHtmlLocal } from "./html_escape.js"; import { overlayLiveMarks, passingFlashAttrs, renderLiveMarkBadges } from "./overlay_live_marks.js"; @@ -91,7 +92,7 @@ export function renderOverlayLeaderboard(rows, { t, escapeHtml, formatTeamActive ${idx + 1}
- ${escapeHtml(row.displayName || row.driverName)}${row.personalTimeUp ? ` 🏁 ${t("timing.personal_time_up")}` : ""}${row.suspectPending ? ` ⚠` : ""}${renderLiveMarkBadges(mark, { formatLap, escapeHtml, labels: markLabels })} + ${rowFlag(row)}${escapeHtml(row.displayName || row.driverName)}${row.personalTimeUp ? ` 🏁 ${t("timing.personal_time_up")}` : ""}${row.suspectPending ? ` ⚠` : ""}${renderLiveMarkBadges(mark, { formatLap, escapeHtml, labels: markLabels })} ${row.heatCarName ? `🚗 ${escapeHtml(row.heatCarName)}` : `${escapeHtml(row.teamId ? `${t("overlay.active_member")}: ${formatTeamActiveMemberLabel(row)}` : row.subLabel || row.transponder || "-")}`} ${row.lastSplitMs || row.pitActive || row.pitStops ? `${row.lastSplitMs ? `${t("table.split")}: ${formatLap(row.lastSplitMs)}` : ""}${row.lastSplitMs && (row.pitActive || row.pitStops) ? " • " : ""}${row.pitActive ? t("timing.pit_active") : row.pitStops ? `${t("table.pit")}: ${row.pitStops} / ${formatLap(row.totalPitMs)}` : ""}` : ""} ${row.invalidPending ? `${escapeHtml(row.invalidLabel)}${row.invalidLapMs ? ` • ${formatLap(row.invalidLapMs)}` : ""}` : ""} @@ -239,7 +240,7 @@ function renderObsBroadcast({ active, compactRows, startOrder, showStartGrid, fa const values = { pos: idx + 1, start: start ? `/${start}` : "", - name: `${escapeHtml(row.displayName || row.driverName)}${row.heatCarName ? ` 🚗 ${escapeHtml(row.heatCarName)}` : ""}${row.suspectPending ? ' ⚠' : ""}`, + name: `${obsConfig.showFlags !== false ? rowFlag(row) : ""}${escapeHtml(row.displayName || row.driverName)}${row.heatCarName ? ` 🚗 ${escapeHtml(row.heatCarName)}` : ""}${row.suspectPending ? ' ⚠' : ""}`, change: positionChangeMarkup(row, idx + 1), laps: row.laps ?? 0, last: row.lastLapMs > 0 ? escapeHtml(formatLap(row.lastLapMs)) : "-", @@ -389,7 +390,7 @@ export function renderObsOverlay(active, leaderboard, result, sessionTiming, bra return `
${idx + 1} - ${escapeHtml(row.displayName || row.driverName)}${row.personalTimeUp ? " 🏁" : ""}${row.suspectPending ? ` ⚠` : ""} + ${obsConfig.showFlags !== false ? rowFlag(row) : ""}${escapeHtml(row.displayName || row.driverName)}${row.personalTimeUp ? " 🏁" : ""}${row.suspectPending ? ` ⚠` : ""} ${row.heatCarName ? `🚗 ${escapeHtml(row.heatCarName)}` : ""} ${obsConfig.showLaps ? `${t("table.laps")}: ${row.laps ?? 0}` : ""} ${obsConfig.showLast && row.lastLapMs > 0 ? `${t("overlay.col_last")}: ${escapeHtml(formatLap(row.lastLapMs))}` : ""} @@ -440,7 +441,7 @@ export function renderObsOverlay(active, leaderboard, result, sessionTiming, bra
${idx + 1}
- ${escapeHtml(row.displayName || row.driverName)}${row.personalTimeUp ? " 🏁" : ""}${row.suspectPending ? ` ⚠` : ""} + ${obsConfig.showFlags !== false ? rowFlag(row) : ""}${escapeHtml(row.displayName || row.driverName)}${row.personalTimeUp ? " 🏁" : ""}${row.suspectPending ? ` ⚠` : ""} ${row.teamId ? `${escapeHtml(formatTeamActiveMemberLabel(row))}` : row.heatCarName ? `🚗 ${escapeHtml(row.heatCarName)}` : ""}
${trail ? `
${trail}
` : ""} diff --git a/src/race_day_view.js b/src/race_day_view.js index 51cf01c..1d00d41 100644 --- a/src/race_day_view.js +++ b/src/race_day_view.js @@ -1,3 +1,4 @@ +import { rowFlag } from "./country_flags.js"; import { isPracticeSessionType } from "./track_layouts_logic.js"; import { renderTrackLayoutBar, bindTrackLayoutBar } from "./track_layout_bar.js"; import { PROLOGUE_OPTIONS_SEC, formatPrologueOption } from "./prologue_logic.js"; @@ -193,7 +194,7 @@ function renderLivePanelInner({ t, escapeHtml, formatLap, formatRaceClock, build const progress = Math.round(Math.min(1, row.predictedProgress || 0) * 100); return ` ${index + 1} - ${escapeHtml(row.displayName || row.driverName || row.transponder || "-")}${flag}${row.heatCarName ? ` 🚗 ${escapeHtml(row.heatCarName)}` : ""}${row.invalidPending ? ` ⚠` : ""} + ${rowFlag(row)}${escapeHtml(row.displayName || row.driverName || row.transponder || "-")}${flag}${row.heatCarName ? ` 🚗 ${escapeHtml(row.heatCarName)}` : ""}${row.invalidPending ? ` ⚠` : ""} ${done ? "" : ``} ${row.laps} ${lap(row.lastLapMs)} diff --git a/src/race_overview_view.js b/src/race_overview_view.js index 0a625ee..dafe848 100644 --- a/src/race_overview_view.js +++ b/src/race_overview_view.js @@ -1,3 +1,4 @@ +import { rowFlag } from "./country_flags.js"; import { medal, qualCell } from "./medal.js"; // Race Day → Race overview panel: podium, then practice / qualifying / finals with standings // and every heat. Logic in race_overview_logic.js; print, PDF and CSV come in as deps. @@ -8,7 +9,7 @@ export function renderRaceOverviewPanel(overview, { t, escapeHtml, formatLap, re const { event, phases, podium } = overview; const heatTable = (rows) => renderTable( [t("table.pos"), ...(rows.some((row) => row.qual) ? [t("table.qual")] : []), t("table.driver"), ...(rows.some((row) => row.car) ? [t("race_overview.car")] : []), t("table.laps"), t("table.result"), t("table.best_lap")], - rows.map((row) => `${medal(row.pos)}${rows.some((item) => item.qual) ? qualCell(row.qual, escapeHtml) : ""}${escapeHtml(row.name)}${rows.some((item) => item.car) ? `${escapeHtml(row.car || "-")}` : ""}${row.laps}${escapeHtml(row.result)}${row.bestLapMs ? escapeHtml(formatLap(row.bestLapMs)) : "-"}`) + rows.map((row) => `${medal(row.pos)}${rows.some((item) => item.qual) ? qualCell(row.qual, escapeHtml) : ""}${rowFlag(row)}${escapeHtml(row.name)}${rows.some((item) => item.car) ? `${escapeHtml(row.car || "-")}` : ""}${row.laps}${escapeHtml(row.result)}${row.bestLapMs ? escapeHtml(formatLap(row.bestLapMs)) : "-"}`) ); return `
diff --git a/src/race_render_helpers.js b/src/race_render_helpers.js index 4f2bc98..8675beb 100644 --- a/src/race_render_helpers.js +++ b/src/race_render_helpers.js @@ -1,3 +1,4 @@ +import { rowFlag } from "./country_flags.js"; export function renderTeamStintLog(session, rows, { t, escapeHtml, buildTeamStintLog, formatTeamActiveMemberLabel, renderTable, formatRaceClock }) { if (!rows.length) { return `

${t("events.no_team_results")}

`; @@ -191,7 +192,7 @@ export function renderPositionGrid(session, { t, escapeHtml, getSessionGridEntri
${entry.slot}
- ${escapeHtml(entry.name)} + ${rowFlag(entry)}${escapeHtml(entry.name)} ${entry.meta ? `
${escapeHtml(entry.meta)}
` : ""}
@@ -408,7 +409,7 @@ export function buildRaceStartListsHtml(event, { t, state, escapeHtml, resolveEv return ` ${entry.slot} - ${escapeHtml(entry.name)} + ${rowFlag(entry)}${escapeHtml(entry.name)} ${escapeHtml(driver?.brand || "-")} ${escapeHtml(entry.meta || "-")} diff --git a/src/race_setup_ui.js b/src/race_setup_ui.js index 73ae725..2e2e035 100644 --- a/src/race_setup_ui.js +++ b/src/race_setup_ui.js @@ -1,3 +1,4 @@ +import { rowFlag } from "./country_flags.js"; import { medal, qualCell } from "./medal.js"; export function renderRaceFormatField(labelKey, hintKey, controlHtml, options = {}, { t }) { const extraClass = options.checkbox ? " field-card-checkbox" : ""; @@ -219,7 +220,7 @@ export function renderRaceStandingsTable(rows, emptyLabel, { t, renderTable, esc ${medal(row.rank)} ${withQual ? qualCell(row.qual, escapeHtml) : ""} - ${escapeHtml(row.driverName || t("common.unknown_driver"))} + ${rowFlag(row)}${escapeHtml(row.driverName || t("common.unknown_driver"))}
${escapeHtml(row.score || "-")}
${row.scoreNote ? `
${escapeHtml(row.scoreNote)}
` : ""} diff --git a/src/settings.js b/src/settings.js index b638843..05da94c 100644 --- a/src/settings.js +++ b/src/settings.js @@ -392,6 +392,7 @@ export function renderSettings(deps) { +
@@ -804,6 +805,7 @@ Erik Eriksson;654321;4WD;Associated;;
["obsShowBest", "showBest", (value, el) => Boolean(el?.checked)], ["obsShowLast", "showLast", (value, el) => Boolean(el?.checked)], ["obsShowGap", "showGap", (value, el) => Boolean(el?.checked)], + ["obsShowFlags", "showFlags", (value, el) => Boolean(el?.checked)], ["obsShowPositionChange", "showPositionChange", (value, el) => Boolean(el?.checked)], ["obsShowStart", "showStart", (value, el) => Boolean(el?.checked)], ].forEach(([id, key, mapper]) => { diff --git a/src/styles.css b/src/styles.css index d0d1796..9f9d30f 100644 --- a/src/styles.css +++ b/src/styles.css @@ -5057,3 +5057,7 @@ tr.is-selected td { background: color-mix(in srgb, var(--danger) 12%, transparen .day-fixed-break legend { font-size: 0.85rem; color: var(--muted); padding: 0 4px; } .day-fixed-break input[name="breakLabel"] { width: 9em; } .board-break, .board-break-note, .board-break-row td { color: var(--gold, #d9a441); font-weight: 700; } + +/* A driver's country flag before the name (src/flags, local SVG). */ +.country-flag { display: inline-block; width: 1.25em; height: 0.94em; margin-right: 0.4em; vertical-align: -0.08em; border-radius: 2px; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.25); object-fit: cover; } +.nowrap { white-space: nowrap; } diff --git a/src/timing_logic.js b/src/timing_logic.js index 1aad899..d8da4f3 100644 --- a/src/timing_logic.js +++ b/src/timing_logic.js @@ -1001,6 +1001,7 @@ export function getSessionGridEntries(session, { state, t, getEventTeams, getDri const car = state.cars.find((item) => item.id === assignment.carId); return { slot: index + 1, + driverId: assignment.driverId, name: driver?.name || t("common.unknown_driver"), meta: car ? `${car.name} (${car.transponder || "-"})` : t("common.unknown_car"), }; @@ -1030,6 +1031,7 @@ export function getSessionGridEntries(session, { state, t, getEventTeams, getDri const car = session.carAssignments?.[driverId] ? state.cars.find((item) => item.id === session.carAssignments[driverId]) : null; return { slot: index + 1, + driverId, name: driver?.name || t("common.unknown_driver"), meta: car ? `${car.name} (${car.transponder || "-"})` : driver?.transponder || "-", }; diff --git a/src/timing_views.js b/src/timing_views.js index f901528..af971e8 100644 --- a/src/timing_views.js +++ b/src/timing_views.js @@ -1,3 +1,4 @@ +import { rowFlag } from "./country_flags.js"; import { sortableTable, sortValuesAttribute } from "./list_sorting.js"; import { listPendingSuspectLaps } from "./suspect_laps_logic.js"; import { @@ -261,7 +262,7 @@ function renderLeaderboardModal(session, row, deps) {
-

${escapeHtml(row.displayName || row.driverName)} • ${escapeHtml(row.subLabel || row.carName)}

+

${rowFlag(row)}${escapeHtml(row.displayName || row.driverName)} • ${escapeHtml(row.subLabel || row.carName)}

${t("table.transponder")}: ${escapeHtml(row.transponder)}

${renderQuickAddActions(session, row.transponder, "leaderboardModal")}

${t("table.laps")}: ${row.laps}

@@ -338,7 +339,7 @@ function renderLeaderboard(rows, deps) { ${idx + 1} -
${escapeHtml(row.displayName || row.driverName)}${row.personalTimeUp ? ` 🏁 ${t("timing.personal_time_up")}` : ""}${row.suspectPending ? ` ⚠` : ""}
+
${rowFlag(row)}${escapeHtml(row.displayName || row.driverName)}${row.personalTimeUp ? ` 🏁 ${t("timing.personal_time_up")}` : ""}${row.suspectPending ? ` ⚠` : ""}
${row.teamId ? `
${t("overlay.active_member")}: ${escapeHtml(formatTeamActiveMemberLabel(row))}
` : ""} ${getManualCorrectionSummary(row) ? `
${escapeHtml(getManualCorrectionSummary(row))}
` : ""} ${row.invalidPending ? `
${escapeHtml(row.invalidLabel)}${row.invalidLapMs ? ` • ${formatLap(row.invalidLapMs)}` : ""}
` : ""} @@ -813,7 +814,7 @@ export function renderJudgingView(deps) { ${index + 1} -
${escapeHtml(row.displayName || row.driverName)}
+
${rowFlag(row)}${escapeHtml(row.displayName || row.driverName)}
${escapeHtml(row.subLabel || row.transponder || "-")}
${escapeHtml(row.resultDisplay || "-")} diff --git a/tests/country_flags.test.js b/tests/country_flags.test.js new file mode 100644 index 0000000..8c21f65 --- /dev/null +++ b/tests/country_flags.test.js @@ -0,0 +1,29 @@ +import test from "node:test"; +import assert from "node:assert/strict"; +import { existsSync } from "node:fs"; +import { COUNTRIES, countryCode, countryName, flagHtml, driverCountryCode } from "../src/country_flags.js"; + +test("a driver's country: name, English name, code or 3-letter code all give the flag", () => { + for (const value of ["Sverige", "sweden", "SE", "SWE", " sverige "]) assert.equal(countryCode(value), "SE", value); + assert.equal(countryCode("Norge"), "NO"); + assert.equal(countryCode("GBR"), "GB"); + assert.equal(countryName("NOR", "sv"), "Norge"); + assert.equal(countryName("NO", "en"), "Norway"); +}); + +test("no country, or an unknown one: no flag", () => { + assert.equal(flagHtml(""), ""); + assert.equal(flagHtml("Atlantis"), ""); + assert.match(flagHtml("Sverige"), /SE { + for (const [code] of COUNTRIES) assert.ok(existsSync(new URL(`../src/flags/${code.toLowerCase()}.svg`, import.meta.url)), code); +}); + +test("the same person in another class: the country only has to be set once", () => { + const drivers = [{ id: "a", profileId: "p", country: "Norge" }, { id: "b", profileId: "p", country: "" }, { id: "c", profileId: "q" }]; + assert.equal(driverCountryCode(drivers, "b"), "NO"); + assert.equal(driverCountryCode(drivers, "c"), ""); + assert.equal(driverCountryCode(drivers, "missing"), ""); +}); diff --git a/tests/overlay_leaderboard.test.js b/tests/overlay_leaderboard.test.js index 3f993cf..abf9168 100644 --- a/tests/overlay_leaderboard.test.js +++ b/tests/overlay_leaderboard.test.js @@ -71,3 +71,9 @@ test("practice ranked on 3 laps in a row: only result, gap and best lap as times assert.match(html, /class="overlay-prediction"/, "the next-lap bar stays"); for (const gone of ["table.laps", "table.ahead_gap", "table.own_delta"]) assert.doesNotMatch(html, new RegExp(gone.replace(".", "\\.")), gone); }); + +test("a driver's country: a small local flag before the name on the overlay; none without a country", () => { + const withFlag = renderOverlayLeaderboard([{ key: "a", driverId: "a", displayName: "Roy", countryCode: "NO", laps: 3, resultDisplay: "-", bestLapMs: 17500 }], deps); + assert.match(withFlag, /]*\/>Roy/); + assert.doesNotMatch(renderOverlayLeaderboard(rows(1), deps), /country-flag/); +}); diff --git a/tests/pdf_flags.test.js b/tests/pdf_flags.test.js new file mode 100644 index 0000000..6557e4d --- /dev/null +++ b/tests/pdf_flags.test.js @@ -0,0 +1,28 @@ +import test from "node:test"; +import assert from "node:assert/strict"; +import { createRequire } from "node:module"; +import { COUNTRIES } from "../src/country_flags.js"; + +const require = createRequire(import.meta.url); +const { buildStyledPdf } = require("../server/pdf_render.js"); +const { PDF_FLAG_CODES } = require("../server/pdf_flags.js"); + +const pdf = (flags) => buildStyledPdf({ title: "Final", filename: "x.pdf", theme: "classic", sections: [{ title: "A-final", headers: ["Pos", "Förare", "Resultat"], rows: [["1", "Anders Larsson", "20/5:01"], ["2", "Roy Gjemble", "20/5:04"], ["3", "Kim Lee", "19/5:00"]], flags }] }).toString("latin1"); + +test("PDF: a driver's flag is drawn before the name; no country, no flag", () => { + const sweden = "0.000 0.416 0.655 rg"; // #006aa7 + const norway = "0.729 0.047 0.184 rg"; // #ba0c2f + const withFlags = pdf(["SE", "NO", ""]); + assert.ok(withFlags.includes(sweden), "Swedish blue"); + assert.ok(withFlags.includes(norway), "Norwegian red"); + assert.ok(!pdf([]).includes(sweden), "no flags sent: none drawn"); +}); + +test("PDF: a country without a drawn flag shows its code instead", () => { + assert.match(pdf(["GB", "", ""]), /\(GB\) Tj/); +}); + +test("every flag the PDF draws is a country the app knows", () => { + const known = new Set(COUNTRIES.map(([code]) => code)); + for (const code of PDF_FLAG_CODES) assert.ok(known.has(code), code); +}); diff --git a/tests/run.js b/tests/run.js index 120a730..4721740 100644 --- a/tests/run.js +++ b/tests/run.js @@ -54,3 +54,5 @@ import "./sync_status.test.js"; import "./decoder_diagnostics.test.js"; import "./pdf_render.test.js"; import "./driver_list.test.js"; +import "./country_flags.test.js"; +import "./pdf_flags.test.js";