@johnmorrisdotca/kyogijo-stadiums 0.5.0 → 0.6.1

package/dist/heat.zones.js

@@ -15,6 +15,7 @@ import { WATER_POLO } from "./pool.figures.js";
 import { swimPlan } from "./pool.js";
 import { athleticsLanes, athleticsLeague } from "./athletics/plan.js";
 import { skatingPlan } from "./skating/plan.js";
+import { budoPlan } from "./budo/plan.js";
 import { laneEdges } from "./skating/track.js";
 import { iceRadius } from "./skating/long.js";
 import { LEAGUES, chooseLeague, cricketOf } from "./leagues.js";
@@ -36,6 +37,7 @@ export const ZONE_SETS = Object.freeze({
     "pool-lanes": { sports: ["swimming"], title: "Lanes: each lane of the pool, the whole length of it", source: "docs/sources.md#zone-sets" },
     "water-polo-areas": { sports: ["waterpolo"], title: "The goal area, the ground from 2 to 6 m, and the rest of the field, at each end", source: "docs/sources.md#zone-sets" },
     "pool-thirds": { sports: ["diving", "artisticswimming"], title: "Thirds along the pool, from the wall the boards or the judges stand at", source: "docs/sources.md#zone-sets" },
+    "budo-areas": { sports: ["judo", "karate", "kendo", "sumo", "kyudo", "dojo"], title: "The surface in its areas: the contest and the safety areas, the boundary band, the clay and the ring of a dohyō, the shajō, the yamichi and the azuchi, a dojo's floor", source: "docs/sources.md#zone-sets" },
     "field-thirds": { sports: ["lacrosse", "rugby", "afl", "gaelic", "fieldhockey", "handball", "netball"], title: "Thirds: defensive, middle and attacking", source: "docs/sources.md#zone-sets" },
     "skating-track": { sports: ["skating"], title: "The rink in parts: the finish straight, the first curve, the crossing straight, the second curve and the infield (a figure skating rink in thirds)", source: "docs/sources.md#zone-sets" },
     "athletics-track": { sports: ["athletics"], title: "The track in parts: the finish straight, the first bend, the back straight, the second bend, and the infield", source: "docs/sources.md#zone-sets" },
@@ -197,7 +199,7 @@ function nhlZones(id, ctx) {
     return out;
 }
 /** The distance from home plate along a ray at `angle` (degrees, 0 straight out to centre field, negative to left) to the edge of the infield: the arc 95 feet round the pitcher's plate. */
-function infieldReach(angle) {
+export function infieldReach(angle) {
     const a = (angle * Math.PI) / 180;
     const along = MLB.pitcher * Math.cos(a);
     return along + Math.sqrt(along * along + MLB.skinRadius * MLB.skinRadius - MLB.pitcher * MLB.pitcher);
@@ -463,7 +465,7 @@ function poolLanes(ctx) {
 }
 /**
  * A water polo field at each end: the goal area (to the 2 m line), the ground from 2 to 6 m (where the penalty foul applies), and the rest, split at the half distance line. The marks are the rules' (Part Six,
- * Appendix 4); the zones are ours.
+ * Article 21.7, February 2026; Appendix 4, 20.4.1.5 in the June 2025 edition); the zones are ours.
  */
 function waterPoloAreas(ctx) {
     const { box } = ctx.outline;
@@ -556,6 +558,56 @@ function skatingZones(ctx) {
         { id: "second-curve", name: w.secondCurve, d: west, label: [cx - (S / 2 + (R + Ro) / 2) * k, cy], room: [(Ro - R) * k, R * k], has: (x, y) => { const [u, v] = m(x, y); return onIce(u, v) && u < -S / 2; } },
     ];
 }
+/**
+ * The budō surface in its areas, each as the plan lays it out (budo/plan.ts): a judo or karate area's mats by the colour they are laid in (the safety area under, the contest area, and for karate the boundary band, over
+ * it); a dohyō's clay, the jano-me and the ring; a kyūdōjō's shajō, yamichi and azuchi; a kendo floor and a dojo's in two parts (a dojo's kamiza end and the rest). The zones are ours: no rule names them.
+ */
+function budoZones(ctx) {
+    const plan = budoPlan({ sport: ctx.o.sport, league: ctx.o.league, budo: ctx.o.budo, dojo: ctx.o.dojo });
+    const k = FEET_PER_METRE;
+    const ox = plan.box.x0;
+    const oy = plan.box.y0;
+    const w = ctx.words;
+    const box = (b) => [(b.x0 - ox) * k, (b.y0 - oy) * k, (b.x1 - ox) * k, (b.y1 - oy) * k];
+    const one = (id, name, b) => {
+        const [x0, y0, x1, y1] = box(b);
+        return rect(id, name, x0, y0, x1, y1, true, true);
+    };
+    const whole = one("surface", w.budoSafety, plan.box);
+    // The zones do not overlap: a zone is what is in it and in none of the zones laid over it.
+    const inBox = (b, x, y) => x >= (b.x0 - ox) * k - 1e-9 && x <= (b.x1 - ox) * k + 1e-9 && y >= (b.y0 - oy) * k - 1e-9 && y <= (b.y1 - oy) * k + 1e-9;
+    const without = (z, over) => ({ ...z, has: (x, y) => z.has(x, y) && !over.some((b) => inBox(b, x, y)) });
+    if (plan.judo !== undefined)
+        return [without(one("safety-area", w.budoSafety, plan.judo.tatami), plan.judo.contests), ...plan.judo.contests.map((c, i) => one(`contest-area-${i + 1}`, w.budoContest, c))];
+    if (plan.karate !== undefined)
+        return [without(one("safety-area", w.budoSafety, plan.karate.mats), plan.karate.areas), ...plan.karate.areas.map((c, i) => without(one(`boundary-band-${i + 1}`, w.budoBand, c), plan.karate.inner)), ...plan.karate.inner.map((c, i) => one(`contest-area-${i + 1}`, w.budoContest, c))];
+    if (plan.sumo !== undefined) {
+        const L = plan.sumo;
+        const [cx, cy] = [(L.centre[0] - ox) * k, (L.centre[1] - oy) * k];
+        const ring = (r) => `M${num(cx - r * k)} ${num(cy)}A${num(r * k)} ${num(r * k)} 0 1 0 ${num(cx + r * k)} ${num(cy)}A${num(r * k)} ${num(r * k)} 0 1 0 ${num(cx - r * k)} ${num(cy)}Z`;
+        const jano = L.outer + plan.figures.jano;
+        const dist = (x, y) => Math.hypot(x - cx, y - cy) / k;
+        const base = one("clay", w.budoClay, L.platform);
+        const inner = L.ring + plan.figures.bale.width;
+        return [
+            { ...base, has: (x, y) => base.has(x, y) && dist(x, y) > jano },
+            { id: "jano-me", name: w.budoJano, d: ring(jano), label: [cx, cy - ((L.outer + jano) / 2) * k], room: [(jano - L.outer) * k, (jano - L.outer) * k], has: (x, y) => dist(x, y) <= jano && dist(x, y) > inner },
+            { id: "ring", name: w.budoRing, d: ring(L.ring), label: [cx, cy - L.ring * 0.5 * k], room: [L.ring * k, L.ring * k * 0.4], has: (x, y) => dist(x, y) <= inner },
+        ];
+    }
+    if (plan.kyudo !== undefined) {
+        const parts = [plan.kyudo.shajo, plan.kyudo.yamichi, plan.kyudo.azuchi];
+        return [without({ ...whole, id: "range", name: w.budoRest }, parts), one("shajo", w.budoShajo, plan.kyudo.shajo), without(one("yamichi", w.budoYamichi, plan.kyudo.yamichi), [plan.kyudo.shajo, plan.kyudo.azuchi]), without(one("azuchi", w.budoAzuchi, plan.kyudo.azuchi), [plan.kyudo.shajo, plan.kyudo.yamichi])];
+    }
+    const ranges = plan.ranges;
+    const kamiza = ranges.kamiza;
+    if (plan.dojo !== undefined && kamiza !== undefined && !("left" in kamiza))
+        return [without({ ...whole, id: "floor", name: w.budoRest }, [kamiza]), one("kamiza", w.budoKamiza, kamiza)];
+    const halves = ranges.half;
+    if (halves !== undefined && "left" in halves)
+        return [one("left", w.endLeft, halves.left), without(one("right", w.endRight, halves.right), [halves.left])];
+    return [whole];
+}
 /** The zones of a set on the surface the context describes. Throws for a set that is not for the surface's sport. */
 export function buildZoneSet(id, ctx) {
     if (!Object.prototype.hasOwnProperty.call(ZONE_SETS, id))
@@ -567,6 +619,6 @@ export function buildZoneSet(id, ctx) {
         const { zones, which } = retrosheetZones(ctx);
         return { id, zones, which };
     }
-    const zones = id === "skating-track" ? skatingZones(ctx) : id === "athletics-track" ? athleticsZones(ctx) : id === "field-thirds" ? fieldThirds(ctx) : id === "cricket-ground" ? cricketZones(ctx) : id.startsWith("soccer") ? soccerZones(id, ctx) : id === "nba-shot" ? nbaZones(ctx) : id.startsWith("nhl") ? nhlZones(id, ctx) : id === "baseball-spray" ? baseballSpray(ctx) : id === "curling-house" ? curlingZones(ctx) : id === "net-court" ? netZones(ctx) : id === "wall-court" ? wallZones(ctx) : id === "roundnet-rings" ? roundnetZones(ctx) : id === "pool-lanes" ? poolLanes(ctx) : id === "water-polo-areas" ? waterPoloAreas(ctx) : id === "pool-thirds" ? poolThirds(ctx) : footballPass(ctx);
+    const zones = id === "budo-areas" ? budoZones(ctx) : id === "skating-track" ? skatingZones(ctx) : id === "athletics-track" ? athleticsZones(ctx) : id === "field-thirds" ? fieldThirds(ctx) : id === "cricket-ground" ? cricketZones(ctx) : id.startsWith("soccer") ? soccerZones(id, ctx) : id === "nba-shot" ? nbaZones(ctx) : id.startsWith("nhl") ? nhlZones(id, ctx) : id === "baseball-spray" ? baseballSpray(ctx) : id === "curling-house" ? curlingZones(ctx) : id === "net-court" ? netZones(ctx) : id === "wall-court" ? wallZones(ctx) : id === "roundnet-rings" ? roundnetZones(ctx) : id === "pool-lanes" ? poolLanes(ctx) : id === "water-polo-areas" ? waterPoloAreas(ctx) : id === "pool-thirds" ? poolThirds(ctx) : footballPass(ctx);
     return { id, zones, which: lastWins(zones) };
 }

package/dist/homeside.js

@@ -42,6 +42,13 @@ export const HOME_FIRST = Object.freeze({
     athletics: false,
     // A skating race has no home and away.
     skating: false,
+    // A budō contest is between the first contestant called and the second (judo: blue to the referee's right, white to his left; karate: aka and ao; kendo: aka and shiro; sumo: east and west): no home side.
+    judo: false,
+    karate: false,
+    kendo: false,
+    sumo: false,
+    kyudo: false,
+    dojo: false,
 });
 /** The leagues whose convention is not their sport's: the international federation's lacrosse lists the home team first. */
 export const HOME_FIRST_LEAGUES = Object.freeze({

package/dist/index.d.ts

@@ -1,6 +1,9 @@
 export { COLOR_PROPERTIES, SPORTS, crowdStands, describe, drawBadge, drawKyogijo, drawScore, drawSurface, isPortrait, statusLabel, statusText, winnerOf } from "./draw.ts";
 export { HOME_FIRST, HOME_FIRST_LEAGUES, homeSideFor } from "./homeside.ts";
-export { inkOn, luminance, rgbOf, safeColour, safeLogo } from "./colour.ts";
+export { inkOn, luminance, rgbOf, safeColour, safePicture } from "./colour.ts";
+export { safeLogo } from "./logo.ts";
+export { useEmblems } from "./emblems-source.ts";
+export type { EmblemDrawOptions, EmblemId, EmblemRef, EmblemRenderer, EmblemStyleName } from "./emblems-source.ts";
 export { OUTCOMES, drawLayers, layerTable } from "./layers.ts";
 export { RANGES } from "./ranges.names.ts";
 export { BACKGROUND_OPACITY, BACKGROUND_PATTERNS, KYOGIJO_BACKGROUND_STYLE } from "./background.ts";
@@ -14,6 +17,10 @@ export type { Area as FieldArea, FieldPlan, GoalPlan as FieldGoalPlan, Outline a
 export { KYOGIJO_FIELDS_STYLE } from "./fields.style.ts";
 export { KYOGIJO_ATHLETICS_STYLE, KYOGIJO_TRACK_STYLE } from "./athletics.style.ts";
 export { KYOGIJO_SKATING_STYLE } from "./skating.style.ts";
+export { KYOGIJO_BUDO_STYLE } from "./budo.style.ts";
+export { dojo, drawDojo } from "./budo/dojo.api.ts";
+export type { Dojo, Tatami } from "./budo/dojo.api.ts";
+export type { BudoScore, BudoStyle, DojoSpec } from "./budo/types.ts";
 export type { SkatingDiscipline, SkatingFurniture, SkatingInfield, SkatingRace, SkatingStyle } from "./skating/types.ts";
 export type { AthleticsFieldEvent, AthleticsInfield, AthleticsRace, AthleticsStyle, AthleticsTrackLook, WaterJump } from "./athletics/types.ts";
 export type { RangeInfo } from "./ranges.names.ts";
@@ -30,6 +37,9 @@ export { KYOGIJO_CROWD_STYLE } from "./crowd.draw.ts";
 export { GRIDIRON_GROUNDS, WALL_SEATS, outlinePath, outlinePoints } from "./crowd.ts";
 export type { CrowdStands, StandGap, StandRing, StandSector, Outline as StandOutline } from "./crowd.ts";
 export { KYOGIJO_MARK_STYLE } from "./mark.ts";
+export { DRIVE_CODES, readSituation, situationText } from "./situation.ts";
+export type { BaseballSituation, DriveLeg, DriveResult, FootballSituation, HockeySituation, ShootoutAttempt, ShootoutRound, Situation, SituationContext, SituationRead, SituationTeam, HockeyRead, BaseballRead, FootballRead, DriveRead } from "./situation.ts";
+export { KYOGIJO_SITUATION_STYLE } from "./situation.style.ts";
 export { KYOGIJO_PAGEANT_MOTION, KYOGIJO_PAGEANT_STYLE } from "./pageant.style.ts";
 export { KYOGIJO_POOL_STYLE } from "./pool.style.ts";
 export { KYOGIJO_CURLING_STYLE, KYOGIJO_HEAT_STYLE, KYOGIJO_NOTE_STYLE, KYOGIJO_STYLE, KYOGIJO_TEAM_STYLE, KYOGIJO_WALLS_STYLE } from "./style.ts";
@@ -37,7 +47,7 @@ export { KYOGIJO_LOOK_STYLE, LOOKS, LOOK_NAMES, LOOK_PAIRS, contrastOf, groupOf,
 export type { Group as LookGroup, Look, Palette as LookPalette, PaletteKey as LookPaletteKey } from "./look.ts";
 export { FEATURES, FEATURE_INFO, KYOGIJO_FEATURE_STYLE } from "./features.ts";
 export type { Feature } from "./features.ts";
-export type { DelaunayLayer, FlowLayer, Formation, FormationLayer, FormationPlayer, FormationPosition, FormationSport, HullLayer, MoveDatum, NetworkLayer, NetworkNode, PassDatum, PlayerDatum, SonarLayer, VoronoiLayer } from "./team.types.ts";
+export type { DelaunayLayer, FlowLayer, Formation, FormationLayer, FormationPlayer, FormationPosition, FormationSport, HullLayer, LineupLayer, LineupPlayer, MoveDatum, NetworkLayer, NetworkNode, PassDatum, PlayerDatum, SonarLayer, VoronoiLayer } from "./team.types.ts";
 export { COURT_THEMES } from "./themes.ts";
 export { abbreviate, capitals, fitLines, textWidth } from "./text.ts";
 export type { FittedLines } from "./text.ts";
@@ -47,6 +57,8 @@ export type { PlaceAlias, PlaceNameKind } from "./names.ts";
 export type { CoverQuirk, DugoutSide, HillQuirk, OverhangQuirk, Park, ParkData, ParkDugouts, ParkPeriod, ParkPeriodData, ParkQuirk, ParkSource, ParkWall, ParkWallData, PointQuirk, QuirkKind, WallPlace } from "./parks.ts";
 export { ERA_CURRENT, ERA_SOURCES, ERA_SPORTS, eraChanges, eraRange, eraStates, footballIn, rulesFor, seasonLabel } from "./eras.ts";
 export type { EraChange, EraRules, EraRulesOf, EraSource, EraSpan, EraSport, FootballRules, MlbRules, NbaRules, NhlRules } from "./eras.ts";
+export { ARENA_IDS, ARENAS, arenaById, arenaByName, arenaByWikidata, arenaCourtIn, arenaNameIn, arenaOfficialName, arenaRinkIn, arenaSourceUrl, arenasByName } from "./arenas.ts";
+export type { Arena, ArenaCapacity, ArenaData, ArenaName, ArenaSize, ArenaSource } from "./arenas.ts";
 export { GROUND_IDS, GROUNDS, groundById, groundByName, groundByWikidata, groundNameIn, groundOfficialName, groundSourceUrl, groundsByName, groundsHosting } from "./grounds.ts";
 export type { Ground, GroundCompetition, GroundData, GroundName, GroundSource, GroundTournament } from "./grounds.ts";
 export { AFL_GROUNDS, FAMILY_OF, LEAGUES, LEAGUE_SOURCES, VARIANTS, chooseLeague, hasHistory, leagueAt, leagueById, leagueChanges, leagueFigures, leagueIds, leagueSeason, leagueSize } from "./leagues.ts";
@@ -58,4 +70,4 @@ export type { SoccerPitchClass, SoccerPitchId, SoccerSize, SoccerSpec } from "./
 export { SOCCER_PROVIDER_IDS, SOCCER_PROVIDERS, frameMatrix, rescale, soccerFrame, soccerLandmarks } from "./surfaces/soccer-providers.ts";
 export type { Rescaler, SoccerFrame, SoccerProvider, SoccerProviderId } from "./surfaces/soccer-providers.ts";
 export { VERSION } from "./version.ts";
-export type { AxesOptions, Box, Colors, CourtStyle, CrowdOptions, CrowdShape, Detail, DirectionOptions, FieldSport, FieldStyle, Fence, GoalInfo, GoalStyle, HardwoodOptions, Language, NetStyle, LineDash, LineWidth, LookName, Orientation, PoolSport, PoolStyle, QuirkName, QuirkOptions, RangeBox, PageantOptions, PageantStyle, RangeName, RangeNamed, ScoreOptions, Side, Size, Sport, StatusWord, StripePattern, SurfaceOptions, Team, TeamMark, Theme, WallOptions, } from "./types.ts";
+export type { AxesOptions, Box, Colors, CourtStyle, CrowdOptions, CrowdShape, Detail, DirectionOptions, BudoSport, FieldSport, FieldStyle, Fence, GoalInfo, GoalStyle, HardwoodOptions, Language, NetStyle, LineDash, LineWidth, LookName, Orientation, PoolSport, PoolStyle, QuirkName, QuirkOptions, RangeBox, PageantOptions, PageantStyle, RangeName, RangeNamed, ScoreOptions, Side, Size, Sport, StatusWord, StripePattern, SurfaceOptions, Team, TeamMark, Theme, WallOptions, } from "./types.ts";

package/dist/index.js

@@ -1,7 +1,9 @@
 // Kyogijo Stadiums 競技場: sports surfaces as SVG, drawn to scale, with the teams and the score on them.
 export { COLOR_PROPERTIES, SPORTS, crowdStands, describe, drawBadge, drawKyogijo, drawScore, drawSurface, isPortrait, statusLabel, statusText, winnerOf } from "./draw.js";
 export { HOME_FIRST, HOME_FIRST_LEAGUES, homeSideFor } from "./homeside.js";
-export { inkOn, luminance, rgbOf, safeColour, safeLogo } from "./colour.js";
+export { inkOn, luminance, rgbOf, safeColour, safePicture } from "./colour.js";
+export { safeLogo } from "./logo.js";
+export { useEmblems } from "./emblems-source.js";
 export { OUTCOMES, drawLayers, layerTable } from "./layers.js";
 export { RANGES } from "./ranges.names.js";
 export { BACKGROUND_OPACITY, BACKGROUND_PATTERNS, KYOGIJO_BACKGROUND_STYLE } from "./background.js";
@@ -11,6 +13,8 @@ export { formatTime, parseTime } from "./pool.race.js";
 export { KYOGIJO_FIELDS_STYLE } from "./fields.style.js";
 export { KYOGIJO_ATHLETICS_STYLE, KYOGIJO_TRACK_STYLE } from "./athletics.style.js";
 export { KYOGIJO_SKATING_STYLE } from "./skating.style.js";
+export { KYOGIJO_BUDO_STYLE } from "./budo.style.js";
+export { dojo, drawDojo } from "./budo/dojo.api.js";
 export { rampColour } from "./layers.marks.js";
 export { HEAT_RAMPS, HEAT_RAMP_NAMES } from "./heat.colour.js";
 export { ZONE_SETS, ZONE_SET_IDS } from "./heat.zones.js";
@@ -20,6 +24,8 @@ export { HARDWOOD_SMALL, KYOGIJO_HARDWOOD_STYLE } from "./hardwood.js";
 export { KYOGIJO_CROWD_STYLE } from "./crowd.draw.js";
 export { GRIDIRON_GROUNDS, WALL_SEATS, outlinePath, outlinePoints } from "./crowd.js";
 export { KYOGIJO_MARK_STYLE } from "./mark.js";
+export { DRIVE_CODES, readSituation, situationText } from "./situation.js";
+export { KYOGIJO_SITUATION_STYLE } from "./situation.style.js";
 export { KYOGIJO_PAGEANT_MOTION, KYOGIJO_PAGEANT_STYLE } from "./pageant.style.js";
 export { KYOGIJO_POOL_STYLE } from "./pool.style.js";
 export { KYOGIJO_CURLING_STYLE, KYOGIJO_HEAT_STYLE, KYOGIJO_NOTE_STYLE, KYOGIJO_STYLE, KYOGIJO_TEAM_STYLE, KYOGIJO_WALLS_STYLE } from "./style.js";
@@ -30,6 +36,7 @@ export { abbreviate, capitals, fitLines, textWidth } from "./text.js";
 export { PARKS, PARK_IDS, fenceFor, parkById, parkByName, parkByWikidata, parkNameIn, parkOfficialName, parkPointsIn, parkQuirksIn, parkSourceUrl, parkUnit, parkWallsIn, parksByName } from "./parks.js";
 export { officialName, plainName } from "./names.js";
 export { ERA_CURRENT, ERA_SOURCES, ERA_SPORTS, eraChanges, eraRange, eraStates, footballIn, rulesFor, seasonLabel } from "./eras.js";
+export { ARENA_IDS, ARENAS, arenaById, arenaByName, arenaByWikidata, arenaCourtIn, arenaNameIn, arenaOfficialName, arenaRinkIn, arenaSourceUrl, arenasByName } from "./arenas.js";
 export { GROUND_IDS, GROUNDS, groundById, groundByName, groundByWikidata, groundNameIn, groundOfficialName, groundSourceUrl, groundsByName, groundsHosting } from "./grounds.js";
 export { AFL_GROUNDS, FAMILY_OF, LEAGUES, LEAGUE_SOURCES, VARIANTS, chooseLeague, hasHistory, leagueAt, leagueById, leagueChanges, leagueFigures, leagueIds, leagueSeason, leagueSize } from "./leagues.js";
 export { SURFACE_UNITS, UNITS, convertLength, isUnit } from "./units.js";

package/dist/layers-entry.d.ts

@@ -13,7 +13,8 @@ export { KYOGIJO_HEAT_STYLE } from "./style.ts";
 export type { ArrowsLayer, Comet, Layer, LayerBase, LayerKind, LayerTeam, LineDatum, LineStyle, LinesLayer, MarkDatum, MarkShape, OutcomeStyle, Paint, PointDatum, PointStyle, PointsLayer, Scale, TableOptions, TextDatum, TextLayer, TextStyle } from "./layers.types.ts";
 export { KYOGIJO_TEAM_STYLE } from "./style.ts";
 export { FORMATIONS, FORMATION_IDS, POSITION_NAMES, formationById, formationsOf, positionName } from "./formations.ts";
+export { LINEUP_CODES } from "./lineup.codes.ts";
 export type { Named } from "./formations.ts";
 export { clipNearer, convexHull, delaunay, neighbours, polygonArea, polygonCentroid, triangulationEdges, voronoiCells } from "./team.geometry.ts";
 export type { Pt, Triangulation } from "./team.geometry.ts";
-export type { DelaunayLayer, FlowLayer, Formation, FormationLayer, FormationPlayer, FormationPosition, FormationSport, HullLayer, MoveDatum, NetworkLayer, NetworkNode, PassDatum, PlayerDatum, SonarLayer, VoronoiLayer } from "./team.types.ts";
+export type { DelaunayLayer, FlowLayer, Formation, FormationLayer, FormationPlayer, FormationPosition, FormationSport, HullLayer, LineupLayer, LineupPlayer, MoveDatum, NetworkLayer, NetworkNode, PassDatum, PlayerDatum, SonarLayer, VoronoiLayer } from "./team.types.ts";

package/dist/layers-entry.js

@@ -8,4 +8,5 @@ export { ZONE_SETS, ZONE_SET_IDS, buildZoneSet } from "./heat.zones.js";
 export { KYOGIJO_HEAT_STYLE } from "./style.js";
 export { KYOGIJO_TEAM_STYLE } from "./style.js";
 export { FORMATIONS, FORMATION_IDS, POSITION_NAMES, formationById, formationsOf, positionName } from "./formations.js";
+export { LINEUP_CODES } from "./lineup.codes.js";
 export { clipNearer, convexHull, delaunay, neighbours, polygonArea, polygonCentroid, triangulationEdges, voronoiCells } from "./team.geometry.js";

package/dist/layers.d.ts

@@ -1,3 +1,4 @@
+import { type Env } from "./layers.env.ts";
 import type { Layer, OutcomeStyle, TableOptions } from "./layers.types.ts";
 import type { Box, ScoreOptions, SurfaceOptions } from "./types.ts";
 /**
@@ -11,7 +12,7 @@ export interface RenderedLayers {
     summaries: string[];
 }
 /** The layers of a drawing as markup, and a sentence for each. `turned` says whether the surface group is turned a quarter. */
-export declare function renderLayers(o: SurfaceOptions | ScoreOptions, layers: readonly Layer[] | undefined, turned?: boolean, range?: Box, upright?: number): RenderedLayers;
+export declare function renderLayers(o: SurfaceOptions | ScoreOptions, layers: readonly Layer[] | undefined, turned?: boolean, range?: Box, upright?: number, zone?: Env["zone"]): RenderedLayers;
 /**
  * The layers of a drawing as one SVG group, in the surface's own frame, for a caller who composes the drawing's parts. Put it inside the
  * surface's group (the one with the quarter turn, when the drawing is tall) and the marks lie on the surface, cut to its outline, with

package/dist/layers.env.d.ts

@@ -32,7 +32,16 @@ export interface Env {
         home?: string;
         away?: string;
     };
+    /** Whether the layer being drawn writes `data-mark-id`, `data-index` and `data-zone` on its marks: set for each layer by `renderLayers`. */
+    marks: boolean;
+    /** The finest zone of the surface a place (feet, the drawing's wide frame) lies in, by id: what a mark carries as `data-zone`. `undefined` where the sport has none there. */
+    zone: (x: number, y: number) => string | undefined;
 }
+/**
+ * The data attributes every mark carries, so that one listener on the drawing can link a mark to a table: `data-mark-id` (the id the caller gave the datum, else its index),
+ * `data-index` (its place in the layer's data) and `data-zone` (the zone it lies in, from `zoneAt`'s rules). The place is in feet in the drawing's wide frame.
+ */
+export declare function markAttrs(env: Env, id: unknown, index: number, at?: readonly [number, number], name?: string): string;
 /** What a layer made. */
 export interface Made {
     /** The elements of the layer, and its gradients as `defs`. */
@@ -71,4 +80,4 @@ export declare function place(layer: LayerBase, env: Env, points: readonly P[],
 /** The inverse of `place`: places on the surface, in feet, as the layer's own coordinates (its frame and unit). */
 export declare function placeBack(layer: LayerBase, env: Env, points: readonly P[], unit: Unit): P[];
 export declare function newMade(): Made;
-export declare function envFor(o: SurfaceOptions | ScoreOptions, turned: boolean | undefined, range?: Box, upright?: number): Env;
+export declare function envFor(o: SurfaceOptions | ScoreOptions, turned: boolean | undefined, range?: Box, upright?: number, zone?: Env["zone"]): Env;

package/dist/layers.env.js

@@ -1,8 +1,10 @@
 // What every kind of data layer is drawn against: the drawing's id, its unit and outline, the words, and what a layer made. Kept apart
 // from layers.ts so that the heat maps, which are written in files of their own, can use it without importing the file that imports them.
-import { safeLogo } from "./colour.js";
+import { safeLogo } from "./logo.js";
+import { esc } from "./format.js";
 import { drawingId, isPortrait, lengthUnit } from "./common.js";
 import { fromSurface, toSurface } from "./frames.js";
+import { zoneResolver } from "./rules.js";
 import "./frames.providers.js";
 import { chooseLeague } from "./leagues.js";
 import { frameSizeOf, outlineOf } from "./outline.js";
@@ -12,6 +14,32 @@ export const isNum = (value) => typeof value === "number" && Number.isFinite(val
 export const clamp01 = (value) => Math.max(0, Math.min(1, value));
 export const own = (table, key) => Object.prototype.hasOwnProperty.call(table, key);
 export const opacityOf = (value) => (isNum(value) ? clamp01(value) : undefined);
+/** The zone of a drawing's marks, made when the first mark asks: a surface the rules cannot be made for (a special game) has none. */
+function zonesOf(o) {
+    let resolver;
+    return (x, y) => {
+        if (resolver === undefined) {
+            try {
+                resolver = o.host !== undefined ? () => undefined : zoneResolver(o.sport, o);
+            }
+            catch {
+                resolver = () => undefined;
+            }
+        }
+        return resolver(x, y);
+    };
+}
+/**
+ * The data attributes every mark carries, so that one listener on the drawing can link a mark to a table: `data-mark-id` (the id the caller gave the datum, else its index),
+ * `data-index` (its place in the layer's data) and `data-zone` (the zone it lies in, from `zoneAt`'s rules). The place is in feet in the drawing's wide frame.
+ */
+export function markAttrs(env, id, index, at, name = "data-zone") {
+    if (!env.marks)
+        return "";
+    const given = typeof id === "string" && id !== "" ? id : typeof id === "number" && Number.isFinite(id) ? String(id) : String(index);
+    const zone = at === undefined ? undefined : env.zone(at[0], at[1]);
+    return ` data-mark-id="${esc(given)}" data-index="${index}"${zone === undefined ? "" : ` ${name}="${esc(zone)}"`}`;
+}
 export const toArray = (value, what) => {
     if (!Array.isArray(value))
         throw new TypeError(`${what} needs data: a list of marks`);
@@ -60,7 +88,7 @@ export function placeBack(layer, env, points, unit) {
 export function newMade() {
     return { marks: "", defs: "", style: "", attr: "", opacity: undefined, drawn: 0, skipped: 0, outcomes: new Map(), teams: new Map(), low: Infinity, high: -Infinity };
 }
-export function envFor(o, turned, range, upright) {
+export function envFor(o, turned, range, upright, zone) {
     const language = o.language === "ja" ? "ja" : "en";
     const outline = outlineOf(o);
     const teams = o;
@@ -76,6 +104,8 @@ export function envFor(o, turned, range, upright) {
         cropped: range !== undefined,
         base: Math.max((range ?? outline.box).w, (range ?? outline.box).h) * 0.013,
         words: KYOGIJO_STRINGS[language],
-        logos: { home: safeLogo(teams.home?.logo), away: safeLogo(teams.away?.logo) },
+        logos: { home: safeLogo(teams.home?.logo, { color: teams.home?.color, accent: teams.home?.textColor }), away: safeLogo(teams.away?.logo, { color: teams.away?.color, accent: teams.away?.textColor }) },
+        marks: o.marks === true || o.pointer === true,
+        zone: zone ?? zonesOf(o),
     };
 }

package/dist/layers.js

@@ -3,12 +3,14 @@
 // table that stands for the drawing. Every mark is a plain SVG element in the drawing's own frame, so the same options always give
 // the same string. Written for this package; mplsoccer and hockey_rink were read for the list of charts to match, and nothing of
 // either is used.
-import { safeColour, safeLogo } from "./colour.js";
+import { safeColour } from "./colour.js";
+import { withEmblems } from "./emblems-source.js";
+import { safeLogo } from "./logo.js";
 import { FRAMES } from "./frames.js";
 import { KYOGIJO_HEAT_STYLE, KYOGIJO_TEAM_STYLE } from "./style.js";
 import { drawTeam, isTeamLayer, teamTables } from "./team.layers.js";
 import { drawHeat, drawLegend, heatTable } from "./heat.js";
-import { clamp01, envFor, isNum, newMade, opacityOf, own, place, toArray, unitOfLayer } from "./layers.env.js";
+import { clamp01, envFor, isNum, markAttrs, newMade, opacityOf, own, place, toArray, unitOfLayer } from "./layers.env.js";
 import { safeClass } from "./common.js";
 import { esc, num } from "./format.js";
 import { curveBetween, curvePath, headPath, isPolygon, polylinePath, rampColour, shapePath, taperPath, wavePath, } from "./layers.marks.js";
@@ -136,7 +138,7 @@ function drawPoints(layer, env) {
         const w = (isNum(d.size) && d.size > 0 ? d.size * k : sizeFn === undefined ? fixed : Math.max(0.05, sizeFn(d.value) * k)) * (outcome.scale ?? 1);
         const { cls, css } = colourAttrs(colourFor(style.fill, d, NEUTRAL, domain), layerExpr, NEUTRAL);
         const classes = `${cls}${outcome.hollow === true ? `${cls === "" ? "" : " "}ky-hol` : ""}`;
-        const open = attrs(classes, css, opacityOf(d.opacity));
+        const open = attrs(classes, css, opacityOf(d.opacity)) + markAttrs(env, d.id, i, [x, y]);
         const role = d.team === "home" ? "home" : d.team === "away" ? "away" : undefined;
         const logo = shape === "logo" ? safeLogo(d.logo) ?? (role === undefined ? undefined : safeLogo(style.logos?.[role]) ?? env.logos[role]) : undefined;
         if (logo !== undefined) {
@@ -258,13 +260,15 @@ function drawLines(layer, env, index) {
         const headEl = head === "" ? "" : `<path class="${headKind === "open" ? "ky-ln" : "ky-ah"}" d="${head}"${headKind === "open" ? ` stroke-width="${num(w)}"` : ""}/>`;
         const title = typeof d.title === "string" && d.title !== "" ? `<title>${esc(d.title)}</title>` : "";
         const opacity = opacityOf(d.opacity);
+        // Where it starts is its zone; where it ends is `data-zone-end`.
+        const marks = env.marks ? markAttrs(env, d.id, i, first) + (env.zone(last[0], last[1]) === undefined ? "" : ` data-zone-end="${esc(env.zone(last[0], last[1]))}"`) : "";
         // A line with a head is a group (its colour and opacity on the group); a line alone carries them itself.
         const wrap = headEl !== "";
         const pathClass = [shaftClass, wrap ? "" : cls].filter((c) => c !== "").join(" ");
         const pathStyle = [wrap ? "" : css, gradient].filter((c) => c !== "").join(";");
-        const pathOpen = `${attrs(pathClass, pathStyle, wrap ? undefined : opacity)} d="${shaft}"${tapered === undefined ? strokeWidth + dashes : ""}`;
+        const pathOpen = `${attrs(pathClass, pathStyle, wrap ? undefined : opacity)}${wrap ? "" : marks} d="${shaft}"${tapered === undefined ? strokeWidth + dashes : ""}`;
         if (wrap)
-            out.push(`<g${attrs(cls, css, opacity)}>${title}<path${pathOpen}/>${headEl}</g>`);
+            out.push(`<g${attrs(cls, css, opacity)}${marks}>${title}<path${pathOpen}/>${headEl}</g>`);
         else
             out.push(title === "" ? `<path${pathOpen}/>` : `<path${pathOpen}>${title}</path>`);
     });
@@ -309,12 +313,17 @@ function drawText(layer, env) {
         // The letters are turned back by the quarter the surface was turned, so that they read upright, and by the caller's own turn on top.
         const angle = env.back + (isNum(d.rotate) ? d.rotate : 0);
         const classes = ["ky-lt", style.halo === false ? "ky-nh" : "", cls].filter((c) => c !== "").join(" ");
-        const open = `${attrs(classes, `${s === size ? "" : `font-size:${num(s)}px`}${s !== size && css !== "" ? ";" : ""}${css}`, opacityOf(d.opacity))}${anchor === base ? "" : ` text-anchor="${anchor}"`} x="${num(x)}" y="${num(y + s * 0.36)}"${angle === 0 ? "" : ` transform="rotate(${num(angle)} ${num(x)} ${num(y)})"`}`;
+        const open = `${attrs(classes, `${s === size ? "" : `font-size:${num(s)}px`}${s !== size && css !== "" ? ";" : ""}${css}`, opacityOf(d.opacity))}${markAttrs(env, d.id, i, [x, y])}${anchor === base ? "" : ` text-anchor="${anchor}"`} x="${num(x)}" y="${num(y + s * 0.36)}"${angle === 0 ? "" : ` transform="rotate(${num(angle)} ${num(x)} ${num(y)})"`}`;
         out.push(`<text${open}>${esc(String(d.text))}${typeof d.title === "string" && d.title !== "" ? `<title>${esc(d.title)}</title>` : ""}</text>`);
     });
     made.marks = out.join("");
     return made;
 }
+/**
+ * True when a datum of the layer has an `id`: the caller means to find its marks again. Not for the team layers, whose data have always had an `id` of their own (the player's, for a label and a table),
+ * so that a drawing made before the marks had ids is the same text now.
+ */
+const hasIds = (layer) => !isTeamLayer(layer) && Array.isArray(layer.data) && (layer.data).some((d) => typeof d === "object" && d !== null && d.id !== undefined);
 const plural = (words, kind, n) => words[`${kind === "lines" ? "line" : kind === "arrows" ? "arrow" : kind === "text" ? "text" : "point"}${n === 1 ? "One" : "Many"}`];
 const tidy = (text) => text.replace(/[.。]\s*$/, "");
 /** A list of counts, `goal 3, shot 21`, the most first. */
@@ -348,12 +357,16 @@ function summarise(layer, made, words, stop, gap) {
     return { title, description: parts.join(gap) };
 }
 /** The layers of a drawing as markup, and a sentence for each. `turned` says whether the surface group is turned a quarter. */
-export function renderLayers(o, layers, turned, range, upright) {
+export function renderLayers(o, layers, turned, range, upright, zone) {
+    return withEmblems(o.emblems, () => renderedLayers(o, layers, turned, range, upright, zone));
+}
+function renderedLayers(o, layers, turned, range, upright, zone) {
     if (layers === undefined || layers.length === 0)
         return { svg: "", summaries: [] };
     if (!Array.isArray(layers))
         throw new TypeError("layers is a list of layers");
-    const env = envFor(o, turned, range, upright);
+    const env = envFor(o, turned, range, upright, zone);
+    const markedBy = env.marks;
     const clipId = `${env.id}-lc`;
     const { stop, gap } = env.words.said;
     const said = [];
@@ -366,6 +379,8 @@ export function renderLayers(o, layers, turned, range, upright) {
     layers.forEach((layer, index) => {
         if (typeof layer !== "object" || layer === null)
             throw new TypeError(`layer ${index} is not a layer`);
+        // The marks are written with their ids, indexes and zones when the layer or the drawing asks, or when the caller gave a datum an id of its own.
+        env.marks = typeof layer.marks === "boolean" ? layer.marks : markedBy || hasIds(layer);
         const name = safeClass(layer.id).replace(/ /g, "-");
         const gid = name === "" ? `${env.id}-l${index}` : `${env.id}-${name}`;
         const finish = (made) => {
@@ -375,7 +390,8 @@ export function renderLayers(o, layers, turned, range, upright) {
                 return;
             const { title, description } = summarise(layer, made, env.words.layers, stop, gap);
             said[index] = description === "" ? `${tidy(title)}${stop}` : `${tidy(title)}${stop}${gap}${description}`;
-            const clip = layer.clip !== "none" && layer.kind !== "legend";
+            // A lineup is not cut to the outline unless it is asked to be: a fielder at the foul line or a catcher behind the plate would lose half a jersey.
+            const clip = layer.kind !== "legend" && (layer.clip === "surface" || (layer.clip !== "none" && layer.kind !== "lineup"));
             clipped = clipped || clip;
             const cls = made.cls ?? (layer.kind === "points" ? "ky-pts" : layer.kind === "text" ? "ky-txt" : "ky-lns");
             // Cropped to a range, a clipped layer is also cut to the range: its group is held by a group with the range's clip.
@@ -403,6 +419,7 @@ export function renderLayers(o, layers, turned, range, upright) {
                 return;
             case "network":
             case "formation":
+            case "lineup":
             case "voronoi":
             case "delaunay":
             case "hull":
@@ -415,7 +432,7 @@ export function renderLayers(o, layers, turned, range, upright) {
                 slots[index] = () => finish(drawLegend(layer, env, gid, known));
                 return;
             default:
-                throw new TypeError(`layer ${index} has the kind "${String(layer.kind)}": use points, lines, arrows, text, network, formation, voronoi, delaunay, hull, flow, sonar, heatmap, hexbin, zones, contour or legend`);
+                throw new TypeError(`layer ${index} has the kind "${String(layer.kind)}": use points, lines, arrows, text, network, formation, lineup, voronoi, delaunay, hull, flow, sonar, heatmap, hexbin, zones, contour or legend`);
         }
     });
     slots.forEach((later) => later?.());
@@ -491,7 +508,7 @@ export function layerTable(layers, options = {}) {
             return render(heatTable(layer, surfaceEnv), layer.kind);
         if (surfaceEnv !== undefined && isTeamLayer(layer))
             return teamTables(layer, surfaceEnv).map((t) => render(t, layer.kind)).join("");
-        const data = layer.kind === "formation" ? (layer.data ?? []) : toArray(layer.data, `layer ${index}`);
+        const data = layer.kind === "formation" ? (layer.data ?? []) : layer.kind === "lineup" ? (layer.players ?? []) : toArray(layer.data, `layer ${index}`);
         const columns = [];
         const has = (key) => data.some((d) => typeof d === "object" && d !== null && d[key] !== undefined && d[key] !== null);
         const t = words.team;
@@ -501,6 +518,8 @@ export function layerTable(layers, options = {}) {
             columns.push([t.tableFrom, "from", (d) => d.from], [t.tableTo, "to", (d) => d.to]);
         if (layer.kind === "formation")
             columns.push([t.tablePosition, "position", (d) => d.position], [t.tableNumber, "number", (d) => d.number], [t.tableName, "name", (d) => d.name]);
+        else if (layer.kind === "lineup")
+            columns.push([t.tablePosition, "pos", (d) => d.pos], [t.tableNumber, "number", (d) => d.number], [t.tableName, "name", (d) => d.name]);
         else {
             columns.push([w.tableX, "x", (d) => d.x]);
             columns.push([w.tableY, "y", (d) => d.y]);

package/dist/layers.types.d.ts

@@ -1,7 +1,7 @@
 import type { ScoreOptions, SurfaceOptions } from "./types.ts";
 import type { Frame, Attacking, Landmark, SurfaceSize } from "./frames.ts";
 import type { ContourLayer, HeatmapLayer, HexbinLayer, LegendLayer, ZonesLayer } from "./heat.types.ts";
-import type { DelaunayLayer, FlowLayer, FormationLayer, HullLayer, NetworkLayer, SonarLayer, VoronoiLayer } from "./team.types.ts";
+import type { DelaunayLayer, FlowLayer, FormationLayer, HullLayer, LineupLayer, NetworkLayer, SonarLayer, VoronoiLayer } from "./team.types.ts";
 import type { Unit } from "./units.ts";
 /** The shapes a point can be drawn as. A team's logo is `logo`. */
 export type MarkShape = "circle" | "square" | "triangle" | "diamond" | "cross" | "x" | "star";
@@ -45,6 +45,8 @@ export interface OutcomeStyle {
 }
 /** What every mark can carry. */
 export interface MarkDatum {
+    /** Your id for the mark: written on it as `data-mark-id`, so that a listener can link it to a row of your table. The mark's index is written when there is none. */
+    id?: string | number;
     /** The tooltip, and what a screen reader reads for the mark. */
     title?: string;
     /** `home`, `away` or another team. */
@@ -189,6 +191,11 @@ export interface LayerBase {
     clip?: "surface" | "none";
     /** Hide the layer. It is still in `layerTable`. */
     hidden?: boolean;
+    /**
+     * Write `data-mark-id`, `data-index` and `data-zone` on every mark of the layer (and draw each cell of a heat map or hexbin as a path of its own), so that one listener can link a mark to a table.
+     * Off by default, to keep a drawing compact; on by itself when a datum has an `id`, and when the drawing is made with `marks: true` or `pointer: true`. `false` turns it off for this layer.
+     */
+    marks?: boolean;
 }
 export interface PointsLayer extends LayerBase {
     kind: "points";
@@ -211,7 +218,7 @@ export interface TextLayer extends LayerBase {
     style?: TextStyle;
 }
 /** A layer of data on a surface. */
-export type Layer = PointsLayer | LinesLayer | ArrowsLayer | TextLayer | HeatmapLayer | HexbinLayer | ZonesLayer | ContourLayer | LegendLayer | NetworkLayer | FormationLayer | VoronoiLayer | DelaunayLayer | HullLayer | FlowLayer | SonarLayer;
+export type Layer = PointsLayer | LinesLayer | ArrowsLayer | TextLayer | HeatmapLayer | HexbinLayer | ZonesLayer | ContourLayer | LegendLayer | NetworkLayer | FormationLayer | LineupLayer | VoronoiLayer | DelaunayLayer | HullLayer | FlowLayer | SonarLayer;
 /** The kinds of layer. */
 export type LayerKind = Layer["kind"];
 /** What `layerTable` takes. */