@johnmorrisdotca/kyogijo-stadiums 0.18.0 → 0.19.0

package/dist/judging.text.d.ts

@@ -0,0 +1,7 @@
+import type { JudgingSetting } from "./judging.ts";
+import type { JudgingOptions } from "./judging.types.ts";
+/** The title and the description of an assignment: each mat with each seat and who is in it. */
+export declare function judgingText(setting: JudgingSetting, options: Pick<JudgingOptions, "title" | "description">, chart: boolean, view?: "plan" | "broadcast"): {
+    title: string;
+    description: string;
+};

package/dist/judging.text.js

@@ -0,0 +1,23 @@
+// What a judging picture says in words: the title and the description of an assignment, each mat with each seat and who is in it. Shared by the plan view, the broadcast view and the 3D view.
+import { JUDGING_WORDS } from "./judging.words.js";
+import { fill } from "./strings.js";
+/** The sentence that names one seat and who sits in it. */
+function seatSentence(a, setting) {
+    const w = JUDGING_WORDS[setting.language].say;
+    const seat = a.seat.label[setting.language];
+    if (!a.assigned)
+        return fill(w.seatVacant, { seat });
+    if (a.id === "")
+        return fill(w.seatNoId, { seat, name: a.name });
+    return fill(w.seat, { seat, name: a.name === "" ? "—" : a.name, id: a.id });
+}
+/** The title and the description of an assignment: each mat with each seat and who is in it. */
+export function judgingText(setting, options, chart, view = setting.view) {
+    const words = JUDGING_WORDS[setting.language];
+    const style = fill(words.styleName[setting.style], { count: setting.mats[0].seats.length });
+    const mats = setting.total === 1 ? words.say.matsOne : fill(words.say.matsMany, { n: setting.total });
+    const title = options.title ?? fill(words.say.title, { style, mats });
+    const sentences = setting.mats.map((m) => fill(words.say.mat, { label: m.label, seats: m.seats.map((a) => seatSentence(a, setting)).join(words.say.join) }));
+    const description = options.description ?? [...sentences, view === "broadcast" ? words.say.board : chart && setting.seatNames ? words.say.names : words.say.chartOnly].join(setting.language === "ja" ? "" : " ");
+    return { title, description };
+}

package/dist/judging.turn.js

@@ -89,16 +89,16 @@ export function buildJudgingTurn(options, settings = {}) {
             const base = atTable ? tableTop : ft(H.post);
             if (!atTable)
                 stands.push(...pole(`m${mat.n}-post-${a.seat.n}`, "pole", cx, cy, 0, base, ft(0.06), "u-pole"));
-            const fit = fitted[si];
+            const fit = setting.seatNames ? fitted[si] : undefined;
             if (fit !== undefined) {
                 const p = plane(`m${mat.n}-card-${a.seat.n}`, "card", [cx - b.w / 2, cy, base + cardH], [b.w, 0, 0], [0, 0, -cardH], card(TURN_CARD, fit, a.seat.n, 0, 0, b.w, cardH, b.pad, b.r, 0.1));
-                cards.push({ ...p, billboard: true });
+                cards.push({ ...p, billboard: true, lean: true });
             }
             else {
-                // Nobody in the seat, or a name that does not fit a card: the seat's number alone, on a small badge, with the name in the chart.
-                const br = 0.55;
+                // The names are not on the seats, or this one does not fit a card: the seat's number alone, on a round badge like the chart's, with the name in the chart.
+                const br = 0.9;
                 const p = plane(`m${mat.n}-badge-${a.seat.n}`, "card", [cx - br, cy, base + 2 * br], [2 * br, 0, 0], [0, 0, -2 * br], badge(TURN_CARD, br, br, br * 0.92, a.seat.n, a.assigned));
-                cards.push({ ...p, billboard: true });
+                cards.push({ ...p, billboard: true, lean: true });
             }
         });
         // The mat's name on a sign over the whole table, on a pole at each end of it.
@@ -111,7 +111,7 @@ export function buildJudgingTurn(options, settings = {}) {
         const lines = text?.name ?? [mat.label];
         const size = text?.nameSize ?? signH * 0.3;
         const label = lines.map((line, i) => `<text class="u-sign-text" x="${n(signW / 2)}" y="${n(signH / 2 + (i - (lines.length - 1) / 2) * size * 1.1 + size * 0.34)}" font-size="${n(size)}">${line.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")}</text>`).join("");
-        const sign = { ...plane(`m${mat.n}-sign`, "sign", [midX - signW / 2, midY, signBottom + signH], [signW, 0, 0], [0, 0, -signH], `<rect class="u-sign" width="${n(signW)}" height="${n(signH)}" rx="${n(signH * 0.12)}"/>${label}`), billboard: true };
+        const sign = { ...plane(`m${mat.n}-sign`, "sign", [midX - signW / 2, midY, signBottom + signH], [signW, 0, 0], [0, 0, -signH], `<rect class="u-sign" width="${n(signW)}" height="${n(signH)}" rx="${n(signH * 0.12)}"/>${label}`), billboard: true, lean: true };
         const poles = [table.x0, table.x1].flatMap((px, k) => pole(`m${mat.n}-sign-pole-${k + 1}`, "pole", ft(px), midY, tableTop, signBottom + signH * 0.5, ft(0.06), "u-pole"));
         items.push({ id: `m${mat.n}-furniture`, kind: "officials", at: [midX, midY], height: tableTop, planes: furniture });
         items.push({ id: `m${mat.n}-judges`, kind: "judges", at: [midX, midY], height: tableTop + cardH, planes: [...cards, ...stands, ...poles, sign] });
@@ -130,8 +130,8 @@ export function buildJudgingTurn(options, settings = {}) {
         language,
         options: surfaceLike,
         title,
-        description: `${description}${language === "ja" ? "" : " "}${words.turn.standing}`,
-        standing: words.turn.standing,
+        description: `${description}${language === "ja" ? "" : " "}${setting.seatNames ? words.turn.standing : words.turn.standingBadges}`,
+        standing: setting.seatNames ? words.turn.standing : words.turn.standingBadges,
         floor,
         viewBox: { x: vx, y: vy, w: vw, h: vh },
         scale,

package/dist/judging.types.d.ts

@@ -15,6 +15,8 @@ export interface JudgingMat {
     label?: string;
     /** Who sits where. A seat that is not named is shown as not assigned. */
     officials?: readonly JudgingOfficial[];
+    /** A line for the broadcast board's foot, before the style: `Round 2`, `Pool B`, `Final block`. At most 60 characters. */
+    line?: string;
 }
 /** A judging assignment as the drawing asks for it. */
 export interface JudgingOptions {
@@ -28,6 +30,16 @@ export interface JudgingOptions {
     chart?: "auto" | "always" | "never";
     /** Shiai: draw the two side judges' seats too (the IJF's rules for an event with no CARE system use them; its other events have none), as not assigned where nobody is named. A seat a mat names is drawn whatever this says. Off by default. */
     sideJudges?: boolean;
+    /**
+     * Put the names on the seats as well as in the chart. Off by default: a seat then shows its number alone, on the round badge the chart's rows have, and the chart is the key. On, a name is set in the chart's own face, scaled
+     * evenly (never stretched or condensed), in the biggest size that fits its card and no smaller than a readable one; a seat whose name does not fit shows its number alone.
+     */
+    seatNames?: boolean;
+    /**
+     * What is drawn: the `plan` with its chart (the default, the layout to print) or the `broadcast` picture: the mat large, as a television would show it, with the officials on a board at its side like a graphic, the seats' number
+     * badges where the officials sit, and no chart. The picture is 16:9 and scales as a whole, type and all, so it is as sharp on a tablet as on a television.
+     */
+    view?: "plan" | "broadcast";
     /** Where the chart is laid: beside the plan (`landscape`, the default) or under it (`portrait`). */
     orientation?: "landscape" | "portrait";
     /** What the plan shows: the whole `mat` (the default) or the judges' `bench`, close up, so that the names in the seats are as large as they can be. */
@@ -74,5 +86,7 @@ export interface JudgingResolved {
     /** From 1. */
     n: number;
     label: string;
+    /** The line for the broadcast board's foot; empty when there is none. */
+    line: string;
     seats: JudgingAssignment[];
 }

package/dist/judging.words.d.ts

@@ -27,6 +27,7 @@ export interface JudgingWords {
         seatVacant: string;
         names: string;
         chartOnly: string;
+        board: string;
         join: string;
     };
     /** The table that says the same as the picture. */
@@ -40,6 +41,7 @@ export interface JudgingWords {
     /** What the 3D view says of the seats' name cards. */
     turn: {
         standing: string;
+        standingBadges: string;
         board: string;
     };
 }

package/dist/judging.words.js

@@ -13,10 +13,11 @@ export const JUDGING_WORDS = {
             seatVacant: "{seat} not assigned",
             names: "The names are in the seats where they fit, and in the chart of mat, seat, name and ID.",
             chartOnly: "The names are in the chart of mat, seat, name and ID.",
+            board: "The officials are listed on a board at the side of the mat, each with the number of the seat, name and ID; the numbers are on the seats.",
             join: "; ",
         },
         table: { caption: "{title}", mat: "Mat", seat: "Seat", name: "Name", id: "ID" },
-        turn: { standing: "A name card stands at each judge's seat, turned to face the eye, and the name of each mat stands over its judges' table.", board: "Mat" },
+        turn: { standing: "A name card stands at each judge's seat, turned to face the eye, and the name of each mat stands over its judges' table.", standingBadges: "A numbered badge stands at each judge's seat, leaning back to face the eye, and the name of each mat stands over its judges' table.", board: "Mat" },
     },
     ja: {
         mat: "第{n}試合場",
@@ -32,9 +33,10 @@ export const JUDGING_WORDS = {
             seatVacant: "{seat}は未定",
             names: "氏名は、席に収まる場合は各席の中に表示し、試合場・席・氏名・IDの一覧表にも載せています。",
             chartOnly: "氏名は、試合場・席・氏名・IDの一覧表に載せています。",
+            board: "審判員は、席の番号・氏名・IDとともに試合場の横の表示板に載せ、席の番号は各席に表示しています。",
             join: "、",
         },
         table: { caption: "{title}", mat: "試合場", seat: "席", name: "氏名", id: "ID" },
-        turn: { standing: "各審判員の席に名札を置き、見ている方向に向くようにしています。各試合場の名前は審判員席の上に掲げています。", board: "試合場" },
+        turn: { standing: "各審判員の席に名札を置き、見ている方向に向くようにしています。各試合場の名前は審判員席の上に掲げています。", standingBadges: "各審判員の席に番号の丸い札を置き、見ている方向に向くようにしています。各試合場の名前は審判員席の上に掲げています。", board: "試合場" },
     },
 };

package/dist/surfaces/budo.d.ts

@@ -3,4 +3,6 @@ import { type BuildOptions, type Surface } from "./surface.ts";
 /** Feet in a metre. */
 export declare const K: number;
 /** The surface of the plan lying wide. `margin` is the ground round what is drawn, in feet. */
+/** The least width a tape is drawn at, as a share of the plan's width (0.75 %: about 4 pixels on a plan 560 pixels across), unless `exactLines` is set. */
+export declare const TAPE_LEAST = 0.0075;
 export declare function budoSurface(o: BuildOptions, plan: BudoPlan, margin: number): Surface;

package/dist/surfaces/budo.js

@@ -14,6 +14,18 @@ function rangeOf(r, ox, oy) {
     return "left" in r ? atEnds((end) => feetBox(end === "left" ? r.left : r.right, ox, oy)) : feetBox(r, ox, oy);
 }
 /** The surface of the plan lying wide. `margin` is the ground round what is drawn, in feet. */
+/** The least width a tape is drawn at, as a share of the plan's width (0.75 %: about 4 pixels on a plan 560 pixels across), unless `exactLines` is set. */
+export const TAPE_LEAST = 0.0075;
+/** A bar widened across its shorter side to at least `least` metres, evenly about its middle; a bar that is wide enough is the same bar. */
+function widen(bar, least) {
+    const w = bar.x1 - bar.x0;
+    const h = bar.y1 - bar.y0;
+    if (Math.min(w, h) >= least)
+        return bar;
+    if (w < h)
+        return { ...bar, x0: (bar.x0 + bar.x1) / 2 - least / 2, x1: (bar.x0 + bar.x1) / 2 + least / 2 };
+    return { ...bar, y0: (bar.y0 + bar.y1) / 2 - least / 2, y1: (bar.y0 + bar.y1) / 2 + least / 2 };
+}
 export function budoSurface(o, plan, margin) {
     const ox = plan.box.x0;
     const oy = plan.box.y0;
@@ -81,7 +93,11 @@ export function budoSurface(o, plan, margin) {
     const thick = o.exact ? plan.lineWidth : plan.drawnLine;
     // The seams are the plan's finest lines: left out of a drawing that asks for the simple detail.
     const shown = full ? plan : { ...plan, shapes: plan.shapes.filter((s) => s.feature !== "seams" && s.feature !== "boards") };
-    const lines = group(strokes(shown, o) + marks(shown, o), "ky-bud-lines");
+    // A tape is 5 cm to 6 cm wide: at the size of a drawing that is a hairline. Unless the lines are asked for at their true widths (`exactLines`), a tape is drawn at least `TAPE_LEAST` of the plan's width across (a readability floor,
+    // not a measurement: its length is always the rule's), widened evenly about its middle.
+    const floor = (plan.box.x1 - plan.box.x0) * TAPE_LEAST;
+    const taped = o.exact ? shown : { ...shown, shapes: shown.shapes.map((s) => (s.kind === "bar" ? widen(s, floor) : s)) };
+    const lines = group(strokes(taped, o) + marks(taped, o), "ky-bud-lines");
     const W = (plan.box.x1 - plan.box.x0) * K;
     const H = (plan.box.y1 - plan.box.y0) * K;
     const cx = (plan.centre.x - ox) * K;

package/dist/turn.kit.d.ts

@@ -16,6 +16,11 @@ export interface Plane {
      * place as it lies at a yaw of 0; `v` must be vertical.
      */
     billboard?: boolean;
+    /**
+     * A billboard that also leans back to face the eye squarely, as the pitch tips the view: a card that stands upright is seen foreshortened from above, and its type looks squeezed, so a plane that carries type leans
+     * till its face is square to the eye. It is turned only (never stretched): its width and height stay what they are. At an overhead view it lies flat. `v` must be vertical, as for a billboard.
+     */
+    lean?: boolean;
     /**
      * A wall round the surface that gives way when it is between the eye and what it surrounds: the horizontal direction (x, y, a unit vector) that points from the surface out through the
      * wall. The nearer the eye is to that side, and the lower it is, the more the wall is cut away (see `fadeOf`), so that the court is never hidden behind its own glass.
@@ -56,7 +61,7 @@ export declare const cross: (a: V3, b: V3) => V3;
 /** A number for markup: millimetres of a foot, no more. */
 export declare const n: (value: number) => string;
 /** A billboard turned to face an eye whose view is turned `yaw` degrees: its width runs along the screen's x, which in the scene is (cos yaw, -sin yaw, 0). */
-export declare function facing(p: Plane, yaw: number): Plane;
+export declare function facing(p: Plane, yaw: number, pitch?: number): Plane;
 /** A plane. */
 export declare const plane: (id: string, kind: PartKind, o: V3, u: V3, v: V3, svg: string) => Plane;
 /**

package/dist/turn.kit.js

@@ -18,14 +18,18 @@ export const cross = (a, b) => [a[1] * b[2] - a[2] * b[1], a[2] * b[0] - a[0] *
 /** A number for markup: millimetres of a foot, no more. */
 export const n = (value) => String(Math.round(value * 1000) / 1000);
 /** A billboard turned to face an eye whose view is turned `yaw` degrees: its width runs along the screen's x, which in the scene is (cos yaw, -sin yaw, 0). */
-export function facing(p, yaw) {
+export function facing(p, yaw, pitch = 0) {
     if (p.billboard !== true)
         return p;
     const [w, h] = size(p);
     const a = (yaw * Math.PI) / 180;
     const u = [w * Math.cos(a), -w * Math.sin(a), 0];
     const middle = [p.o[0] + (p.u[0] + p.v[0]) / 2, p.o[1] + (p.u[1] + p.v[1]) / 2, p.o[2] + (p.u[2] + p.v[2]) / 2];
-    const v = [0, 0, p.v[2] < 0 ? -h : h];
+    // A plane that leans has its height along the screen's vertical, which at a pitch tips back from the vertical: (cos p sin yaw, cos p cos yaw, -sin p) is the way down the screen, in the scene.
+    const b = (pitch * Math.PI) / 180;
+    const down = p.lean === true ? [Math.cos(b) * Math.sin(a), Math.cos(b) * Math.cos(a), -Math.sin(b)] : [0, 0, -1];
+    const sign = p.v[2] < 0 ? 1 : -1;
+    const v = [down[0] * h * sign, down[1] * h * sign, down[2] * h * sign];
     return { ...p, o: [middle[0] - (u[0] + v[0]) / 2, middle[1] - (u[1] + v[1]) / 2, middle[2] - (u[2] + v[2]) / 2], u, v };
 }
 /** A plane. */

package/dist/turn.markup.js

@@ -27,7 +27,7 @@ export function layoutOf(model, view, width, height, lens) {
     const centre = model.centre;
     const floor = { id: "floor", kind: "ground", o: [model.viewBox.x, model.viewBox.y, model.uprights.lift], u: [model.viewBox.w, 0, 0], v: [0, model.viewBox.h, 0], svg: "" };
     // A billboard faces the eye at this view.
-    const planes = model.planes.map((p) => facing(p, view.yaw));
+    const planes = model.planes.map((p) => facing(p, view.yaw, view.pitch));
     const transforms = [floor, ...planes].map((p) => matrix3d(multiply(camera, planeMatrix(p, s, centre))));
     // Far to near: a plane's depth is that of its middle. The ground of a hall is under everything. The floor is next, unless it stands raised on something (a table tennis table's top, on its legs): then it is
     // sorted with the rest, by its middle, so that the legs and the skirt on the far side are drawn under it and the ones on the near side over it, and nothing under the top shows through it.

package/dist/turn.model.js

@@ -42,7 +42,7 @@ export function sceneBox(planes, area, lift, centre, scale) {
     let top = lift;
     for (const p of planes) {
         // A billboard turns about its middle: whichever way it faces, it lies within a circle as wide as it is.
-        const reach = p.billboard === true ? Math.hypot(...p.u) / 2 : 0;
+        const reach = p.billboard === true ? (p.lean === true ? Math.hypot(...p.u, ...p.v) / 2 : Math.hypot(...p.u) / 2) : 0;
         for (const [a, b] of [[0, 0], [1, 0], [0, 1], [1, 1]]) {
             const point = [p.o[0] + a * p.u[0] + b * p.v[0], p.o[1] + a * p.u[1] + b * p.v[1], p.o[2] + a * p.u[2] + b * p.v[2]];
             if (reach > 0) {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
 /** The package's version: the same as package.json's, and a test holds them to each other. */
-export declare const VERSION = "0.18.0";
+export declare const VERSION = "0.19.0";

package/dist/version.js

@@ -1,2 +1,2 @@
 /** The package's version: the same as package.json's, and a test holds them to each other. */
-export const VERSION = "0.18.0";
+export const VERSION = "0.19.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@johnmorrisdotca/kyogijo-stadiums",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "Kyogijo Stadiums 競技場, 39 sports' surfaces as SVG, drawn to scale from the rulebooks: NFL, CFL and IFAF football fields, an NHL rink, an NBA court, MLB ballparks, soccer pitches, curling sheets, athletics stadiums, speed skating, short track and figure skating rinks, swimming pools, water polo fields, diving wells, artistic swimming areas, and the courts and fields of tennis, volleyball (indoor, beach and sitting), badminton, pickleball, table tennis, padel, squash, racquetball, sepak takraw, teqball, roundnet, netball, lacrosse, rugby, Australian football, Gaelic games, cricket, field hockey and handball, and the budo of judo, karate, kendo, sumo and kyudo with a dojo of tatami laid as real units, with each team's name and logo on its side and the score in the middle, stands and a crowd, a pageant of flags, and a 3D view. Light and dark, accessible, a compact badge for lists, a helper for React and a custom element. Zero dependencies.",
   "keywords": [
     "sports",