ui/phase-16: cargo routes inspector + map pick foundation
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>
This commit is contained in:
@@ -48,6 +48,8 @@ function makeReport(planets: ReportPlanet[]): GameReport {
|
||||
planets,
|
||||
race: "",
|
||||
localShipClass: [],
|
||||
routes: [],
|
||||
localPlayerDrive: 0,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -249,6 +251,115 @@ describe("applyOrderOverlay", () => {
|
||||
const out = applyOrderOverlay(report, [cmd], { "cmd-1": "applied" });
|
||||
expect(out).toBe(report);
|
||||
});
|
||||
|
||||
test("setCargoRoute upserts a route entry when applied", () => {
|
||||
const report = makeReport([
|
||||
makePlanet({ number: 1, name: "Earth" }),
|
||||
makePlanet({ number: 2, name: "Mars" }),
|
||||
]);
|
||||
const cmd: OrderCommand = {
|
||||
kind: "setCargoRoute",
|
||||
id: "cargo-1",
|
||||
sourcePlanetNumber: 1,
|
||||
destinationPlanetNumber: 2,
|
||||
loadType: "COL",
|
||||
};
|
||||
const out = applyOrderOverlay(report, [cmd], { "cargo-1": "applied" });
|
||||
expect(out).not.toBe(report);
|
||||
expect(out.routes).toHaveLength(1);
|
||||
expect(out.routes[0]!.sourcePlanetNumber).toBe(1);
|
||||
expect(out.routes[0]!.entries).toEqual([
|
||||
{ loadType: "COL", destinationPlanetNumber: 2 },
|
||||
]);
|
||||
});
|
||||
|
||||
test("setCargoRoute on an existing slot replaces the destination", () => {
|
||||
const report: GameReport = {
|
||||
...makeReport([makePlanet({ number: 1, name: "Earth" })]),
|
||||
routes: [
|
||||
{
|
||||
sourcePlanetNumber: 1,
|
||||
entries: [{ loadType: "COL", destinationPlanetNumber: 2 }],
|
||||
},
|
||||
],
|
||||
};
|
||||
const cmd: OrderCommand = {
|
||||
kind: "setCargoRoute",
|
||||
id: "cargo-1",
|
||||
sourcePlanetNumber: 1,
|
||||
destinationPlanetNumber: 5,
|
||||
loadType: "COL",
|
||||
};
|
||||
const out = applyOrderOverlay(report, [cmd], { "cargo-1": "applied" });
|
||||
expect(out.routes[0]!.entries).toEqual([
|
||||
{ loadType: "COL", destinationPlanetNumber: 5 },
|
||||
]);
|
||||
});
|
||||
|
||||
test("removeCargoRoute drops the matching slot and preserves the others", () => {
|
||||
const report: GameReport = {
|
||||
...makeReport([makePlanet({ number: 1, name: "Earth" })]),
|
||||
routes: [
|
||||
{
|
||||
sourcePlanetNumber: 1,
|
||||
entries: [
|
||||
{ loadType: "COL", destinationPlanetNumber: 2 },
|
||||
{ loadType: "MAT", destinationPlanetNumber: 3 },
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
const cmd: OrderCommand = {
|
||||
kind: "removeCargoRoute",
|
||||
id: "rem-1",
|
||||
sourcePlanetNumber: 1,
|
||||
loadType: "COL",
|
||||
};
|
||||
const out = applyOrderOverlay(report, [cmd], { "rem-1": "applied" });
|
||||
expect(out.routes[0]!.entries).toEqual([
|
||||
{ loadType: "MAT", destinationPlanetNumber: 3 },
|
||||
]);
|
||||
});
|
||||
|
||||
test("removeCargoRoute clears the route entry entirely when last slot drops", () => {
|
||||
const report: GameReport = {
|
||||
...makeReport([makePlanet({ number: 1, name: "Earth" })]),
|
||||
routes: [
|
||||
{
|
||||
sourcePlanetNumber: 1,
|
||||
entries: [{ loadType: "COL", destinationPlanetNumber: 2 }],
|
||||
},
|
||||
],
|
||||
};
|
||||
const cmd: OrderCommand = {
|
||||
kind: "removeCargoRoute",
|
||||
id: "rem-1",
|
||||
sourcePlanetNumber: 1,
|
||||
loadType: "COL",
|
||||
};
|
||||
const out = applyOrderOverlay(report, [cmd], { "rem-1": "applied" });
|
||||
expect(out.routes).toEqual([]);
|
||||
});
|
||||
|
||||
test("cargo route overlays skip draft / invalid / rejected statuses", () => {
|
||||
const report = makeReport([makePlanet({ number: 1, name: "Earth" })]);
|
||||
const cmd: OrderCommand = {
|
||||
kind: "setCargoRoute",
|
||||
id: "cargo-1",
|
||||
sourcePlanetNumber: 1,
|
||||
destinationPlanetNumber: 2,
|
||||
loadType: "COL",
|
||||
};
|
||||
expect(applyOrderOverlay(report, [cmd], { "cargo-1": "draft" })).toBe(
|
||||
report,
|
||||
);
|
||||
expect(applyOrderOverlay(report, [cmd], { "cargo-1": "invalid" })).toBe(
|
||||
report,
|
||||
);
|
||||
expect(applyOrderOverlay(report, [cmd], { "cargo-1": "rejected" })).toBe(
|
||||
report,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("productionDisplayFromCommand", () => {
|
||||
|
||||
Reference in New Issue
Block a user