7c8b5aeb23
Add per-planet cargo routes (COL/CAP/MAT/EMP) to the inspector with a renderer-driven destination picker (faded out-of-reach planets, cursor-line anchor, hover-highlight) and per-route arrows on the map. The pick-mode primitives are exposed via `MapPickService` so ship-group dispatch in Phase 19/20 can reuse the same surface. Pass A — generic map foundation: - hit-test now sizes the click zone to `pointRadiusPx + slopPx` so the visible disc is always part of the target. - `RendererHandle` gains `onPointerMove`, `onHoverChange`, `setPickMode`, `getPickState`, `getPrimitiveAlpha`, `setExtraPrimitives`, `getPrimitives`. The click dispatcher is centralised: pick-mode swallows clicks atomically so the standard selection consumers do not race against teardown. - `MapPickService` (`lib/map-pick.svelte.ts`) wraps the renderer contract in a promise-shaped `pick(...)`. The in-game shell layout owns the service so sidebar and bottom-sheet inspectors see the same instance. - Debug-surface registry exposes `getMapPrimitives`, `getMapPickState`, `getMapCamera` to e2e specs without spawning a separate debug page after navigation. Pass B — cargo-route feature: - `CargoLoadType`, `setCargoRoute`, `removeCargoRoute` typed variants with `(source, loadType)` collapse rule on the order draft; round-trip through the FBS encoder/decoder. - `GameReport` decodes `routes` and the local player's drive tech for the inline reach formula (40 × drive). `applyOrderOverlay` upserts/drops route entries for valid/submitting/applied commands. - `lib/inspectors/planet/cargo-routes.svelte` renders the four-slot section. `Add` / `Edit` call `MapPickService.pick`, `Remove` emits `removeCargoRoute`. - `map/cargo-routes.ts` builds shaft + arrowhead primitives per cargo type; the map view pushes them through `setExtraPrimitives` so the renderer never re-inits Pixi on route mutations (Pixi 8 doesn't support that on a reused canvas). Docs: - `docs/cargo-routes-ux.md` covers engine semantics + UI map. - `docs/renderer.md` documents pick mode and the debug surface. - `docs/calc-bridge.md` records the Phase 16 reach waiver. - `PLAN.md` rewrites Phase 16 to reflect the foundation + feature split and the decisions baked in (map-driven picker, inline reach, optimistic overlay via `setExtraPrimitives`). Tests: - `tests/map-pick-mode.test.ts` — pure overlay-spec helper. - `tests/map-cargo-routes.test.ts` — `buildCargoRouteLines`. - `tests/inspector-planet-cargo-routes.test.ts` — slot rendering, picker invocation, collapse, cancel, remove. - Extensions to `order-draft`, `submit`, `order-load`, `order-overlay`, `state-binding`, `inspector-planet`, `inspector-overlay`, `game-shell-sidebar`, `game-shell-header`. - `tests/e2e/cargo-routes.spec.ts` — Playwright happy path: add COL, add CAP, remove COL, asserting both the inspector and the arrow count via `__galaxyDebug.getMapPrimitives()`. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
166 lines
5.4 KiB
TypeScript
166 lines
5.4 KiB
TypeScript
// Vitest unit coverage for `map/state-binding.ts`. The function
|
||
// translates a Phase 11 `GameReport` into a renderer-ready `World`
|
||
// containing one Point primitive per planet across all four kinds
|
||
// (local / other / uninhabited / unidentified). The tests assert
|
||
// the world dimensions match the report, the planet ids are the
|
||
// engine numbers, the kind-specific styles differ, and a zero-planet
|
||
// report still produces a well-formed empty World.
|
||
|
||
import "@testing-library/jest-dom/vitest";
|
||
import { describe, expect, test } from "vitest";
|
||
|
||
import type { GameReport, ReportPlanet } from "../src/api/game-state";
|
||
import { reportToWorld } from "../src/map/state-binding";
|
||
|
||
function makeReport(overrides: Partial<GameReport> = {}): GameReport {
|
||
return {
|
||
turn: 1,
|
||
mapWidth: 4000,
|
||
mapHeight: 4000,
|
||
planetCount: 0,
|
||
planets: [],
|
||
race: "",
|
||
localShipClass: [],
|
||
routes: [],
|
||
localPlayerDrive: 0,
|
||
...overrides,
|
||
};
|
||
}
|
||
|
||
// makePlanet fills the rich-projection fields the binding does not
|
||
// inspect with `null`s so the binding-focused tests stay readable.
|
||
function makePlanet(overrides: Partial<ReportPlanet>): ReportPlanet {
|
||
return {
|
||
number: 0,
|
||
name: "",
|
||
x: 0,
|
||
y: 0,
|
||
kind: "local",
|
||
owner: null,
|
||
size: null,
|
||
resources: null,
|
||
industryStockpile: null,
|
||
materialsStockpile: null,
|
||
industry: null,
|
||
population: null,
|
||
colonists: null,
|
||
production: null,
|
||
freeIndustry: null,
|
||
...overrides,
|
||
};
|
||
}
|
||
|
||
describe("reportToWorld", () => {
|
||
test("uses report dimensions for the World", () => {
|
||
const world = reportToWorld(makeReport({ mapWidth: 3200, mapHeight: 1600 }));
|
||
expect(world.width).toBe(3200);
|
||
expect(world.height).toBe(1600);
|
||
});
|
||
|
||
test("emits one Point primitive per planet across all four kinds", () => {
|
||
const world = reportToWorld(
|
||
makeReport({
|
||
planets: [
|
||
makePlanet({ number: 1, name: "Home", x: 100, y: 100, kind: "local", size: 12, resources: 0.5 }),
|
||
makePlanet({ number: 2, name: "Alpha", x: 200, y: 100, kind: "other", owner: "Federation", size: 8, resources: 0.3 }),
|
||
makePlanet({ number: 3, name: "Rock", x: 100, y: 200, kind: "uninhabited", size: 4, resources: 0.1 }),
|
||
makePlanet({ number: 4, name: "", x: 200, y: 200, kind: "unidentified" }),
|
||
],
|
||
}),
|
||
);
|
||
expect(world.primitives.length).toBe(4);
|
||
for (const p of world.primitives) {
|
||
expect(p.kind).toBe("point");
|
||
}
|
||
});
|
||
|
||
test("propagates planet number as primitive id and coordinates verbatim", () => {
|
||
const world = reportToWorld(
|
||
makeReport({
|
||
planets: [
|
||
makePlanet({ number: 42, name: "Home", x: 123.5, y: 456.25, kind: "local", size: 10, resources: 0.5 }),
|
||
],
|
||
}),
|
||
);
|
||
const [planet] = world.primitives;
|
||
expect(planet?.id).toBe(42);
|
||
expect(planet?.kind).toBe("point");
|
||
if (planet?.kind === "point") {
|
||
expect(planet.x).toBe(123.5);
|
||
expect(planet.y).toBe(456.25);
|
||
}
|
||
});
|
||
|
||
test("uses distinct styles for each planet kind", () => {
|
||
const world = reportToWorld(
|
||
makeReport({
|
||
planets: [
|
||
makePlanet({ number: 1, name: "L", kind: "local", size: 1, resources: 0 }),
|
||
makePlanet({ number: 2, name: "O", x: 1, kind: "other", owner: "Foe", size: 1, resources: 0 }),
|
||
makePlanet({ number: 3, name: "U", x: 2, kind: "uninhabited", size: 1, resources: 0 }),
|
||
makePlanet({ number: 4, name: "?", x: 3, kind: "unidentified" }),
|
||
],
|
||
}),
|
||
);
|
||
const fills = world.primitives.map((p) => p.style.fillColor);
|
||
const unique = new Set(fills);
|
||
expect(unique.size).toBe(fills.length);
|
||
});
|
||
|
||
test("zero-planet report yields an empty primitive list and well-formed World", () => {
|
||
const world = reportToWorld(makeReport({ planets: [] }));
|
||
expect(world.primitives.length).toBe(0);
|
||
expect(world.width).toBeGreaterThan(0);
|
||
expect(world.height).toBeGreaterThan(0);
|
||
});
|
||
|
||
test("guards against zero / negative dimensions in the report", () => {
|
||
const world = reportToWorld(
|
||
makeReport({ mapWidth: 0, mapHeight: -1, planets: [] }),
|
||
);
|
||
// World's constructor rejects non-positive dimensions; the
|
||
// binding falls back to 1×1 so a malformed report cannot crash
|
||
// the renderer.
|
||
expect(world.width).toBeGreaterThan(0);
|
||
expect(world.height).toBeGreaterThan(0);
|
||
});
|
||
|
||
test("local planets carry higher priority than unidentified", () => {
|
||
const world = reportToWorld(
|
||
makeReport({
|
||
planets: [
|
||
makePlanet({ number: 1, name: "Home", kind: "local", size: 1, resources: 0 }),
|
||
makePlanet({ number: 2, name: "?", kind: "unidentified" }),
|
||
],
|
||
}),
|
||
);
|
||
const local = world.primitives.find((p) => p.id === 1);
|
||
const unknown = world.primitives.find((p) => p.id === 2);
|
||
expect(local?.priority ?? 0).toBeGreaterThan(unknown?.priority ?? 0);
|
||
});
|
||
|
||
test("cargo routes are NOT inlined into the static world", () => {
|
||
// As of Phase 16 cargo-route arrows are pushed onto the live
|
||
// renderer via `setExtraPrimitives` instead of being baked
|
||
// into `reportToWorld`. The base world stays a clean
|
||
// representation of the report's planets so the renderer
|
||
// can rebuild the overlay without disposing Pixi.
|
||
const world = reportToWorld(
|
||
makeReport({
|
||
planets: [
|
||
makePlanet({ number: 1, name: "Earth", x: 100, y: 100, kind: "local", size: 5, resources: 1 }),
|
||
makePlanet({ number: 2, name: "Mars", x: 300, y: 100, kind: "local", size: 5, resources: 1 }),
|
||
],
|
||
routes: [
|
||
{
|
||
sourcePlanetNumber: 1,
|
||
entries: [{ loadType: "COL", destinationPlanetNumber: 2 }],
|
||
},
|
||
],
|
||
}),
|
||
);
|
||
const lines = world.primitives.filter((p) => p.kind === "line");
|
||
expect(lines.length).toBe(0);
|
||
});
|
||
});
|