Compare commits

..
Author SHA1 Message Date
kamilkrzywda fdf6eb236a feat: sub-region-level territory — ownership, LLM and map at region granularity (v0.19.0)
Move territory from whole-country (ISO_A3) to individual sub-region id
granularity (PR 3 of #16):

- new server/regions.ts (turf-free): loadRegions (boot), expandTerritory
  (game creation), migrateTerritoryToRegions (legacy games on db.load),
  regionNamesFor / regionLabel (LLM prompt), graceful ISO_A3 fallback
- game creation expands each preset nation's ISO_A3 list to its sub-region
  ids; pre-v0.19 saved games migrate transparently on read (idempotent)
- LLM contract: territoryChanges gain/lose sub-region ids (one region at a
  time; gain moves out of the prior owner; lost-without-gainer = unowned);
  user prompt carries a top-level regions reference table
  ({id: 'name (parent)'} over the state's territory ids)
- WorldMap: choropleth fill per sub-region (countries can split between
  nations), ownership via properties.regionId through the shared
  mapFeatureOwner, flash lights exactly the changed features
  (featuresByRegionIds)
- deterministic stub: one region-level move per non-empty round (player
  annexes the lexicographically-first region of the first other nation)
- tests: new server/regions.test.ts (real geo + fallback + seams);
  map/engine tests re-pinned to region ids; scripts/regions.test.ts stays green

Measured full wwii-1939 user prompt (411 regions): ~24.7k chars / ~6.2k
tokens — far under the 80k frontier limit, so the full regions table is
always sent (no frontier-limited mode needed).

Part of #16
2026-10-13 22:07:18 +00:00
kamilkrzywda 9c29779572 Merge pull request 'Region hover/selected shows current owner, not stale parent-country code (v0.18.0)' (#33) from fix/region-display-owner into master
CI / build + unit + e2e (push) Successful in 2m32s
2026-10-13 21:15:45 +02:00
kamilkrzywda 3cd8dcecfa Stop printing the static parent-country code in the region hover tooltip and dossier label (v0.18.0)
CI / build + unit + e2e (pull_request) Successful in 2m34s
2026-10-13 18:58:43 +00:00
kamilkrzywda acb4f0800f Merge pull request 'Fill no-one's-land gaps between merged sub-regions (v0.17.0)' (#32) from feat/fill-gaps into master
CI / build + unit + e2e (push) Successful in 1m39s
2026-10-13 17:48:17 +02:00
kamilkrzywda b1081eefde Fill no-one's-land gaps between merged sub-regions (v0.17.0)
CI / build + unit + e2e (pull_request) Successful in 2m19s
Part of #16
2026-10-13 15:18:31 +00:00
kamilkrzywda e92bf47d7d Merge pull request 'Smooth jagged sub-national region boundaries (v0.16.0)' (#30) from feat/smooth-regions into master
CI / build + unit + e2e (push) Successful in 2m21s
2026-10-13 11:53:58 +02:00
kamilkrzywda f1cc4fbc10 Smooth jagged sub-national region boundaries (v0.16.0)
CI / build + unit + e2e (pull_request) Successful in 2m18s
Part of #16
2026-10-13 09:42:44 +00:00
kamilkrzywda 97702940cd Merge pull request 'Clean up holes/gaps in sub-national regions (v0.15.0)' (#29) from feat/cleanup-regions into master
CI / build + unit + e2e (push) Successful in 2m21s
2026-10-12 16:00:44 +02:00
kamilkrzywda 8eedc37e05 Clean up holes/gaps in sub-national regions (v0.15.0)
CI / build + unit + e2e (pull_request) Successful in 2m15s
Part of #16
2026-10-12 13:51:47 +00:00
kamilkrzywda 69782aad69 Merge pull request 'Coarsen sub-national regions to a ~100km floor (v0.14.0)' (#28) from feat/coarsen-regions into master
CI / build + unit + e2e (push) Successful in 2m19s
2026-10-12 11:59:39 +02:00
kamilkrzywda 7bf11fa5b9 Coarsen sub-national regions to ~100km floor (v0.14.0)
CI / build + unit + e2e (pull_request) Successful in 1m47s
Part of #16
2026-10-12 09:52:52 +00:00
kamilkrzywda db46e1a5ec Merge pull request 'Use real historical sub-national regions instead of the geometric grid (v0.13.0)' (#27) from feat/historical-regions into master
CI / build + unit + e2e (push) Successful in 1m44s
2026-10-12 10:43:09 +02:00
kamilkrzywda 99188b5b15 Replace geometric sub-regions with real historical regions (v0.13.0)
CI / build + unit + e2e (pull_request) Successful in 2m34s
Part of #16
2026-10-12 08:33:07 +00:00
kamilkrzywda 0ebdb36daa Merge pull request 'Switch map to sub-national regions (v0.12.0)' (#26) from feat/sub-national-map into master
CI / build + unit + e2e (push) Successful in 1m20s
2026-10-12 03:13:22 +02:00
kamilkrzywda 06cdbf3d81 Switch map to sub-national regions (v0.12.0)
CI / build + unit + e2e (pull_request) Successful in 1m18s
Part of #16
2026-10-12 01:07:33 +00:00
kamilkrzywda 344b5b4a5e Merge pull request 'Add sub-national regional dataset + generator (v0.11.0)' (#25) from feat/sub-national-regions into master
CI / build + unit + e2e (push) Successful in 1m21s
2026-10-12 02:47:21 +02:00
kamilkrzywda d5285ce28d Add sub-national regional dataset + generator (v0.11.0)
CI / build + unit + e2e (pull_request) Successful in 1m21s
Fixes #16
2026-10-12 00:33:11 +00:00
kamilkrzywda 8252b665b5 Merge pull request 'Fix map coastal-water bleed-through and border lines (v0.10.0)' (#24) from feat/map-border-style into master
CI / build + unit + e2e (push) Successful in 1m15s
2026-10-11 23:32:46 +02:00
kamilkrzywda 7d50cba061 Fix map coastal-water bleed-through and border lines (v0.10.0)
CI / build + unit + e2e (pull_request) Successful in 2m13s
Fixes #2
2026-10-11 21:26:25 +00:00
kamilkrzywda e70f65f112 Merge pull request 'Reduce turn latency: cap recent events (10→5) + concise-reasoning constraint (v0.9.0)' (#23) from feat/turn-latency-hardening into master
CI / build + unit + e2e (push) Successful in 2m16s
2026-10-11 23:03:53 +02:00
kamilkrzywda e38cc5933f Reduce turn latency: cap recent events (10→5) + concise-reasoning constraint (v0.9.0)
CI / build + unit + e2e (pull_request) Successful in 2m9s
Fixes #22
2026-10-11 20:59:18 +00:00
kamilkrzywda 858b901b8d Merge pull request 'v0.8.0 — remove a saved game & redirect on missing/deleted game (#20)' (#21) from feat/delete-saved-games into master
CI / build + unit + e2e (push) Successful in 1m39s
2026-10-11 22:35:58 +02:00
kamilkrzywda 17d6cecab9 feat: remove a saved game & redirect on missing/deleted game (#20)
CI / build + unit + e2e (pull_request) Successful in 1m14s
- DELETE /api/games/:id route + Db.delete() (404 when absent)
- PresetPicker: per-saved-game trash button + confirm dialog (Cancel/Delete)
- App: runDeleteGame; useSse onError -> goHome on 'deleted'/'not found'
  (a deleted/missing game now returns the live tab and any deep link home)
- DeleteGameResponse in shared/protocol.ts; api.deleteGame()
- unit test (Db.delete) + 2 e2e tests (home-screen delete; in-flight delete
  returns the active tab home and a fresh deep link lands on home)
- version 0.7.0 -> 0.8.0 + changelog

Fixes #20
2026-10-11 20:32:55 +00:00
32 changed files with 5995 additions and 200 deletions
+25 -16
View File
@@ -27,8 +27,10 @@ renders territorial ownership; the whole thing persists to SQLite and streams ov
- Frontend: React 19 + Vite 6 + Tailwind CSS v4 (`@tailwindcss/vite`, no config file) + shadcn/ui
- Backend: Node 22 + Express — one process serving the built client, `/api` (REST), and `/sse`
- Persistence: `better-sqlite3` (one row per game, full `GameState` as JSON)
- Map: MapLibre GL (`maplibre-gl`) — remote OpenFreeMap `dark` basemap + a country choropleth
from `public/countries.geo.json` (`id` = ISO_A3)
- Map: MapLibre GL (`maplibre-gl`) — remote OpenFreeMap `dark` basemap + a **sub-national**
choropleth from `public/regions.geo.json` (2,597 sub-regions; feature `id` = `<ISO_A3>-<nn>`,
`properties.parent` = the country's ISO_A3). Ownership and the LLM stay at **country**
granularity, so a sub-region inherits its parent country's owner color (see #16).
- The LLM client is a thin OpenAI chat-completions wrapper over native `fetch` with an
**injectable transport** (mirrors `mesh-bot/src/llm`). A deterministic **stub** transport
(`LLM_STUB=1`) is used by all tests/e2e.
@@ -48,7 +50,8 @@ history/
├── index.html
├── presets/ # 5 scenario JSON files + index.json (manifest)
├── public/
│ └── countries.geo.json # 177 features, id=ISO_A3 (committed; Vite copies to dist/)
│ ├── countries.geo.json # 177 countries, id=ISO_A3 (input to the region generator)
│ └── regions.geo.json # 2,597 sub-regions, id=<ISO_A3>-<nn>, parent=ISO_A3 (the choropleth)
├── shared/ # NO runtime deps — the single source of truth
│ ├── types.ts # domain types (Nation, GameState, RoundItem, Preset, …)
│ └── protocol.ts # LLM TurnResult schema + AddAction/AddDiplomacy/RemoveQueueItem/Jump request types + pure helpers
@@ -140,17 +143,22 @@ history/
(model down) surfaces as an HTTP 502 to the client (shown as a toast).
- **Stable per-nation colors.** `shared.nationColor(id)` hashes a nation id → hue, shared by the
server's `RegionMap` and any client coloring so the choropleth always agrees.
- **Map click → dossier target (owner resolved from the RegionMap).** Clicking a map region does
NOT open a popup — it switches the dossier to that region's owning nation
(`setViewingId(ownerId)` in `GameScreen`); the manual "Inspect" selector and a map click both set
the same target and stay in sync. The owning nation is resolved from the authoritative `RegionMap`
by the feature's stable ISO_A3 code, which `applyRegions` stamps into `properties.regionId`
(properties survive into the rendered features) and the shared `regionOwner()` helper looks up.
It must **never** be read from the feature's top-level `id`: MapLibre repacks a GeoJSON source's
`id` into a numeric index when it stores the source, so at click/hover time `feature.id` is a
number, never the ISO_A3 (that repacking was the "no owner" bug, #6). Unowned regions (no
`RegionMap` entry) leave the current dossier target unchanged — never a broken dossier. The
hover path (a non-closeable tooltip with owner + key stats) uses the same resolution.
- **Map click → dossier target (owner resolved from the RegionMap, via the parent country).**
Clicking a sub-region does NOT open a popup — it switches the dossier to that sub-region's
**parent country's** owning nation (`focusNation(ownerId)` in `GameScreen`, which also records
which region was clicked for a small dossier label); the manual "Inspect" selector and a map click
both set the same target and stay in sync (a manual pick clears the label). Ownership is resolved
from the authoritative `RegionMap` (keyed by the **parent country's** ISO_A3) via the feature's
`properties.parent`, using the shared `mapFeatureOwner()` helper (`regionId` still holds the
sub-region's own id, e.g. `FRA-03`). It must **never** be resolved from the feature's top-level
`id` (MapLibre repacks it into a numeric index — the "no owner" bug, #6) nor from the sub-region
`id` (not a `RegionMap` key). Sub-regions of a country with no `RegionMap` entry (unowned) leave
the current dossier target unchanged — never a broken dossier. The hover path (a non-closeable
tooltip showing the sub-region name + parent country + owner + key stats) uses the same resolution.
**PR 2 of #16:** the map renders `regions.geo.json` (sub-national) but ownership/territory and the
LLM stay at country level — a nation owns whole countries, so all its sub-regions share the country's
color, and a whole-country transfer flips all its sub-regions at once (PR 3 will make sub-regions
individually ownable).
- **Deterministic stub.** `server/stub.ts` answers the model contract deterministically per
queued round item: each `action` item → one military/success event, each `diplomacy` item → one
diplomatic/partial event, an empty round → one political "The world moves on" event. The player
@@ -239,5 +247,6 @@ history/
caught.
- **`better-sqlite3`** is the only native module; the Docker build relies on its prebuilt binary
(works on `node:22-slim`/glibc). It's the sole `--external` in the tsup server bundle.
- The `dist/` client is committed to the build output only; `public/countries.geo.json` is copied
into `dist/` by Vite at build time, so the prod image serves it from `dist/` (no separate copy).
- The `dist/` client is committed to the build output only; the `public/` geo files
(`regions.geo.json` — the choropleth — and `countries.geo.json`) are copied into `dist/` by Vite
at build time, so the prod image serves them from `dist/` (no separate copy).
+82
View File
@@ -2,6 +2,88 @@
All notable changes to **History** are listed here, newest first.
## v0.19.0 — 2026-10-13 22:02
- **Sub-region-level territory (PR 3 of #16): ownership, the LLM, and the map all operate at individual sub-region granularity instead of whole-country.**
- `Nation.territory` is now a list of **sub-region ids** (`FR-57`, `DE-BB`, `US-AK`, … — the feature ids of `regions.geo.json`) rather than ISO_A3 country codes. At game creation (`POST /api/games`) each preset nation's ISO_A3 list is expanded to all its sub-region ids by the new `server/regions.ts` (a turf-free module that loads `public/`/`dist/regions.geo.json` once at boot into a region-id index + a country→regions map). Games saved before v0.19 are transparently migrated to region-level territory on read (`db.load` → `migrateTerritoryToRegions` — idempotent, and a no-op when the geo is not loaded).
- **The LLM contract follows the map:** a `TurnResult`'s `territoryChanges` now gain/lose sub-region ids, so a border can shift **one region at a time** — a gained region is moved out of whichever nation currently holds it, and a lost region with no matching gainer becomes unowned no-man's-land (the `applyTurnResult` splice logic was already format-agnostic and is unchanged). The user prompt carries a new top-level `regions` reference table — `{ id: "name (parent)" }` for every region id present in the world state — so the model can map an id it is considering to a real place; the system prompt's hard constraints now name sub-region ids (e.g. `FR-57`). **Prompt-size measurement (full `wwii-1939`: 7 nations, 411 regions): the complete user prompt is ≈ 24.7k chars / ≈ 6.2k tokens at start (≈ 26.4k / ≈ 6.6k with 8 recent events + a 2-item round) — far under the ~80k frontier limit, so the full `regions` table is always sent (no frontier-limited mode was needed).**
- **The choropleth is now truly per-region:** a nation's color fills exactly the sub-regions it owns, so a single country can be visibly split between nations, and unowned sub-regions render grey. Click/hover ownership resolves via the feature's `properties.regionId` (now the RegionMap key) through the shared `mapFeatureOwner` in `shared/protocol`, and the territory-change flash lights up exactly the regions whose owner changed (`featuresByRegionIds`, replacing the country-expanding `featuresByParents`).
- **Graceful degradation:** when the geo file is missing or unreadable the region maps stay empty and `hasRegionData()` is false, so expansion, migration, the prompt's `regions` table, and ownership resolution all fall back to the pre-v0.19 whole-country ISO_A3 behavior — the server still boots and the app still works (with a one-time console warning).
- **The deterministic stub stays deterministic** and now also makes exactly one region-level move per non-empty round: the player annexes the lexicographically-first sub-region of the first other nation (by key order) — empty rounds make no move — so unit tests and e2e assert the exact region that changes hands.
- **Tests:** new `server/regions.test.ts` (real-geo expansion/migration, the not-loaded fallback path, and the fixture seams); `server/map.test.ts` and `server/engine.test.ts` re-pinned to region-id fixtures, including the #6 regression guard (owner from `properties.regionId`, never the repacked numeric `feature.id`) and new `applyTurnResult` tests for prior-owner transfer, no-owner gain, and no-gainer lose.
- Part of #16
## v0.18.0 — 2026-10-13 18:54
- **Fixed a stale-owner display bug: the region hover tooltip and the dossier "Selected" label no longer print the static parent-country code (e.g. "FRA").** The GeoJSON `properties.parent` is a *static geographic-origin* field that never updates when a country is taken, yet it was rendered in the hover tooltip (as a sub-line and as a title fallback) and in the dossier's `Selected:` label (as a `(FRA)` suffix) — so a sub-region of a transferred country still displayed the old country's code next to the (correct) new owner. The tooltip now shows only the region name + the live owner chip (from the RegionMap) + key stats, and the dossier label shows only the region name. Ownership resolution still keys on `properties.parent` (unchanged) — only the display of it was removed.
## v0.17.0 — 2026-10-13 15:13
- **Filled the no-one's-land left between merged sub-regions (Part of #16).** The v0.14 coarsening's boolean dissolves left slivers of each country's landmass inside no region — measured at **≈ 3.90M km² globally** (the union of a country's regions covered only ~98% of its landmass). The new `scripts/fill-gaps.mjs` (`npm run fill:regions`) closes them: per country it computes the gap (`landmass − union(its regions)`, `@turf/difference`+`union`), drops slivers < **25 km²** (66,637 of them — sub-pixel on the map), and assigns each remaining piece to the **nearest region** (centroid distance) as an appended MultiPolygon part. **2,696,811 km²** of no-one's-land was filled into **1,575 regions** (+6,768 parts: 5,026 → 11,794), leaving **63,889 km²** residual (**98.4% reduction** — the rest is coastline digitization fuzz and 14 tiny border-band overlap artifacts, see below). The named "messy" regions absorb their surroundings: **SI-048 Kočevje (SVN) 16,692 → 19,816 km² (57 → 90 parts)**, **MK-36 Kavadarci (MKD) 21,297 → 25,190 km² (8 → 17)**, **AZ-AGC Ağcabədi (AZE) 18,657 → 32,065 km² (7 → 14)**; the biggest single fills are **AQ-X01~ (Antarctica) +195,351 km²**, **CA-NU (Nunavut) +143,447**, **AQ-X02~ +142,615**, **CL-MA (Magallanes) +81,806**, **US-AK (Alaska) +63,830**, **CA-NT (NWT) +46,333**, **GL-UO (Kommuneqarfiup) +41,971**, **RU-KAM (Kamchatka) +41,911**.
- **Correct, not just greedy: clipping, hole policy, dedup.** Each gap piece is clipped sequentially against (a) all *other countries'* regions, (b) its own country's existing regions, and (c) pieces already appended (bbox-touching) — so a piece straddling a border is split, and no piece can double-cover another region's area (**1,149,841 km² of foreign overhang removed** this way; 0 clip failures). **FR-57 Moselle (FRA) gains nothing on purpose**: its apparent gap was a cross-border phantom consumed by the neighbor clip — correct behavior. Holes follow a keep-or-drop policy: a gap hole whose centroid matches a **pre-existing hole** (within 10 km) or lies inside another country's landmass is kept, otherwise it's a phantom and dropped — so the **KZ-KZY Aral hole survives** (5,858 km² planar, the file's only hole; 5,875 km² of water kept open). A global dedup set guarantees each cleaned piece is appended at most once.
- **The dataset contract is untouched.** Still **1,796 regions** with identical `id` / `properties.name` / `properties.parent` and order — the fill only *appends* parts; all **177 countries** covered; the single KZ-KZY hole intact. **14 genuinely new overlap pairs** remain (13 same-country border bands + 1 cross CN-FJ×TW-KIN) — a known polychip artifact of filling right up to a shared boundary (the pre-fill file already carried 3,690 pre-existing pairs), and they are sub-pixel at map scale, so they're accepted. The file grows **2,289,528 → 3,399,806 bytes (2.29 → 3.40 MB)** — under the 5 MB guard, so no Douglas–Peucker pass is needed.
- **Deterministic + idempotent.** Fixed 25 km² threshold, deterministic ordering (centroid → area → id), 4-dp rounding (same convention as the other scripts). A fresh run on the pristine v0.16 file reproduces the shipped byte-for-byte (sha256 `87f44198…`), and re-running on the filled file is a no-op (byte-identical output).
- **Tests** — `scripts/regions.test.ts` (now 9 tests): the v0.16 fixed-point pin is updated to the v0.17 topology (1,796 regions, 11,794 parts, 11,795 rings, 164,801 vertices, 1 hole); a new test asserts the **only** hole in the file is KZ-KZY and sits in a realistic 5,000–7,000 km² band; a new **grid-sampled per-country coverage** test (25×25 grid per country, inline even-odd ray cast) asserts no significant no-one's-land remains — median 1.8% / p90 6.1% / max 26.4% (BRN, a coastline-denseness artifact, not a real gap), with thresholds at 5% / 15% / 40% and ≤3 countries above 20%. The planar sum band's upper bound widens 175% → **190%**: the fill only adds area *inside* each country, so it can't shrink the pre-existing admin-1 over-extension tail (Vanuatu 178.9%, Solomon Is. 133% — tiny island nations whose admin-1 polygons extend beyond their own country polygon), while the old under-fill tail is gone (minimum is now Brunei at 78.8%, was ~52%).
- **Type-check gotcha (why the test stays turf-free):** the project keeps `@types/geojson` **out of the tsc program** (tsconfig `types: ["vite/client", "node"]`). maplibre-gl's d.ts references the `GeoJSON` UMD global *without importing it*, so under `skipLibCheck` the reference degrades to `any` and `WorldMap.tsx`'s deliberately-minimal `GeoFeature` (with `geometry: unknown`) passes. The moment anything (e.g. a test importing `@turf/turf`) pulls `@types/geojson` into the program, those references typecheck for real and `WorldMap.tsx` fails with 7 errors. The v0.14–0.16 scripts are `.mjs` (never typechecked) for exactly this reason; the new test uses an inline ray cast instead of a geometry library, and `@turf/*` (a new devDependency, 137 packages including the meta `@turf/turf`) is only ever *run* by the `.mjs` scripts.
- Part of #16
## v0.16.0 — 2026-10-13 09:37
- **Smoothed the jagged sub-national region boundaries with Douglas–Peucker vertex-thinning (Part of #16).** The v0.14 coarsening (boolean dissolve) and Natural Earth's 1:10m digitization left some boundaries overly jagged — the worst being regions the dissolve split into many small zig-zag fragments, e.g. **SI-048 Kocevje (Slovenia, 57 parts)** and **MK-36 Kavadartsi (N. Macedonia, 8 parts)**. The new `scripts/smooth-regions.mjs` (`npm run smooth:regions`) runs `@turf/simplify` (Ramer–Douglas–Peucker, tolerance ~**50 m**) over **every ring of every polygon**, dropping the redundant "in-between" vertices of a shallow zig-zag while keeping the overall shape.
- **Vertex-thinning only — no topology change.** DP only removes points: it never moves a border, never merges/dissolves a part, and never creates or removes a ring. So the dataset contract is fully preserved — still **1,796 regions** with identical `id` / `properties.name` / `properties.parent`, all **177 countries** covered, the same **5,026 parts / 5,027 rings**, the single **KZ-KZY** hole, and all **83 islands**. The 18 degenerate 3-point "micro-dot" rings (Ragged Island, the Paracels, …) are kept verbatim (`@turf/simplify` requires ≥4 pts and would otherwise throw).
- **A gentle pass, reported honestly.** At 50 m the dataset is already fairly smooth (the v0.14 dissolve produced low-vertex, widely-spaced boundaries — median consecutive-vertex spacing ~18 km), so this is a light cleanup: **111,891 → 111,175 vertices (716 removed, 0.64%)** across **542 of 1,796** regions. **Kocelje 612 → 599** and **Kavadartsi 169 → 163** verts; both keep their exact part count (the "mess" there is fragmentation, which thinning — under the no-topology-change constraint — does not fix). The file shrinks **2,302,473 → 2,289,528 bytes (2.29 MB)**. Bump `TOLERANCE_M` to 100 / 200 m and re-run for a stronger pass (100 m → 974 removed; 200 m → 1,312 removed) — the pass stays idempotent either way.
- **The "messy" regions are really fragmentation artifacts, not fine jaggedness.** Ranking by **part density** (parts packed per unit area) rather than raw part count — which is dominated by legitimate *dispersed* archipelagos (Nunavut 213, Alaska 159, Antarctica 135, British Columbia 84) — surfaces the genuinely messy **coherent regions the dissolve left fragmented**: **SI-048 Kocevje (SVN, 57 parts in ~16,600 km²)**, **GR-H Stereá Elláda / Central Greece (GRC, 53 parts)**, **KR-46 South Jeolla (KOR, 28 parts)**, **SE-C Uppsala (SWE, 19 parts)**, **HR-13 Zadarska (HRV, 17 parts)**, plus the milder Balkan **MK-36 Kavadartsi (MKD, 8 parts)**. These real land regions (the Balkan ones in particular) ended up as many scattered fragments — the "similar shape problems".
- **Deterministic + idempotent.** One `@turf/simplify` pass at a fixed tolerance, then 4-dp rounding (the same convention as the other scripts). The output already sits at the pass's fixed point, so re-running on the smoothed file is byte-identical (sha256 `70a43541…`, verified across repeated runs); `public/regions.geo.json` and the built `dist/regions.geo.json` are sha256-identical.
- **Tests.** `scripts/regions.test.ts` gains an eighth test pinning the v0.16 fixed point: 1,796 regions, 5,026 parts, 5,027 rings, the single KZ-KZY hole, and exactly **111,175** vertices (8 tests total). All prior assertions (well-formed, unique ids, 177-country coverage, area floor, holes, coverage band) pass unchanged on the smoothed dataset.
- Part of #16
## v0.15.0 — 2026-10-12 13:49
- **Filled the small holes left by the v0.14 coarsening (Part of #16).** The coarsened `public/regions.geo.json` still carried **2,245 tiny enclosed holes** (all < 500 km² in practice) — unfilled patches left by the boolean dissolves and Natural Earth's own digitization, which showed up as "holes in regions". The new `scripts/cleanup-regions.mjs` (`npm run cleanup:regions`) drops every inner ring smaller than the 1,000 km² threshold so each region becomes solid: across **498 features, 56,484 km²** of artifact area was filled, removing the visible unfilled dots.
- **Real water is kept, not erased.** Any enclosed hole ≥ 1,000 km² survives as a hole. In this dataset the genuinely large lakes (the Great Lakes, the Caspian, the Aral, Lake Superior) had already been dissolved by the v0.14 coarsening, so none remain to preserve; the only surviving hole is a single medium one — **KZ-KZY (Kyzylorda, Kazakhstan) at 5,858 km²**, a real water body in the Aral basin — which is kept. The 1,000 km² threshold sits comfortably between the tiny artifacts (all < 500) and any genuine lake, so it fills exactly the artifacts and nothing else.
- **The dataset contract is untouched.** Still **1,796 regions** with identical `id`s / `properties.name` / `properties.parent` (0 mismatches), all **177 countries** still covered, the ~100 km floor and the island exemption intact — only inner rings were dropped, never a feature or its identity. The file shrinks 2,431 → **2,249 KB (2.20 MB)** (fewer inner rings).
- **Deterministic + idempotent.** Fixed threshold, deterministic planar geometry, 4-dp rounding; re-running on the cleaned file rewrites a byte-identical file (sha256-verified). Bridging very-close MultiPolygon parts is available behind an opt-in `--bridge` flag but is **off by default**, because the union it performs can itself mint new medium-sized holes — counter to the fill-holes goal — so the shipped run is the clean hole-fill only.
- **Tests.** `scripts/regions.test.ts` gains a seventh test asserting that no enclosed hole below the cleanup threshold remains and that only a handful of real water bodies survive (57 tests total). `public/regions.geo.json` and the built `dist/regions.geo.json` are sha256-identical.
- Part of #16.
## v0.14.0 — 2026-10-12 09:51
- **Coarsened the sub-national choropleth dataset to a ~100 km floor (Part of #16).** `public/regions.geo.json` shrinks from 4,138 real administrative regions to **1,796** (2,342 merges): every region smaller than ~100×100 km (10,000 km²) that has a same-country neighbor within 0.2° (≈22 km) of its bounding box is **dissolved into its nearest such neighbor** (nearest by centroid distance; ties → larger area, then id). Standalone cities and micro-districts collapse into the region around them: `US-DC` (191 km²) into Maryland, `FR-75` Paris (59 km²) into Hauts-de-Seine, the UK's 232 admin-1 districts down to **16** regions, and all of North Macedonia's 85 municipalities into one whole-country region.
- **Islands are exempt.** A region with no same-country neighbor within 0.2° keeps its shape whatever its size — **83** such small islands survive in the final set (Corsica, the Kerguelen/Crozet archipelagos, the Bahamas districts, Lord Howe, …) and the coarsening's fixed point leaves **0** non-island regions below the floor.
- **Real dissolve, not overlap.** Each merge is a real boolean union (`@turf/union`, polygon clipping) that removes the shared boundary between the merged region and its host, yielding one clean polygon — the final dataset has **0** fallback (non-dissolved) unions. Passes iterate smallest-area-first to a fixed point (2 passes on the v0.13 data, ~7 s); the output is sorted by (parent, id) at 4-dp precision and is byte-reproducible: re-running on the coarsened file reaches the fixed point immediately and rewrites an identical file (sha256-verified).
- **Numbers.** Per-country region count: min 1 / median 7 / max 80 (Russia; was 1 / 15 / 232 — the UK). Region areas: median 23,933 km²; smallest ≈0 (degenerate micro-dots like Ragged Island and the Paracel Islands, kept as islands); largest is Antarctica itself (≈21.8M km² in the planar model, exempt — it wraps a full 360°). 158 of the 177 countries had at least one merge. The file is 2,431 KB (2.37 MB) — under the 5 MB guard, so no Douglas–Peucker pass was needed.
- **Tooling + tests.** New `scripts/coarsen-regions.mjs` (`npm run coarsen:regions`) performs the merge in place; `scripts/regions.test.ts` gains a sixth test asserting that below-floor non-island regions stay under 1% of the dataset (currently 0) alongside the existing well-formed / unique-id / 177-country coverage / area / coverage-band checks (56 tests total). The map's data contract is unchanged (`properties.parent` → RegionMap), so `WorldMap.tsx`, `App.tsx`, `shared/protocol.ts`, and `server/map.ts` all keep working as-is.
- Part of #16.
## v0.13.0 — 2026-10-12 08:30
- **Replaced the geometric sub-region grid with real named sub-national administrative regions (#16, PR 2).** The choropleth source `public/regions.geo.json` now contains real named administrative regions — states, provinces, governorates, oblasts, … (Natural Earth admin-1, 1:10m) — instead of the abstract ~100–200 km geometric grid. Each region keeps a stable `id` and a `name`. The map's data contract is **unchanged** (`properties.parent` → the parent country's ISO_A3, `properties.name` → the region name), so no change to the map code or the LLM contract: `WorldMap.tsx`, `App.tsx`, `shared/protocol.ts`, and `server/map.ts` all keep working as-is.
- **Generator rewritten** — `scripts/generate-regions.mjs` (same path, dependency-free, `npm run generate:regions`) now groups the admin-1 features by their `adm0_a3` (the parent's ISO_A3), keeps only parents in the 177-country set, and id's each region with its ISO 3166-2 code when present (e.g. `US-CA`, `FR-75`, `RU-MOW`) else `<ISO_A3>-<nn>`; within a country, ids are disambiguated with a `-2/-3/…` suffix on collision (ISO 3166-2 codes are not always unique within a country — e.g. all nine of Bosnia's entities report `BA-BIH`). A country with no admin-1 data would collapse to one whole-country region `<ISO_A3>-01` (0 are needed at 1:10m, which covers all 177). Coordinates are rounded to 4 decimal places, and the file is Douglas–Peucker-simplified only if it exceeds the ~8 MB guard. Output is sorted by (parent, id) and fully deterministic.
- **The dataset is 4,138 regions covering all 177 countries**, 2,831 KB (2.76 MB) after Douglas–Peucker (the 4-dp base is ~23 MB). Per-country region count: min 1 / median 15 / max 232 (United Kingdom). There are **0 whole-country fallbacks** — 1:10m admin-1 covers every one of the 177 (the five single-region countries are SOL, SAH, CYN, PRI, FLK). Samples: `US-CA` California and `US-NY` New York (US); `FR-75` Paris and `FR-13` Bouches-du-Rhône (France); `RU-MOW` Moskovskaya (Russia).
- **Validation test updated** — `scripts/regions.test.ts` was rewritten for the new dataset: well-formed features, globally unique ids, all 177 countries covered (≥1 region each), sane region areas (median ≥ 100 km², no non-Antarctica region ≥ 5,000,000 km² — Antarctica is exempt because its full-360° wrap ring breaks the planar area model), and each country's region area summing to within [40%, 175%] of its own area (median within [70%, 130%] — the band is wider than a naive [40%, 110%] because Natural Earth's admin-1 polygons are digitized independently of the admin-0 country polygons and are not clipped to them). Runs in O(total vertices).
- Part of #16.
## v0.12.0 — 2026-10-12 01:03
- **Map now renders the sub-national regional dataset (#16, PR 2).** The choropleth source switches from `public/countries.geo.json` (177 countries) to `public/regions.geo.json` (**2,597 sub-regions**): each country is subdivided into ~100–200 km regions, shown as a finer choropleth with thin internal border lines. The MapLibre source/layer ids are renamed `countries`/`countries-fill`/`countries-line` → `regions`/`regions-fill`/`regions-line`, and the border line is thinned to `0.75` (from `1.25`) so the subdivision reads within each country.
- **Ownership stays at country granularity.** A nation still owns whole countries, so every sub-region of a country shares that country's owning-nation color (the fill is "same colors as the country map, but subdivided"). The owner of a sub-region is resolved from the RegionMap via the feature's `properties.parent` (the parent country's ISO_A3) — never the sub-region id (`FRA-03`) nor the repacked top-level `feature.id`. Clicking a sub-region switches the dossier to its parent country's owning nation (unchanged behavior); the hover tooltip now also shows the sub-region name + its parent country; a small "Selected …" label appears in the dossier after a map click.
- **New shared helper `mapFeatureOwner(regions, feature)`** in `@shared/protocol` — the single source of truth for resolving a rendered map feature's owner via `properties.parent` → `RegionMap[parent]` (built on the existing `regionOwner` key lookup). The territory-change **flash** now expands a changed country to **all** of its sub-regions (via the new `featuresByParents`), so a whole-country transfer still pulses correctly at the finer resolution.
- **No ownership-model or LLM change** — `buildRegionMap`/`RegionMap` remain ISO_A3-keyed and the engine still references whole countries; this PR only changes what the map draws. Sub-region-level ownership (individual regions changing hands) is PR 3.
- **Tests** — new `mapFeatureOwner` unit tests and an updated #6 regression guard pinning the sub-region feature shape (numeric `id`, `regionId` = sub-region code, `parent` = ISO_A3) and proving resolution via `parent` while the sub-region id and repacked id do not resolve (55 unit tests). The e2e suite needed no changes: it asserts on the legend (derived from the ISO_A3 RegionMap) and screen structure, not on map geometry.
- Part of #16.
## v0.11.0 — 2026-10-12 00:31
- **Sub-national region dataset + generator (#16, foundation only — no app behavior change).** A new dependency-free `scripts/generate-regions.mjs` (run via `npm run generate:regions`) splits each of the 177 countries in `public/countries.geo.json` into adaptive ~100–200 km sub-national regions on a regular lat/lon grid clipped to the country (Sutherland–Hodgman), and writes the committed `public/regions.geo.json` (**2,597 regions**, ~755 KB). Each region is id'd `<ISO_A3>-<nn>` (nn = 1..k in row-major order, capped at 36 per country) with `properties = { name, parent }`, so downstream work can map any region back to its parent nation. Antimeridian countries are handled three ways: small island groups (Fiji) stay a single whole-country region; large ones (Russia) are tiled in shifted [0,360) longitude space with output rings split at ±180°; and the full-360° Antarctic wrap ring becomes two hemispheric wedges. The output is fully deterministic — the same input yields a byte-identical file (verified by sha256).
- **Validation test** — new self-contained `scripts/regions.test.ts` (picked up by `npm test`) reads the two GeoJSON files once each and asserts: the file is a well-formed FeatureCollection; every region is a valid feature whose id matches `^[A-Z]{3}-\d+$` and whose `parent` is a real country id; every country has 1–36 regions (≥2 for any country larger than 50,000 km²); every region has a sane area (≥ 200 km², with a microstate exemption, and < 5,000,000 km²); and each country's regions sum to 45–108% of its own area (the measured range is ~[64%, 105%] — Antarctica's wedges under-fill, Norway's high-latitude fjord coast over-fills by 0.1%). No change to the running app, the LLM contract, or the map — this is purely the dataset + tooling that later PRs for #16 build on.
- Fixes #16.
## v0.10.0 — 2026-10-11 21:25
- **Fix world map style (#2)** — made the choropleth fill fully opaque (`fill-opacity` 0.85 → 1.0) and darkened the Natural Earth terrain raster (`raster-opacity` 0.5 → 0.15), so the raster's flat water tint and fine 1:10m coastline no longer bleed through countries and compete with the borders.
- **Strengthened country border lines** — border width 0.7 → 1.25, and the per-region stroke alphas raised (owned 0.10 → 0.30, unowned 0.06 → 0.14) so the vector borders read clearly as the dominant edge, with owned regions still more prominent than unowned ones.
- Fixes #2.
## v0.9.0 — 2026-10-11 20:57
- **Reduced turn latency (prompt-level):** capped `recentEvents` in the turn prompt from the last 10 to the last 5 events, and added a HARD CONSTRAINT asking the reasoning model to keep its internal analysis brief before emitting the JSON. This shortens the chain-of-thought (the 170–223s turn driver) and lowers the risk of exhausting the 4000-token output budget before the answer (the original 502 failure mode). Reasoning stays enabled (`reasoning_effort: low`); the deterministic stub, the `TurnResult` contract, `max_tokens`, and `reasoning_effort` are all unchanged.
## v0.8.0 — 2026-10-11 20:29
- **Remove a saved game (#20)** — every saved game now has a delete control: a trash button on its card in the home screen's "Saved games" section opens a confirmation dialog ("Delete this game?" showing the scenario/turn/date) with Cancel and a destructive Delete. The new `DELETE /api/games/:id` route removes the game's row from SQLite and returns `{ deleted: true }` (404 if the id is unknown).
- **Redirect on a missing/deleted game (#20)** — loading a non-existent game id no longer leaves you stranded. A deep link to a missing game already fell back to home, and now a game that disappears *while its tab is open* (deleted from another tab or the same session) is pushed home too: the server broadcasts an SSE `error` event on delete, and the client's `useSse` gains an `onError` handler that returns the tab to the home screen (matching the existing "game not found" connect behavior).
- `PresetPicker` gained an `onDelete` prop, a per-card `data-game-id` attribute, the delete button, and the confirm dialog; `api.deleteGame(id)`, `Db.delete(id)`, and the shared `DeleteGameResponse` type were added to support it.
- **Unit + e2e tests** — new `Db.delete` test (removes by id; reports absence for unknown / already-gone ids) and two e2e specs: (a) deleting a saved game from the home screen (open → cancel leaves it; confirm removes the card, the response is `{deleted:true}`, and a follow-up `GET` is 404), and (b) deleting an open game (the live tab is pushed home via the SSE error, and a fresh deep-link to the deleted id lands on home).
## v0.7.0 — 2026-10-11 19:17
- Clicking a map region now switches the selected dossier to that region's owning nation instead of opening a popup (#7). The closeable click popup is gone; a hover tooltip (owner + key stats) is kept. The manual "Inspect" selector still works and stays in sync — both it and a map click drive the same dossier target.
+83
View File
@@ -560,3 +560,86 @@ test.describe('History — Advisor thinking indicator (#15)', () => {
await expect(page.getByTestId('status-indicator')).toHaveText(/Idle/);
});
});
/**
* Remove a saved game (#20): a saved game can be deleted from the home screen
* (with a confirmation dialog), and loading a non-existent / deleted game id
* (directly or via a stale open tab) returns the user to the home screen.
*/
test.describe('History — remove a saved game & redirect (#20)', () => {
test('deleting a saved game from the home screen removes it (with confirmation)', async ({
page,
}) => {
test.setTimeout(90000);
const id = await createUkGame(page);
await expect(page.getByTestId('world-map')).toBeVisible();
// Back to the home screen, where the just-created game appears in "Saved games".
await page.getByTestId('back-to-scenarios').click();
await expect(page.getByTestId('saved-games')).toBeVisible({ timeout: 15000 });
const card = page.locator(`[data-game-id="${id}"]`);
await expect(card).toBeVisible();
// Opening the confirm dialog…
await card.getByTestId('delete-game').click();
const dialog = page.getByTestId('delete-game-confirm-dialog');
await expect(dialog).toBeVisible();
// …and cancelling leaves the game in place.
await page.getByTestId('delete-game-cancel').click();
await expect(dialog).toHaveCount(0);
await expect(card).toBeVisible();
// Confirming the delete removes it: the DELETE succeeds, the card disappears,
// and a subsequent fetch reports the game gone.
await card.getByTestId('delete-game').click();
await expect(page.getByTestId('delete-game-confirm-dialog')).toBeVisible();
const [resp] = await Promise.all([
page.waitForResponse(
(r) =>
r.request().method() === 'DELETE' &&
new URL(r.url()).pathname === `/api/games/${id}`,
),
page.getByTestId('delete-game-confirm').click(),
]);
expect((await resp.json()) as { deleted: boolean }).toEqual({ deleted: true });
await expect(page.getByTestId('delete-game-confirm-dialog')).toHaveCount(0);
await expect(card).toHaveCount(0);
// The game is gone from the server too.
const status = await page.evaluate(async (gid) => {
const r = await fetch(`/api/games/${gid}`);
return r.status;
}, id);
expect(status).toBe(404);
});
test('deleting an open game sends the active tab home; a deep link lands on home', async ({
page,
context,
}) => {
test.setTimeout(90000);
const id = await createUkGame(page);
await expect(page.getByTestId('world-map')).toBeVisible();
await expect(page.getByTestId('turn-count')).toHaveText('1');
const origin = await page.evaluate(() => location.origin);
// Delete the game straight through the API while its tab is open. The server
// broadcasts an SSE `error` and the client's useSse onError handler returns
// this live tab to the home screen.
const delStatus = await page.evaluate(
async (gid) => (await fetch(`/api/games/${gid}`, { method: 'DELETE' })).status,
id,
);
expect(delStatus).toBe(200);
await expect(page.getByTestId('preset-card').first()).toBeVisible({ timeout: 20000 });
await waitHash(page, '#/');
// A brand-new page deep-linking to the now-deleted id also lands on home.
const page2 = await context.newPage();
await page2.goto(`${origin}/#/game/${id}`);
await expect(page2.getByTestId('preset-card').first()).toBeVisible({ timeout: 20000 });
await waitHash(page2, '#/');
await page2.close();
});
});
+1
View File
@@ -30,6 +30,7 @@ export default tseslint.config(
'vitest.config.ts',
'playwright.config.ts',
'scripts/**/*.mjs',
'scripts/**/*.ts',
],
languageOptions: { globals: { ...globals.node, ...globals.es2022 } },
rules: {
+2462 -2
View File
File diff suppressed because it is too large Load Diff
+15 -1
View File
@@ -1,6 +1,6 @@
{
"name": "history",
"version": "0.7.0",
"version": "0.19.0",
"private": true,
"type": "module",
"description": "AI-driven alternate-history simulator — the LLM is the world engine (Pax Historia style).",
@@ -9,6 +9,11 @@
"build": "vite build && tsup server/index.ts --format esm --target node22 --out-dir server/dist --external better-sqlite3",
"start": "node server/dist/index.js",
"test": "vitest run",
"generate:regions": "node scripts/generate-regions.mjs",
"coarsen:regions": "node scripts/coarsen-regions.mjs",
"cleanup:regions": "node scripts/cleanup-regions.mjs",
"smooth:regions": "node scripts/smooth-regions.mjs",
"fill:regions": "node scripts/fill-gaps.mjs",
"typecheck": "tsc --noEmit",
"lint": "eslint .",
"e2e": "playwright test"
@@ -38,6 +43,15 @@
"@eslint/js": "^9.20.0",
"@playwright/test": "^1.62.1",
"@tailwindcss/vite": "^4.1.4",
"@turf/area": "^7.4.0",
"@turf/bbox": "^7.4.0",
"@turf/boolean-point-in-polygon": "^7.4.0",
"@turf/centroid": "^7.4.0",
"@turf/difference": "^7.4.0",
"@turf/distance": "^7.4.0",
"@turf/simplify": "^7.4.0",
"@turf/turf": "^7.4.0",
"@turf/union": "^7.4.0",
"@types/better-sqlite3": "^7.6.13",
"@types/express": "^4.17.25",
"@types/node": "^22.13.0",
File diff suppressed because one or more lines are too long
+323
View File
@@ -0,0 +1,323 @@
#!/usr/bin/env node
/**
* scripts/cleanup-regions.mjs — removes the small holes left by coarsening.
*
* Run: npm run cleanup:regions (in place on public/regions.geo.json)
* node scripts/cleanup-regions.mjs [out] [src] [--bridge]
*
* The v0.14 coarsening produced a clean 1,796-region dataset, but small
* unfilled patches ("holes") remain inside regions — artifacts of the boolean
* dissolves and Natural Earth's own digitization. This fixes that in place,
* WITHOUT touching the dataset's contract (the region count, the `id`s, the
* `properties = { name, parent }`, the ~100 km floor and the island exemption
* are all preserved — only inner rings are dropped).
*
* ENCLOSED HOLES — every hole (inner ring) whose area is < HOLE_AREA_MAX_KM2
* is dropped, so the region fills in to be solid. Any larger hole (a genuine
* water body) is kept. NOTE: the big real lakes (Great Lakes, Caspian, Aral,
* Lake Superior, …) were already dissolved by the v0.14 coarsening, so they
* are not present as holes here; the only hole above the threshold in this
* dataset is a single medium one (~5,858 km2, kept). A 1,000 km2 threshold
* is comfortably above the 2,252 tiny artifact holes (all < 500 km2) and
* comfortably below any large real lake, so it fills exactly the artifacts.
*
* BRIDGING (opt-in, `--bridge`) — a MultiPolygon whose separate parts sit
* only a short distance apart (a thin gap across a strait, a nearby island)
* leaves a visible crack of background. This joins each such close pair with
* a small connector polygon and a boolean union, closing the crack while
* genuinely far parts (islands, separated territories) stay separate. It is
* OFF by default: the union itself can mint new (medium) holes, which is
* counter to the primary "fill holes" goal, so the default run is the
* clean, deterministic hole-fill only.
*
* Deterministic + idempotent: fixed threshold, deterministic planar geometry,
* 4-dp rounding. Re-running on an already-clean file rewrites the same file
* (no small holes remain to fill; the kept holes are above the threshold).
*/
import { readFileSync, writeFileSync } from 'node:fs';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { union } from '@turf/union';
import { featureCollection } from '@turf/helpers';
const here = path.dirname(fileURLToPath(import.meta.url));
const root = path.resolve(here, '..');
const DEFAULT_FILE = path.join(root, 'public', 'regions.geo.json');
// positional args (out, src) plus named flags; keep the two orthogonal
const args = process.argv.slice(2).filter((a) => !a.startsWith('-'));
const flags = process.argv.slice(2).filter((a) => a.startsWith('-'));
const BRIDGE = flags.includes('--bridge');
const OUT = args[0] ? path.resolve(args[0]) : DEFAULT_FILE;
const SRC = args[1] ? path.resolve(args[1]) : DEFAULT_FILE;
// --- parameters ---------------------------------------------------------------
const HOLE_AREA_MAX_KM2 = 1000; // fill enclosed holes smaller than this (keep real lakes)
const BRIDGE_MAX_KM = 30; // bridge part-gaps smaller than this …
const BRIDGE_MIN_KM = 0.3; // … but only real gaps (a pair in (BRIDGE_MIN, BRIDGE_MAX))
const BRIDGE_EXT_KM = 2; // extend each bridge end into its part (ensures union overlap)
const BRIDGE_HW_MIN_KM = 2; // minimum half-width of a connector
const BRIDGE_HW_MAX_KM = 20; // cap so a connector never becomes a big blob
const R4 = 4; // coordinate precision (decimal places)
const SLIVER_EPS_KM2 = 1e-6; // drop only truly-degenerate (≈zero-area) parts
// --- area model (identical to coarsen-regions.mjs / regions.test.ts) -----------
const KM_LON = 111.32;
const KM_LAT = 110.574;
const rad = (deg) => (deg * Math.PI) / 180;
function ringAreaKm2(ring) {
let lat = 0;
for (const [, la] of ring) lat += la;
const kx = KM_LON * Math.cos(rad(ring.length ? lat / ring.length : 0));
let a = 0;
const n = ring.length;
for (let i = 0; i < n; i++) {
const [lon1, lat1] = ring[i];
const [lon2, lat2] = ring[(i + 1) % n];
a += lon1 * kx * (lat2 * KM_LAT) - lon2 * kx * (lat1 * KM_LAT);
}
return Math.abs(a / 2);
}
function geomAreaKm2(geom) {
if (!geom) return 0;
const polys = geom.type === 'Polygon' ? [geom.coordinates] : geom.coordinates;
let total = 0;
for (const poly of polys) total += ringAreaKm2(poly[0]);
return total;
}
// --- rounding / normalization (same conventions as coarsen-regions.mjs) --------
const rN = (v, N) => Math.round(v * 10 ** N) / 10 ** N;
function roundRing(ring, N = R4) {
const out = [];
for (const [x, y] of ring) {
const p = [rN(x, N), rN(y, N)];
const last = out[out.length - 1];
if (!last || last[0] !== p[0] || last[1] !== p[1]) out.push(p);
}
if (out.length > 1 && out[0][0] === out[out.length - 1][0] && out[0][1] === out[out.length - 1][1]) out.pop();
if (out.length < 3) return out;
return [...out, [...out[0]]];
}
function roundAll(geom) {
if (!geom || (geom.type !== 'Polygon' && geom.type !== 'MultiPolygon')) return null;
const polys = (geom.type === 'Polygon' ? [geom.coordinates] : geom.coordinates)
.map((poly) => poly.map((ring) => roundRing(ring)))
.filter((poly) => poly.length >= 1 && poly.every((r) => r.length >= 3));
if (!polys.length) return null;
if (polys.length === 1 && geom.type === 'Polygon') return { type: 'Polygon', coordinates: polys[0] };
return { type: 'MultiPolygon', coordinates: polys };
}
function normalizeGeom(geom) {
const rounded = roundAll(geom);
if (!rounded) return null;
const all = rounded.type === 'Polygon' ? [rounded.coordinates] : rounded.coordinates;
const kept = all.filter((poly) => ringAreaKm2(poly[0]) >= SLIVER_EPS_KM2);
const polys = kept.length ? kept : all;
if (polys.length === 1 && rounded.type === 'Polygon') return { type: 'Polygon', coordinates: polys[0] };
return { type: 'MultiPolygon', coordinates: polys };
}
// --- closest-point measurement (decimated planar point↔segment, ~km) ----------
function toXY(ring) {
let lat = 0;
for (const [, la] of ring) lat += la;
const kx = KM_LON * Math.cos(rad(ring.length ? lat / ring.length : 0));
return ring.map(([lon, lat]) => [lon * kx, lat * KM_LAT]);
}
function dec(pts, maxN = 200) {
if (pts.length <= maxN) return pts;
const step = Math.ceil(pts.length / maxN);
const out = [];
for (let i = 0; i < pts.length; i += step) out.push(pts[i]);
return out;
}
/**
* Closest point-pair between two planar rings: returns { d, p, q } with p on A,
* q on B and d = |p-q| in km (both on the decimated rings — a good-enough
* approximation for bridging; a tiny offset is corrected by the extension).
*/
function ringClosest(AX, BX) {
const A = dec(AX), B = dec(BX);
let best = Infinity, bestP = null, bestQ = null;
for (const p of A) {
for (let i = 0; i < B.length - 1; i++) {
const a = B[i], b = B[i + 1];
const dx = b[0] - a[0], dy = b[1] - a[1];
const l2 = dx * dx + dy * dy;
let t = l2 === 0 ? 0 : ((p[0] - a[0]) * dx + (p[1] - a[1]) * dy) / l2;
t = Math.max(0, Math.min(1, t));
const c = [a[0] + t * dx, a[1] + t * dy];
const dd = Math.hypot(p[0] - c[0], p[1] - c[1]);
if (dd < best) { best = dd; bestP = p; bestQ = c; }
}
}
for (const p of B) {
for (let i = 0; i < A.length - 1; i++) {
const a = A[i], b = A[i + 1];
const dx = b[0] - a[0], dy = b[1] - a[1];
const l2 = dx * dx + dy * dy;
let t = l2 === 0 ? 0 : ((p[0] - a[0]) * dx + (p[1] - a[1]) * dy) / l2;
t = Math.max(0, Math.min(1, t));
const c = [a[0] + t * dx, a[1] + t * dy];
const dd = Math.hypot(p[0] - c[0], p[1] - c[1]);
if (dd < best) { best = dd; bestP = c; bestQ = p; }
}
}
return { d: best, p: bestP, q: bestQ };
}
/**
* Build a thin connector (a quad in lon/lat) between two closest points p, q
* (both in planar km). The connector is extended a little into each part so the
* boolean union joins them, and its half-width is wide enough to span the local
* gap (capped so it never becomes a big blob).
*/
function makeBridgeRing(p, q) {
const gap = Math.hypot(q[0] - p[0], q[1] - p[1]);
if (gap < 1e-3) return null; // coincident → nothing to bridge
const midLat = (p[1] / KM_LAT + q[1] / KM_LAT) / 2;
const kx = KM_LON * Math.cos(rad(midLat));
const ux = (q[0] - p[0]) / gap, uy = (q[1] - p[1]) / gap; // unit p→q
const nx = -uy, ny = ux; // perpendicular
const hw = Math.min(BRIDGE_HW_MAX_KM, Math.max(BRIDGE_HW_MIN_KM, gap / 2));
const ext = BRIDGE_EXT_KM;
const pExt = [p[0] - ux * ext, p[1] - uy * ext];
const qExt = [q[0] + ux * ext, q[1] + uy * ext];
const toLL = ([x, y]) => [rN(x / kx, R4), rN(y / KM_LAT, R4)];
const c1 = toLL([pExt[0] + nx * hw, pExt[1] + ny * hw]);
const c2 = toLL([qExt[0] + nx * hw, qExt[1] + ny * hw]);
const c3 = toLL([qExt[0] - nx * hw, qExt[1] - ny * hw]);
const c4 = toLL([pExt[0] - nx * hw, pExt[1] - ny * hw]);
return [c1, c2, c3, c4, c1];
}
/** Bridge all close pairs of a MultiPolygon and union everything into one shape. */
function bridgeParts(geom) {
const parts = geom.coordinates;
const partsXY = parts.map((p) => toXY(p[0]));
const bridges = [];
let bridgedPairs = 0;
for (let i = 0; i < partsXY.length; i++) {
for (let j = i + 1; j < partsXY.length; j++) {
const { d, p, q } = ringClosest(partsXY[i], partsXY[j]);
if (d > BRIDGE_MIN_KM && d < BRIDGE_MAX_KM) {
const ring = makeBridgeRing(p, q);
if (ring) { bridges.push(ring); bridgedPairs++; }
}
}
}
if (!bridges.length) return { geom, bridgedPairs: 0, changed: false };
// union: original parts (as Polygons) + connector rings (as Polygons)
const feats = parts.map((poly) => ({ type: 'Feature', geometry: { type: 'Polygon', coordinates: poly } }));
for (const ring of bridges) feats.push({ type: 'Feature', geometry: { type: 'Polygon', coordinates: [ring] } });
let u;
try {
u = union(featureCollection(feats));
} catch (e) {
console.error(` [warn] bridge union failed: ${e.message}`);
return { geom, bridgedPairs: 0, changed: false };
}
const norm = u ? normalizeGeom(u.geometry) : null;
// Guard: a good bridge only adds a little area. Reject the union if it lost
// area (< 0.8×, a bad union that ate parts) or over-filled (> 1.3×, e.g. many
// overlapping bridges in a dense archipelago) — keep the original instead.
if (norm) {
const na = geomAreaKm2(norm);
const oa = geomAreaKm2(geom);
if (oa > 0 && (na < 0.8 * oa || na > 1.3 * oa)) {
return { geom, bridgedPairs: 0, changed: false };
}
}
return { geom: norm ?? geom, bridgedPairs, changed: true, bridgedParts: u ? (u.geometry.type === 'Polygon' ? 1 : u.geometry.coordinates.length) : parts.length };
}
// --- main ----------------------------------------------------------------------
function main() {
const t0 = Date.now();
const fc = JSON.parse(readFileSync(SRC, 'utf8'));
const inKB = (Buffer.byteLength(readFileSync(SRC)) / 1024).toFixed(0);
console.log(`input: ${fc.features.length} regions (${inKB} KB) from ${SRC}`);
console.log(`mode: holes <${HOLE_AREA_MAX_KM2} km2 filled, larger kept${BRIDGE ? `; + bridging part-gaps in (${BRIDGE_MIN_KM}, ${BRIDGE_MAX_KM}) km` : ''}`);
// diagnostics
let holesFilled = 0, holesFilledArea = 0, holesKept = 0, holesKeptArea = 0, featuresTouchedHole = 0;
let bridgedFeatures = 0, bridgedPairs = 0, partsBefore = 0, partsAfter = 0, areaBefore = 0, areaAfter = 0;
const bridgeSamples = [];
const keptHoleSamples = [];
const outFeatures = [];
for (const f of fc.features) {
let geom = f.geometry;
// ---- Opt-in: bridge close parts (additive connector + union) ----
if (BRIDGE && geom.type === 'MultiPolygon' && geom.coordinates.length >= 2) {
const before = { parts: geom.coordinates.length, area: geomAreaKm2(geom) };
const res = bridgeParts(geom);
if (res.changed) {
geom = res.geom;
bridgedFeatures++;
bridgedPairs += res.bridgedPairs;
partsBefore += before.parts;
partsAfter += geom.type === 'Polygon' ? 1 : geom.coordinates.length;
areaBefore += before.area;
areaAfter += geomAreaKm2(geom);
if (bridgeSamples.length < 20)
bridgeSamples.push(`${f.id} ${f.properties.name} (${f.properties.parent}): ${before.parts}p→${geom.type === 'Polygon' ? 1 : geom.coordinates.length}p, ${res.bridgedPairs} bridge(s), ${Math.round(before.area)}→${Math.round(geomAreaKm2(geom))} km2`);
}
}
// ---- Fill small enclosed holes: drop inner rings < threshold, keep larger ----
const isMulti = geom.type === 'MultiPolygon';
const polys = isMulti ? geom.coordinates : [geom.coordinates];
let touchedHole = false;
const newPolys = polys.map((poly) => {
const kept = [poly[0]]; // outer ring always kept
for (let i = 1; i < poly.length; i++) {
const area = ringAreaKm2(poly[i]);
if (area < 1e-6) continue; // degenerate — drop
if (area < HOLE_AREA_MAX_KM2) {
holesFilled++; holesFilledArea += area; touchedHole = true; // fill (drop)
} else {
holesKept++; holesKeptArea += area;
kept.push(poly[i]); // a genuine water body — keep the hole
if (keptHoleSamples.length < 20) keptHoleSamples.push(`${f.id}(${f.properties.parent}) ${Math.round(area)} km2`);
}
}
return kept;
});
if (touchedHole) featuresTouchedHole++;
const rebuilt = isMulti
? { type: 'MultiPolygon', coordinates: newPolys }
: { type: 'Polygon', coordinates: newPolys[0] };
// normalize (round 4dp, drop degenerate). NEVER drop a feature: if nothing
// usable survives (a degenerate 3-pt 0-area micro-dot), keep the
// hole-filled (rebuilt) geometry, else the untouched original.
const norm = normalizeGeom(rebuilt);
outFeatures.push({ type: 'Feature', id: f.id, properties: { name: f.properties.name, parent: f.properties.parent }, geometry: norm ?? rebuilt ?? geom });
}
const out = { type: 'FeatureCollection', features: outFeatures };
const json = JSON.stringify(out);
const outKB = (Buffer.byteLength(json) / 1024).toFixed(0);
writeFileSync(OUT, json + '\n');
console.log(`\n--- RESULTS ---`);
console.log(`regions: ${fc.features.length} → ${out.features.length} (should be unchanged)`);
console.log(`file: ${inKB} KB → ${outKB} KB (${(outKB / 1024).toFixed(2)} MB)`);
console.log(`\nENCLOSED HOLES:`);
console.log(` filled ${holesFilled} holes (${Math.round(holesFilledArea).toLocaleString('en-US')} km2) in ${featuresTouchedHole} features`);
console.log(` kept ${holesKept} hole(s) (${Math.round(holesKeptArea).toLocaleString('en-US')} km2) as real water`);
if (keptHoleSamples.length) console.log(` kept-hole list: ${keptHoleSamples.join(', ')}`);
if (BRIDGE) {
console.log(`\nBRIDGING (part-gaps):`);
console.log(` bridged ${bridgedFeatures} features (${bridgedPairs} close pairs): parts ${partsBefore} → ${partsAfter}, area ${Math.round(areaBefore).toLocaleString('en-US')} → ${Math.round(areaAfter).toLocaleString('en-US')} km2`);
for (const s of bridgeSamples) console.log(` ${s}`);
} else {
console.log(`\nbridging: skipped (pass --bridge to enable)`);
}
console.log(`\nwrote ${OUT}; elapsed ${((Date.now() - t0) / 1000).toFixed(1)}s`);
}
main();
+612
View File
@@ -0,0 +1,612 @@
#!/usr/bin/env node
/**
* scripts/coarsen-regions.mjs — coarsens the committed `public/regions.geo.json`
* in place, so the map is genuinely coarser, not just finer-grained.
*
* Rule (per user request: "focus on joining cities to the region around it.
* Regions shouldn't be smaller than around 100x100km, excluding islands"):
*
* FLOOR — no region should be smaller than ~100×100 km = 10,000 km²,
* EXCEPT islands.
* ISLAND — a region is an island if it has NO same-country neighbor: no
* other region with the same `properties.parent` whose bounding box
* is within CLOSE_DEG (≈≤22 km) of its own. Small islands stay
* as-is regardless of size (Corsica, the Hawaiian counties,
* Okinawa, the Faroes, island micro-states, …).
* MERGE — a region that is small (area < FLOOR) AND not an island is
* merged into its NEAREST same-country neighbor (nearest by
* centroid distance; tie-break → larger area, then lexicographic
* id). Standalone cities (FR-75 Paris, the Latvian/Slovenian
* municipalities, the UK's 231 micro-districts) collapse into the
* region around them.
* DISSOLVE— the merge is a real boolean union (`@turf/union`, polygon-
* clipping): the shared boundary between the merged region and its
* host is removed, producing a single clean polygon — not two
* overlapping shapes. (Fallback if the union fails on a pair:
* combine the rings into a MultiPolygon without dissolving; the
* count of such fallbacks is reported.)
* ITERATE — passes run smallest-area-first (small regions merge into their
* neighbors, which grow and then absorb more). After each pass the
* area/neighbor/centroid metrics are recomputed; it stops at the
* fixed point (no small non-island region left) or at MAX_ITER.
* IDENTITY— the host (the region merged INTO) keeps its own `id` and
* `name`; the absorbed region's id is dropped. `properties.parent`
* is unchanged, so the map code (WorldMap/App/protocol/map.ts)
* keeps working untouched.
*
* Deterministic: fixed processing order (area, then id), deterministic
* neighbor choice (distance, then -area, then id), deterministic boolean
* union. Re-running on the coarsened file reaches the fixed point
* immediately and rewrites a byte-identical file.
*
* Area model: the SAME planar approximation the validation test uses
* (`scripts/regions.test.ts`) — `x = lon·111.32·cos(midLat)`,
* `y = lat·110.574` km, shoelace per OUTER ring (holes ignored), each ring at
* its own mean latitude — so the script's merge decisions and the test's
* assertions measure the same quantity.
*
* Longitude handling: every ring is unwrapped to a continuous [0,360)-derived
* space before its bbox/centroid is computed (the shortest-difference
* "np.unwrap" scheme), which makes the one full-360° antimeridian-wrapping
* feature (Antarctica's mainland ring) and any seam-straddling ring behave
* correctly; cross-feature longitude gaps use the 360°-cyclic minimum.
*
* Output: features sorted by (parent, id) (the same comparator as
* `scripts/generate-regions.mjs`), coordinates rounded to 4 decimal places,
* single line of JSON + trailing newline. If the file would exceed the
* ~5 MB guard, a light Douglas–Peucker pass (tolerances escalated through a
* small table) brings it under ~4 MB before writing.
*
* Run: `npm run coarsen:regions`
*/
import { readFileSync, writeFileSync } from 'node:fs';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { union } from '@turf/union';
import { feature, featureCollection } from '@turf/helpers';
const here = path.dirname(fileURLToPath(import.meta.url));
const root = path.resolve(here, '..');
const FILE = path.join(root, 'public', 'regions.geo.json');
// --- parameters ---------------------------------------------------------------
const AREA_FLOOR_KM2 = 10_000; // ~100×100 km floor for non-island regions
const CLOSE_DEG = 0.2; // "spatially close" bbox gap (both lat and lon ≤ this; ≈≤22 km)
const MAX_ITER = 20; // safety cap on fixed-point passes (spec: ~15)
const SIZE_GUARD_KB = 5_120; // keep the committed file under ~5 MB
const SIZE_TARGET_KB = 4_096; // …and land under ~4 MB once simplified
const DP_STEPS = [0.05, 0.1, 0.2, 0.3, 0.5, 0.75, 1.0]; // Douglas–Peucker tolerances (degrees)
const R4 = 4; // coordinate precision (decimal places, ≈11 m)
const SLIVER_EPS_KM2 = 1e-6; // drop only truly-degenerate (≈zero-area) clipper slivers
// --- area model (identical to scripts/regions.test.ts) -------------------------
const KM_LON = 111.32;
const KM_LAT = 110.574;
const rad = (deg) => (deg * Math.PI) / 180;
/** Shoelace area (km²) of one ring, measured at the ring's own mean latitude. */
function ringAreaKm2(ring) {
let lat = 0;
for (const [, la] of ring) lat += la;
const kx = KM_LON * Math.cos(rad(ring.length ? lat / ring.length : 0));
let a = 0;
const n = ring.length;
for (let i = 0; i < n; i++) {
const [lon1, lat1] = ring[i];
const [lon2, lat2] = ring[(i + 1) % n];
a += lon1 * kx * (lat2 * KM_LAT) - lon2 * kx * (lat1 * KM_LAT);
}
return Math.abs(a / 2);
}
/** Sum of a geometry's outer-ring areas (holes are lakes — ignored by design). */
function geomAreaKm2(geom) {
if (!geom) return 0;
const polys = geom.type === 'Polygon' ? [geom.coordinates] : geom.coordinates;
let total = 0;
for (const poly of polys) total += ringAreaKm2(poly[0]);
return total;
}
// --- longitude unwrapping (antimeridian-safe) ----------------------------------
/**
* Unwrap a ring's longitudes to a continuous real line (the "np.unwrap"
* shortest-difference scheme, anchored at the first vertex's [0,360) value).
* Returns { lons, full } — `full` when the unwrapped span is ≥ 300°, i.e. the
* ring is a full-360° antimeridian band (Antarctica's mainland ring).
*/
function unwrapRing(ring) {
const n = ring.length;
const norm = (x) => ((x % 360) + 360) % 360; // → [0,360)
const u = new Array(n);
u[0] = norm(ring[0][0]);
for (let i = 1; i < n; i++) {
// The PREVIOUS unwrapped value may lie outside [0,360) (it accumulates),
// so normalize it back before measuring the difference; otherwise a bogus
// ~180° jump is inserted and the ring's span balloons to ~180°.
const a = norm(u[i - 1]);
const b = norm(ring[i][0]);
const d = (((b - a) % 360) + 540) % 360 - 180; // shortest signed diff in (-180, 180]
u[i] = u[i - 1] + d;
}
let min = Infinity;
let max = -Infinity;
for (const v of u) {
if (v < min) min = v;
if (v > max) max = v;
}
return { lons: u, full: max - min >= 300 };
}
/**
* Cyclic 1-D gap (degrees) between two tight longitude intervals in their own
* unwrapped [0,360)-derived spaces. Tries the three 360° shifts of `b` so
* different unwrap anchors reconcile; a `full` interval is close to everything.
*/
function lonGap(intA, intB) {
if (intA.full || intB.full) return 0;
let best = Infinity;
for (const k of [-1, 0, 1]) {
const a2 = intB.a + 360 * k;
const b2 = intB.b + 360 * k;
const gap = intA.b < a2 ? a2 - intA.b : b2 < intA.a ? intA.a - b2 : 0;
if (gap < best) best = gap;
}
return best;
}
// --- geometry helpers ----------------------------------------------------------
const rN = (v, N) => Math.round(v * 10 ** N) / 10 ** N;
/** Round a ring to 4 dp, drop consecutive duplicates, and (re-)close it. */
function roundRing(ring, N = R4) {
const out = [];
for (const [x, y] of ring) {
const p = [rN(x, N), rN(y, N)];
const last = out[out.length - 1];
if (!last || last[0] !== p[0] || last[1] !== p[1]) out.push(p);
}
if (
out.length > 1 &&
out[0][0] === out[out.length - 1][0] &&
out[0][1] === out[out.length - 1][1]
)
out.pop();
if (out.length < 3) return out; // degenerate; caller drops it
return [...out, [...out[0]]];
}
/**
* Round every ring of a geometry to 4 dp, drop degenerate rings (<3 pts) and
* empty polygons, keep the Polygon/MultiPolygon type (a single-part
* MultiPolygon collapses to Polygon). Returns null if nothing usable survived.
*/
function roundAll(geom) {
if (!geom || (geom.type !== 'Polygon' && geom.type !== 'MultiPolygon')) return null;
const polys = (geom.type === 'Polygon' ? [geom.coordinates] : geom.coordinates)
.map((poly) => poly.map((ring) => roundRing(ring)))
.filter((poly) => poly.length >= 1 && poly.every((r) => r.length >= 3));
if (!polys.length) return null;
if (polys.length === 1 && geom.type === 'Polygon') return { type: 'Polygon', coordinates: polys[0] };
return { type: 'MultiPolygon', coordinates: polys };
}
/**
* Normalize a union output (or fallback MultiPolygon): roundAll, then drop
* truly-degenerate (≈zero-area, < SLIVER_EPS_KM2) polygons the clipper can
* leave behind at shared boundaries. It never drops *every* part — a merge of
* two sub-resolution (zero-area) micro-regions must still collapse into one
* (degenerate) region rather than vanish. Returns null only when the input
* itself had no usable ring (e.g. `null`).
*/
function normalizeGeom(geom) {
const rounded = roundAll(geom);
if (!rounded) return null;
const all = rounded.type === 'Polygon' ? [rounded.coordinates] : rounded.coordinates;
const kept = all.filter((poly) => ringAreaKm2(poly[0]) >= SLIVER_EPS_KM2);
const polys = kept.length ? kept : all;
if (polys.length === 1 && rounded.type === 'Polygon') return { type: 'Polygon', coordinates: polys[0] };
return { type: 'MultiPolygon', coordinates: polys };
}
/** Douglas–Peucker of an OPEN point sequence (keeps endpoints). */
function dpOpen(pts, tol) {
if (pts.length < 3) return pts;
let maxD = 0;
let idx = 0;
const a = pts[0];
const b = pts[pts.length - 1];
for (let i = 1; i < pts.length - 1; i++) {
const dx = b[0] - a[0];
const dy = b[1] - a[1];
const l2 = dx * dx + dy * dy;
let t = l2 === 0 ? 0 : ((pts[i][0] - a[0]) * dx + (pts[i][1] - a[1]) * dy) / l2;
t = Math.max(0, Math.min(1, t));
const d = Math.hypot(pts[i][0] - (a[0] + t * dx), pts[i][1] - (a[1] + t * dy));
if (d > maxD) {
maxD = d;
idx = i;
}
}
if (maxD > tol) {
const left = dpOpen(pts.slice(0, idx + 1), tol);
const right = dpOpen(pts.slice(idx), tol);
return left.concat(right.slice(1));
}
return [a, b];
}
/** Douglas–Peucker a CLOSED ring at tolerance `tol` (0 = skip). */
function dpRing(ring, tol) {
if (tol <= 0 || ring.length < 4) return ring;
let pts = ring;
if (pts[0][0] === pts[pts.length - 1][0] && pts[0][1] === pts[pts.length - 1][1]) pts = pts.slice(0, -1);
const s = dpOpen(pts, tol);
if (s.length < 3) return ring;
return [...s, [...s[0]]];
}
/** Round (and optionally DP-simplify) every ring of a geometry. */
function transformGeom(geom, tol) {
const polys = (geom.type === 'Polygon' ? [geom.coordinates] : geom.coordinates)
.map((poly) => poly.map((ring) => roundRing(ring, R4)).map((ring) => (tol > 0 ? dpRing(ring, tol) : ring)))
.filter((poly) => poly.length >= 1 && poly.every((r) => r.length >= 3));
if (!polys.length) return null;
if (polys.length === 1 && geom.type === 'Polygon') return { type: 'Polygon', coordinates: polys[0] };
return { type: 'MultiPolygon', coordinates: polys };
}
// --- region record -------------------------------------------------------------
/**
* A region under management. `lonInt` is the tight longitude interval in
* [0,360)-derived unwrapped space (or `full` for a 360° band); `(clat, clon)`
* is the area-weighted centroid of the LARGEST outer ring (the region's
* "location"), unwrapped for its ring then wrapped to [-180,180) for
* cyclic-distance use.
*/
class Region {
constructor(f) {
this.id = f.id;
this.name = f.properties.name;
this.parent = f.properties.parent;
this.geom = f.geometry;
this.rawGeom = null; // last pre-normalization union output (safety net for build())
this.dead = false;
this.metrics();
}
metrics() {
this.area = geomAreaKm2(this.geom);
const polys = this.geom.type === 'Polygon' ? [this.geom.coordinates] : this.geom.coordinates;
let latMin = Infinity;
let latMax = -Infinity;
let lonA = Infinity;
let lonB = -Infinity;
let lonFull = false;
let bestRing = null;
let bestArea = -1;
for (const poly of polys) {
const outer = poly[0];
for (const [, la] of outer) {
if (la < latMin) latMin = la;
if (la > latMax) latMax = la;
}
const { lons, full } = unwrapRing(outer);
if (full) lonFull = true;
let a = Infinity;
let b = -Infinity;
for (const v of lons) {
if (v < a) a = v;
if (v > b) b = v;
}
lonA = Math.min(lonA, a);
lonB = Math.max(lonB, b);
const ar = ringAreaKm2(outer);
if (ar > bestArea) {
bestArea = ar;
bestRing = outer;
}
}
this.lonInt = { a: lonA, b: lonB, full: lonFull };
this.latMin = latMin;
this.latMax = latMax;
// area-weighted centroid of the largest outer ring, in unwrapped space
const { lons } = unwrapRing(bestRing);
const lats = bestRing.map((p) => p[1]);
const n = bestRing.length;
let A = 0;
let cx = 0;
let cy = 0;
for (let i = 0; i < n; i++) {
const x1 = lons[i];
const y1 = lats[i];
const x2 = lons[(i + 1) % n];
const y2 = lats[(i + 1) % n];
const f = x1 * y2 - x2 * y1;
A += f;
cx += (x1 + x2) * f;
cy += (y1 + y2) * f;
}
A /= 2;
if (Math.abs(A) > 1e-9) {
cx /= 6 * A;
cy /= 6 * A;
} else {
cx = (lonA + lonB) / 2;
cy = (latMin + latMax) / 2;
}
this.clon = (((cx + 180) % 360) + 360) % 360 - 180;
this.clat = cy;
}
/** Cyclic planar distance (km) to another region's centroid. */
distKm(o) {
let dlon = Math.abs(this.clon - o.clon) % 360;
if (dlon > 180) dlon = 360 - dlon;
const midLat = rad((this.clat + o.clat) / 2);
return Math.hypot(dlon * KM_LON * Math.cos(midLat), (this.clat - o.clat) * KM_LAT);
}
/** Bounding-box closeness to another same-space region (see CLOSE_DEG). */
closeTo(o) {
const latGap = this.latMax < o.latMin ? o.latMin - this.latMax : o.latMax < this.latMin ? this.latMin - o.latMax : 0;
if (latGap > CLOSE_DEG) return false;
return lonGap(this.lonInt, o.lonInt) <= CLOSE_DEG;
}
}
/**
* A "degenerate" region is a zero-area artifact: after 4-dp rounding its only
* ring has <3 distinct points (a line/point, e.g. a micro-municipality that
* v0.13's Douglas–Peucker collapsed to `[A, B, A]`). It contributes no area,
* so it can never be dissolved by the clipper (which returns null) nor kept
* through ring-dropping (which loses the 2-point ring). Merging one is purely
* an absorption: the host keeps its own geometry.
*/
const isDegenerate = (r) => r.area < SLIVER_EPS_KM2;
// --- main ----------------------------------------------------------------------
function main() {
const fc0 = JSON.parse(readFileSync(FILE, 'utf8'));
const regions = fc0.features.map((f) => new Region(f));
const byParent = new Map();
for (const r of regions) {
if (!byParent.has(r.parent)) byParent.set(r.parent, []);
byParent.get(r.parent).push(r);
}
const t0 = Date.now();
console.log(`input: ${fc0.features.length} regions across ${byParent.size} countries (${(Buffer.byteLength(readFileSync(FILE)) / 1024).toFixed(0)} KB)`);
console.log(`parameters: floor ${AREA_FLOOR_KM2.toLocaleString('en-US')} km2, close ${CLOSE_DEG} deg, max ${MAX_ITER} passes`);
const merges = []; // { from, fromName, fromArea, to, toName, toAreaAfter }
let fallbackUnions = 0;
// The fixed-point loop. Each pass: every region that is small AND has a
// close same-country neighbor merges into the nearest such neighbor
// (nearest by centroid distance; tie → larger area → lexicographic id).
for (let pass = 0; pass < MAX_ITER; pass++) {
let skippedIsland = 0;
let skippedGrew = 0;
const items = [];
for (const r of regions) {
if (r.dead || r.area >= AREA_FLOOR_KM2) continue;
const siblings = byParent.get(r.parent);
for (const s of siblings) {
if (s !== r && !s.dead && r.closeTo(s)) {
items.push(r);
break;
}
}
}
if (!items.length) {
console.log(`after pass ${pass}: fixed point reached (no small non-island regions left)`);
break;
}
items.sort((a, b) => (a.area !== b.area ? a.area - b.area : a.id < b.id ? -1 : 1));
let merged = 0;
for (const r of items) {
if (r.dead) continue;
if (r.area >= AREA_FLOOR_KM2) {
skippedGrew++;
continue; // absorbed a smaller region earlier this pass and crossed the floor
}
const siblings = byParent.get(r.parent);
// Close same-country neighbors as of NOW (mid-pass): some may have died
// earlier in this pass.
const close = [];
for (const s of siblings) if (s !== r && !s.dead && r.closeTo(s)) close.push(s);
if (!close.length) {
skippedIsland++;
continue; // lost its last close neighbor this pass → island now → exempt
}
// Prefer a REAL (non-degenerate) host so real regions dissolve cleanly;
// fall back to any close neighbor only when no real one is nearby.
const realCands = close.filter((s) => !isDegenerate(s));
const pool = realCands.length ? realCands : close;
let host = null;
for (const s of pool) {
if (
!host ||
r.distKm(s) < r.distKm(host) ||
(r.distKm(s) === r.distKm(host) &&
(s.area !== host.area ? s.area > host.area : s.id < host.id))
)
host = s;
}
if (isDegenerate(r)) {
// r is a zero-area artifact (line/point): it contributes no area, so the
// merge is a pure absorption — the host keeps its own geometry (a real
// host is untouched; if the host is also degenerate a cluster of dots
// collapses to one). Never route degenerate input through the clipper
// (returns null) or ring-dropping (would lose the 2-point ring the map
// already renders).
r.dead = true;
merged++;
merges.push({ from: r.id, fromName: r.name, fromArea: r.area, to: host.id, toName: host.name, toAreaAfter: host.area });
continue;
}
if (isDegenerate(host)) {
// r is real but the chosen host is a zero-area artifact: the host takes
// on r's geometry (keeping its own id/name). No clipper needed.
host.geom = r.geom;
host.rawGeom = r.geom;
host.metrics();
r.dead = true;
merged++;
merges.push({ from: r.id, fromName: r.name, fromArea: r.area, to: host.id, toName: host.name, toAreaAfter: host.area });
continue;
}
// Both real: dissolve via a boolean union; the host keeps its id/name
// and the item vanishes. @turf/union@7 dispatches through geomEach, which
// only understands a FeatureCollection / single Feature / bare geometry —
// a raw array of features has no `.type` and throws "Unknown Geometry
// Type". Wrap it.
let unionGeom = null;
let rawUnion = null;
try {
const u = union(featureCollection([feature(r.geom), feature(host.geom)]));
rawUnion = u ? u.geometry : null;
unionGeom = normalizeGeom(rawUnion);
} catch (err) {
console.error(` [warn] union failed for ${r.id} into ${host.id} (${err.message}); combining without dissolve`);
fallbackUnions++;
}
if (!unionGeom) {
// fallback: no dissolve — keep both shapes in one MultiPolygon
const polys = [...(r.geom.type === 'Polygon' ? [r.geom.coordinates] : r.geom.coordinates), ...(host.geom.type === 'Polygon' ? [host.geom.coordinates] : host.geom.coordinates)];
rawUnion = { type: 'MultiPolygon', coordinates: polys };
unionGeom = normalizeGeom(rawUnion);
if (!unionGeom) fallbackUnions++;
}
if (!unionGeom) {
console.error(` [error] could not merge ${r.id} into ${host.id}; leaving ${r.id} as-is`);
continue;
}
host.geom = unionGeom;
host.rawGeom = rawUnion;
host.metrics();
r.dead = true;
merged++;
merges.push({ from: r.id, fromName: r.name, fromArea: r.area, to: host.id, toName: host.name, toAreaAfter: host.area });
}
const alive = regions.filter((r) => !r.dead).length;
console.log(
`pass ${pass + 1}: ${items.length} small non-island region(s) → ${merged} merged` +
` (${skippedGrew} crossed the floor, ${skippedIsland} became island) → ${alive} regions remain`,
);
if (merged === 0) {
// items exist but nothing could merge (all became islands this pass) → stable
console.log(`pass ${pass + 1}: no merges possible — stable state`);
break;
}
}
// --- assemble output ----------------------------------------------------------
const alive = regions.filter((r) => !r.dead);
const sortById = (a, b) =>
a.parent !== b.parent ? (a.parent < b.parent ? -1 : 1) : a.id.localeCompare(b.id, 'en', { numeric: true });
alive.sort(sortById);
const build = (tol) => {
const feats = [];
for (const r of alive) {
// Never drop a region: if the simplified/normalized geometry degenerated,
// fall back to the raw (pre-normalization) union output, then to the
// untouched input geometry.
const g =
transformGeom(r.geom, tol) ??
(r.rawGeom ? transformGeom(r.rawGeom, 0) ?? r.rawGeom : r.geom);
feats.push({ type: 'Feature', id: r.id, properties: { name: r.name, parent: r.parent }, geometry: g });
}
return { type: 'FeatureCollection', features: feats };
};
let out = build(0);
let json = JSON.stringify(out);
let sizeKB = Buffer.byteLength(json) / 1024;
console.log(`\ncoarsened: ${fc0.features.length} → ${out.features.length} regions (${fc0.features.length - out.features.length} merged away)`);
let usedTol = 0;
if (sizeKB > SIZE_GUARD_KB) {
for (const t of DP_STEPS) {
out = build(t);
json = JSON.stringify(out);
sizeKB = Buffer.byteLength(json) / 1024;
usedTol = t;
console.log(`DP ${t}: ${sizeKB.toFixed(1)} KB`);
if (sizeKB < SIZE_TARGET_KB) break;
}
}
writeFileSync(FILE, json + '\n');
// --- summary -------------------------------------------------------------------
const areaOf = new Map();
const counts = new Map();
let maxA = 0;
let maxR = null;
for (const f of out.features) {
const a = geomAreaKm2(f.geometry);
areaOf.set(f.id, a);
counts.set(f.properties.parent, (counts.get(f.properties.parent) ?? 0) + 1);
if (a > maxA) {
maxA = a;
maxR = f;
}
}
const ccounts = [...counts.values()].sort((a, b) => a - b);
const median =
ccounts.length % 2 ? ccounts[(ccounts.length - 1) / 2] : (ccounts[ccounts.length / 2 - 1] + ccounts[ccounts.length / 2]) / 2;
const maxCountry = [...counts.entries()].sort((a, b) => b[1] - a[1])[0];
// islands = small regions with no close same-country neighbor in the FINAL set
const finalByParent = new Map();
for (const f of out.features) {
if (!finalByParent.has(f.properties.parent)) finalByParent.set(f.properties.parent, []);
finalByParent.get(f.properties.parent).push(f);
}
// rebuild final metrics (light: only need island flag on the < FLOOR set)
const finalRegions = out.features.map((f) => new Region(f));
const finalByParent2 = new Map();
for (const r of finalRegions) {
if (!finalByParent2.has(r.parent)) finalByParent2.set(r.parent, []);
finalByParent2.get(r.parent).push(r);
}
let smallIslands = 0;
let smallNonIslands = 0;
const islandSamples = [];
for (const r of finalRegions) {
if (r.area >= AREA_FLOOR_KM2) continue;
let hasNeighbor = false;
for (const s of finalByParent2.get(r.parent)) {
if (s !== r && r.closeTo(s)) {
hasNeighbor = true;
break;
}
}
if (hasNeighbor) smallNonIslands++;
else {
smallIslands++;
if (islandSamples.length < 12) islandSamples.push(`${r.id} ${r.name} (${Math.round(r.area)} km2)`);
}
}
console.log(`wrote ${FILE} — ${sizeKB.toFixed(1)} KB (${(sizeKB / 1024).toFixed(2)} MB)` + (usedTol ? ` [DP @ ${usedTol}°]` : ''));
console.log(`per-country count: min ${ccounts[0]} / median ${median} / max ${ccounts[ccounts.length - 1]} (max: ${maxCountry[0]})`);
console.log(`max region: ${maxR.id} (${maxR.properties.name}) ≈ ${Math.round(maxA).toLocaleString('en-US')} km2`);
console.log(`small (<${AREA_FLOOR_KM2.toLocaleString('en-US')} km2) in final set: ${smallIslands + smallNonIslands} — ${smallIslands} islands (exempt) / ${smallNonIslands} non-island residuals`);
if (islandSamples.length) console.log(`island samples: ${islandSamples.join(', ')}`);
console.log(`fallback (non-dissolved) unions: ${fallbackUnions}`);
console.log(`merge log (${merges.length} merges): first 15:`);
for (const m of merges.slice(0, 15)) {
console.log(` ${m.from} (${m.fromName}, ${Math.round(m.fromArea)} km2) → ${m.to} (${m.toName}, now ${Math.round(m.toAreaAfter)} km2)`);
}
const logPath = '/tmp/opencode/coarsen-log.txt';
writeFileSync(logPath, merges.map((m) => `${m.from}\t${m.fromName}\t${Math.round(m.fromArea)}\t${m.to}\t${m.toName}\t${Math.round(m.toAreaAfter)}`).join('\n') + '\n');
console.log(`full merge log → ${logPath}; elapsed ${((Date.now() - t0) / 1000).toFixed(1)}s`);
}
main();
+364
View File
@@ -0,0 +1,364 @@
#!/usr/bin/env node
/**
* Fill "no-one's-land" gaps left in `public/regions.geo.json` by the v0.14 coarsening merge.
*
* For each country, the gap = (country landmass) − (union of the country's sub-regions):
* area inside the country's authoritative landmass that no sub-region covers. Each gap
* fragment is assigned to the **nearest** sub-region (centroid haversine distance) and
* appended to it as extra polygon part(s). A fragment is only added if:
*
* • it is not a sub-tiny sliver (≥ GAP_MIN_KM2),
* • it does not fall inside an existing region's *hole* (water) — this keeps the
* Aral-basin hole in KZ-KZY open,
* • it is not byte-identical to a part the file already contains (polyclip sometimes
* re-emits a region's own outer ring with a phantom sliver hole; once the hole is
* cleaned the piece equals the existing part, and appending it would only grow the
* file on every re-run),
* • it has been clipped against every region of *other* countries (and against pieces
* already appended this run) that touch its bbox, so it never overlaps an existing
* region — no new cross-border overlaps are introduced.
*
* Holes found in gap fragments are kept only when they are real: pre-existing region
* holes (matched by centroid) or enclaves of another country (e.g. Lesotho inside ZAF,
* so the ZAF fragment stays a ring and never covers the LSO region); every other hole
* is a polyclip phantom and is dropped.
*
* Standard GeoJSON (`{type, coordinates}`) throughout — the same shape the file and
* MapLibre already use, and what @turf v7 expects.
*
* Usage: node scripts/fill-gaps.mjs [inFile [outFile]]
* inFile default: public/regions.geo.json
* outFile default: inFile (edit in place)
* Env: GAP_MIN_KM2 (default 25) — gap fragments below this area are ignored slivers.
*
* Deterministic: same input → same output. Re-running on an already-filled file is a
* no-op (every re-discovered fragment is either a sub-threshold sliver, a phantom that
* byte-matches an existing part, or already covered by the enlarged union), so the
* result is idempotent.
*/
import fs from "node:fs";
import difference from "@turf/difference";
import union from "@turf/union";
import centroid from "@turf/centroid";
import bbox from "@turf/bbox";
import area from "@turf/area";
import booleanPointInPolygon from "@turf/boolean-point-in-polygon";
import distance from "@turf/distance";
import { feature, featureCollection, multiPolygon, polygon, point } from "@turf/helpers";
const GAP_MIN_KM2 = Number(process.env.GAP_MIN_KM2 ?? 25);
const RING_MIN_KM2 = 1e-4; // drop degenerate (numerical-noise) rings
// --------------------------------------------------------------------------- helpers
/**
* Round coordinates in place to 6 decimals (file convention). Accepts either a single
* ring (array of positions) or a polygon part (array of rings) and detects the depth.
*/
function roundCoords(coords) {
const isRing = Array.isArray(coords[0]) && Array.isArray(coords[0][0]) ? false : true;
const rings = isRing ? [coords] : coords;
for (const ring of rings) for (const c of ring) {
c[0] = Number(c[0].toFixed(6));
c[1] = Number(c[1].toFixed(6));
}
return coords;
}
/** Area (km²) of a closed ring, 0 when degenerate/NaN. */
function ringKm2(ring) {
if (!isValidRing(ring)) return 0;
try { return area(polygon([ring])) * 1e-6; } catch { return 0; }
}
/** A valid GeoJSON ring: ≥4 closed positions, each [finiteNumber, finiteNumber]. */
function isValidRing(ring) {
if (!Array.isArray(ring) || ring.length < 4) return false;
for (const c of ring) {
if (!Array.isArray(c) || c.length < 2) return false;
if (typeof c[0] !== "number" || !Number.isFinite(c[0])) return false;
if (typeof c[1] !== "number" || !Number.isFinite(c[1])) return false;
}
return true;
}
// Module-level refs populated in main before use (see keepHole).
let preHoleCentroids = []; // centroids of holes present in the input file (kept verbatim)
let otherLandmasses = []; // { iso, feature } for every country landmass
/**
* Is this hole a "real" one that must be preserved? Kept when it is a pre-existing
* region hole (centroid match, e.g. the Aral) or lies inside another country's
* landmass (enclave, e.g. Lesotho). Otherwise it is a polyclip phantom → dropped.
*/
function keepHole(hole, currentIso) {
const hKm2 = ringKm2(hole);
if (!(hKm2 >= RING_MIN_KM2)) return false; // degenerate / NaN
const cm = centroid(polygon([hole])).geometry.coordinates;
if (preHoleCentroids.some((p) => distance(cm, p) < 10)) return true;
if (otherLandmasses.some((l) => l.iso !== currentIso && booleanPointInPolygon(point(cm), l.feature))) return true;
return false;
}
/**
* Clean a GeoJSON polygon part (`[outerRing, ...holeRings]`): round coordinates, keep
* only real holes (see keepHole). Returns the cleaned part, or null if the outer ring
* is degenerate.
*/
function cleanPolygonPart(part, currentIso) {
if (!Array.isArray(part) || part.length === 0) return null;
const outer = part[0];
if (!isValidRing(outer)) return null;
const outerKm2 = ringKm2(outer);
if (!(outerKm2 >= RING_MIN_KM2)) return null; // covers NaN too
const holes = part.slice(1).filter((h) => isValidRing(h) && keepHole(h, currentIso));
roundCoords([outer, ...holes]);
return [outer, ...holes];
}
/** Split a geometry (Polygon|MultiPolygon) into cleaned polygon parts. */
function partsOf(geom, iso) {
if (!geom) return [];
const raw = geom.type === "MultiPolygon" ? geom.coordinates : [geom.coordinates];
const out = [];
for (const p of raw) { const c = cleanPolygonPart(p, iso); if (c) out.push(c); }
return out;
}
/** Rebuild a geometry (NOT a feature) from cleaned parts. */
function toGeometry(parts) {
// turf helpers return Features; take their .geometry ({type, coordinates}).
return parts.length > 1 ? multiPolygon(parts).geometry : polygon(parts[0]).geometry;
}
/** Bbox of a polygon part, as [west, south, east, north]. */
function partBBox(part) { return bbox(polygon(part)); }
function bBoxesOverlap(a, b) {
return !(a[2] < b[0] || a[0] > b[2] || a[3] < b[1] || a[1] > b[3]);
}
/** Sample points along a part's outer ring (start + every ~max(1, n/16)th vertex). */
function samplePoints(part, maxN = 16) {
const ring = part[0];
const n = ring.length;
if (n <= maxN) return ring;
const step = Math.ceil(n / maxN);
const out = [ring[0]];
for (let i = step; i < n; i += step) out.push(ring[i]);
return out;
}
// Module-level list of pre-existing region holes (water guard), built in main.
let holeRings = []; // { bbox, poly }
/** Does a gap piece overlap any pre-existing region hole (water)? */
function overlapsAnyHole(piece, pieceCm) {
const pBBox = partBBox(piece);
const candidates = holeRings.filter((h) => bBoxesOverlap(pBBox, h.bbox));
if (candidates.length === 0) return false;
const pts = [pieceCm, ...samplePoints(piece)];
return candidates.some((h) => pts.some((p) => booleanPointInPolygon(point(p), h.poly)));
}
// --------------------------------------------------------------------------- main
const inFile = process.argv[2] ?? "public/regions.geo.json";
const outFile = process.argv[3] ?? inFile;
const geo = JSON.parse(fs.readFileSync(inFile, "utf8"));
const countries = JSON.parse(fs.readFileSync(new URL("../public/countries.geo.json", import.meta.url), "utf8"));
otherLandmasses = countries.features.map((f) => ({ iso: f.id, feature: f }));
const features = geo.features;
const regionsByParent = new Map();
for (const f of features) {
const p = f.properties.parent;
if (!regionsByParent.has(p)) regionsByParent.set(p, []);
regionsByParent.get(p).push(f);
}
// Region inner-ring (hole) list for the water-hole guard; also the centroids of every
// pre-existing hole (so the hole policy never destroys one, e.g. KZ-KZY's Aral hole).
for (const f of features) {
const parts = f.geometry.type === "MultiPolygon" ? f.geometry.coordinates : [f.geometry.coordinates];
for (const p of parts) for (const h of p.slice(1)) {
if (Array.isArray(h) && h.length >= 4 && ringKm2(h) >= RING_MIN_KM2) {
const poly = polygon([h]);
holeRings.push({ bbox: bbox(poly), poly });
preHoleCentroids.push(centroid(poly).geometry.coordinates);
}
}
}
// Every part already in the input file (string key) — used to skip phantom pieces that
// re-emiss an existing part byte-for-byte.
const existingPartSet = new Set();
for (const f of features) {
const parts = f.geometry.type === "MultiPolygon" ? f.geometry.coordinates : [f.geometry.coordinates];
for (const p of parts) existingPartSet.add(JSON.stringify(p));
}
// All regions with bboxes, for cross-border clipping.
const allRegions = features.map((f) => ({
feature: f,
parent: f.properties.parent,
bbox: bbox(feature(f.geometry)),
}));
console.log(`input: ${inFile}`);
console.log(`regions: ${features.length} countries(with regions): ${regionsByParent.size} region holes: ${holeRings.length}`);
// Per-region running totals for the report.
const added = new Map(); // feature -> { km2, parts }
let totalSliverKm2 = 0, totalWaterKm2 = 0, totalFilledKm2 = 0, totalDupN = 0, totalClippedKm2 = 0, totalClipFailN = 0;
// Pieces already appended this run (any country) — later pieces clip against these so
// appended pieces never overlap each other either.
const appendedSoFar = []; // { parent, bbox, part }
for (const [iso, countryRegions] of regionsByParent) {
const landmass = countries.features.find((c) => c.id === iso);
if (!landmass) continue; // no authoritative landmass → nothing to fill against
const feats = countryRegions.map((r) => feature(r.geometry));
let unionGeom, diffGeom;
try {
// A country with a single sub-region has no union to compute: it IS the union.
unionGeom = countryRegions.length === 1
? countryRegions[0].geometry
: union(featureCollection(feats)).geometry;
diffGeom = difference(featureCollection([landmass, { ...landmass, geometry: unionGeom }])).geometry;
} catch (e) {
console.log(`${iso}\tSKIPPED (${unionGeom ? "difference" : "union"} failed: ${e.message})`);
continue;
}
if (!diffGeom) continue;
const rawPieces = partsOf(diffGeom, iso); // cleaned gap fragments inside the landmass
// Pass 1: filter (sliver / water / duplicate) and clip against foreign territory.
const fillable = [];
let sliverKm2 = 0, waterKm2 = 0, dupN = 0, clippedKm2 = 0, sliverN = 0, waterN = 0, clipFailN = 0;
for (const piece of rawPieces) {
const piecePoly = polygon(piece);
const aKm2 = area(piecePoly) * 1e-6;
if (aKm2 < GAP_MIN_KM2) { sliverKm2 += aKm2; sliverN++; continue; }
const pieceCm = centroid(piecePoly).geometry.coordinates;
if (overlapsAnyHole(piece, pieceCm)) { waterKm2 += aKm2; waterN++; continue; }
if (existingPartSet.has(JSON.stringify(piece))) { dupN++; continue; }
// Clip: remove any part of this piece that ANY existing region (own or foreign
// country) or an already-appended piece claims. Clipped *sequentially* against
// each touching target (more robust than one big union-difference): a target that
// fails to clip is skipped and counted, not allowed to abort the whole piece.
// Clipping against the country's OWN regions as well as foreign ones is what kills
// the same-country overlaps: the gap is `landmass − union(own regions)`, and
// polychip's difference can leave thin slivers of an own region inside that "gap";
// re-differencing each fragment against the individual regions (simpler operands
// than the big union) strips them out. Both operands are built as proper Features
// carrying a real geometry — never `feature()` on an already-Feature object (that
// double-wraps the geometry into the Feature itself and breaks polychip).
const pBBox = partBBox(piece);
const targets = [
...allRegions.filter((r) => bBoxesOverlap(r.bbox, pBBox)).map((r) => ({ feature: r.feature, bbox: r.bbox })),
...appendedSoFar.filter((a) => bBoxesOverlap(a.bbox, pBBox)).map((a) => ({ feature: polygon(a.part), bbox: a.bbox })),
];
if (targets.length === 0) {
fillable.push({ piece, aKm2, cm: pieceCm });
continue;
}
let cur = { type: "Feature", properties: {}, geometry: piecePoly.geometry };
let curBBox = pBBox;
let covered = false;
for (const t of targets) {
if (!bBoxesOverlap(curBBox, t.bbox)) continue;
let d;
try {
d = difference(featureCollection([cur, t.feature]));
} catch {
clipFailN++; // clip against this target failed: keep current (safe fallback)
continue;
}
if (!d || !d.geometry) { covered = true; break; } // piece fully covered by this target
cur = { type: "Feature", properties: {}, geometry: d.geometry };
curBBox = bbox(cur);
}
if (covered || !cur.geometry) { clippedKm2 += aKm2; continue; } // fully covered by foreign territory
const kept = [];
for (const cp of partsOf(cur.geometry, iso)) {
const cpArea = area(polygon(cp)) * 1e-6;
if (cpArea < GAP_MIN_KM2) { sliverKm2 += cpArea; sliverN++; continue; }
if (existingPartSet.has(JSON.stringify(cp))) { dupN++; continue; }
kept.push({ piece: cp, aKm2: cpArea, cm: centroid(polygon(cp)).geometry.coordinates });
}
clippedKm2 += Math.max(0, aKm2 - kept.reduce((s, k) => s + k.aKm2, 0));
fillable.push(...kept);
}
// Pass 2: nearest-region assignment and append.
const regionInfo = countryRegions.map((r) => {
const f = feature(r.geometry);
return { r, cm: centroid(f).geometry.coordinates, areaKm2: area(f) * 1e-6 };
});
let realKm2 = 0;
for (const { piece, aKm2, cm } of fillable) {
// Nearest region by centroid haversine distance; tie → larger area, then lexicographic id.
let best = null;
for (const info of regionInfo) {
const d = distance(cm, info.cm);
if (
best === null ||
d < best.d ||
(d === best.d && (info.areaKm2 > best.areaKm2 || (info.areaKm2 === best.areaKm2 && info.r.id < best.id)))
) best = { info, d };
}
if (!best) continue; // no regions at all (should not happen)
realKm2 += aKm2;
const target = best.info.r;
const parts = (target.geometry.type === "MultiPolygon" ? target.geometry.coordinates : [target.geometry.coordinates]).concat([piece]);
target.geometry = toGeometry(parts);
const a = added.get(target) ?? { km2: 0, parts: 0 };
a.km2 += aKm2; a.parts += 1;
added.set(target, a);
appendedSoFar.push({ parent: iso, bbox: partBBox(piece), part: piece });
}
totalSliverKm2 += sliverKm2;
totalWaterKm2 += waterKm2;
totalFilledKm2 += realKm2;
totalDupN += dupN;
totalClippedKm2 += clippedKm2;
totalClipFailN += clipFailN;
// Verify the fill for countries we actually changed: recompute the residual gap.
let afterKm2 = null;
if (realKm2 > 0) {
try {
const u2 = countryRegions.length === 1
? countryRegions[0].geometry
: union(featureCollection(countryRegions.map((r) => feature(r.geometry)))).geometry;
afterKm2 = area(difference(featureCollection([landmass, { ...landmass, geometry: u2 }]))) * 1e-6;
} catch { afterKm2 = null; }
}
console.log(
`${iso}\tregions=${countryRegions.length}\tgap-before=${(area(diffGeom) * 1e-6).toFixed(0)}` +
(afterKm2 === null ? "" : `\tgap-after=${afterKm2.toFixed(0)}`) +
`\tfilled=${realKm2.toFixed(0)}\tslivers=${sliverN}(${sliverKm2.toFixed(0)})\twater-skipped=${waterN}(${waterKm2.toFixed(0)})` +
`\tdup-skipped=${dupN}${clippedKm2 > 0 ? `\tforeign-overlap-removed=${clippedKm2.toFixed(0)}` : ""}${clipFailN > 0 ? `\tclip-failed=${clipFailN}` : ""}`,
);
}
const totalAddedKm2 = [...added.values()].reduce((s, a) => s + a.km2, 0);
const totalAddedParts = [...added.values()].reduce((s, a) => s + a.parts, 0);
console.log(`\nfilled ${totalAddedKm2.toFixed(0)} km² into ${added.size} regions (+${totalAddedParts} parts)`);
console.log(
`totals: filled=${totalFilledKm2.toFixed(0)} slivers-ignored=${totalSliverKm2.toFixed(0)} water-kept-open=${totalWaterKm2.toFixed(0)}` +
` duplicate-phantoms-skipped=${totalDupN} foreign-overlap-removed=${totalClippedKm2.toFixed(0)} clip-failed=${totalClipFailN}`,
);
fs.writeFileSync(outFile, JSON.stringify(geo));
console.log(`wrote ${outFile}`);
+252
View File
@@ -0,0 +1,252 @@
#!/usr/bin/env node
/**
* scripts/generate-regions.mjs — dependency-free generator for `public/regions.geo.json`.
*
* Builds the sub-national region choropleth from REAL named administrative
* regions (Natural Earth admin-1: states, provinces, governorates, oblasts, …)
* instead of the old geometric grid the user rejected ("some stupid geometric
* grid" — it looked abstract, not like recognizable territories).
*
* Sources (both GeoJSON):
* (a) the Natural Earth admin-1 file — real, named sub-national boundaries.
* It is read from a NON-committed temp path (default /tmp/ne10m_admin1.geojson,
* override with the NE_ADMIN1 env var) so the repo only stores the derived
* output, not the 40 MB source. Natural Earth is public domain (CC0).
* (b) the committed `public/countries.geo.json` (177 countries) — the
* authoritative ISO_A3 set, the country names, and the whole-country
* geometries used as the fallback for any country with no admin-1 data.
*
* Output contract (UNCHANGED from the old generator, so `WorldMap.tsx`,
* `App.tsx`, `shared/protocol.ts` and `server/map.ts` all keep working —
* ownership is resolved via `properties.parent`, the parent country's ISO_A3):
* - a GeoJSON FeatureCollection
* - each feature: a unique top-level `id`, `properties = { name, parent }`
* (`parent` = the country ISO_A3 = the RegionMap key; `name` = the region's
* human name), and a Polygon/MultiPolygon geometry.
*
* For each country in `countries.geo.json` (in file order, deterministic):
* - if it has admin-1 sub-regions -> emit each as a feature, in the source
* file's order. Region `id` = its ISO 3166-2 code (e.g. `US-CA`, `FR-75`,
* `RU-MOW`) when present, else `<ISO_A3>-<nn>` (1-based index in file
* order). Because ISO 3166-2 codes are not always unique WITHIN a country
* (e.g. all nine of Bosnia's entities report `BA-BIH`), ids are
* disambiguated with a `-2/-3/…` suffix on collision (BA-BIH, BA-BIH-2, …).
* - if it has none (tiny / not covered by admin-1) -> emit ONE whole-country
* region: `id = <ISO_A3>-01`, `name` = the country's name, geometry = the
* country's geometry.
*
* Every coordinate is rounded to 4 decimal places (0.0001° ≈ 11 m). If the
* resulting file exceeds ~8 MB, a light Douglas–Peucker pass (0.05°, escalating
* through a small table if still too big) trims it under the guard while keeping
* shapes recognizable, and the before/after sizes are reported. Features are
* sorted by (parent, id). Fully deterministic: same inputs -> same bytes.
*
* Run: `npm run generate:regions`
*/
import { readFileSync, writeFileSync } from 'node:fs';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
const here = path.dirname(fileURLToPath(import.meta.url));
const root = path.resolve(here, '..');
// --- parameters ----------------------------------------------------------------
const SIZE_GUARD_KB = 8192; // ~8 MB file-size guard (task spec)
const SIZE_TARGET_KB = 6144; // land under ~6 MB once simplified (margin under the guard)
const DP_STEPS = [0.05, 0.1, 0.2, 0.3, 0.5, 0.75, 1.0]; // Douglas–Peucker tolerances (degrees)
const R4 = 4; // base coordinate precision (decimal places, ≈11 m)
// Natural Earth admin-1 source (NON-committed temp file; override with NE_ADMIN1).
const INPUT = process.env.NE_ADMIN1 || '/tmp/ne10m_admin1.geojson';
// --- small geo helpers ---------------------------------------------------------
const rN = (v, N) => Math.round(v * Math.pow(10, N)) / Math.pow(10, N);
/** Round a ring to N decimals, drop consecutive duplicates, and close it. */
function roundRing(ring, N) {
const out = [];
for (const [x, y] of ring) {
const p = [rN(x, N), rN(y, N)];
const last = out[out.length - 1];
if (!last || last[0] !== p[0] || last[1] !== p[1]) out.push(p);
}
// drop a trailing point equal to the first (a redundant close), then re-close
if (
out.length > 1 &&
out[0][0] === out[out.length - 1][0] &&
out[0][1] === out[out.length - 1][1]
)
out.pop();
if (out.length < 3) return out; // degenerate; caller drops it
return [...out, [...out[0]]];
}
/** Perpendicular distance (degrees) from point p to the segment a→b. */
function perpDist(p, a, b) {
const dx = b[0] - a[0];
const dy = b[1] - a[1];
const l2 = dx * dx + dy * dy;
if (l2 === 0) return Math.hypot(p[0] - a[0], p[1] - a[1]);
let t = ((p[0] - a[0]) * dx + (p[1] - a[1]) * dy) / l2;
t = Math.max(0, Math.min(1, t));
return Math.hypot(p[0] - (a[0] + t * dx), p[1] - (a[1] + t * dy));
}
/** Douglas–Peucker simplification of an OPEN point sequence (keeps endpoints). */
function dpOpen(pts, tol) {
if (pts.length < 3) return pts;
let maxD = 0;
let idx = 0;
const a = pts[0];
const b = pts[pts.length - 1];
for (let i = 1; i < pts.length - 1; i++) {
const d = perpDist(pts[i], a, b);
if (d > maxD) {
maxD = d;
idx = i;
}
}
if (maxD > tol) {
const left = dpOpen(pts.slice(0, idx + 1), tol);
const right = dpOpen(pts.slice(idx), tol);
return left.concat(right.slice(1));
}
return [a, b];
}
/** Douglas–Peucker a CLOSED ring (first == last) at tolerance `tol` (0 = skip). */
function dpRing(ring, tol) {
if (tol <= 0 || ring.length < 3) return ring;
let pts = ring;
if (
pts[0][0] === pts[pts.length - 1][0] &&
pts[0][1] === pts[pts.length - 1][1]
)
pts = pts.slice(0, -1);
const simplified = dpOpen(pts, tol);
return [...simplified, [...simplified[0]]];
}
/** Round (and optionally simplify) every ring of a Polygon/MultiPolygon geometry. */
function transformGeom(geom, tol) {
const polys = geom.type === 'Polygon' ? [geom.coordinates] : geom.coordinates;
const out = polys
.map((poly) => poly.map((ring) => roundRing(ring, R4)).map((ring) => (tol > 0 ? dpRing(ring, tol) : ring)))
.filter((poly) => poly.length >= 1 && poly.every((ring) => ring.length >= 3));
if (!out.length) return geom; // nothing survived simplification — keep the rounded original
if (geom.type === 'Polygon') return { type: 'Polygon', coordinates: out[0] };
return { type: 'MultiPolygon', coordinates: out };
}
// --- main ----------------------------------------------------------------------
function main() {
const countries = JSON.parse(readFileSync(path.join(root, 'public', 'countries.geo.json'), 'utf8'));
const admin1 = JSON.parse(readFileSync(INPUT, 'utf8'));
const cset = new Set(countries.features.map((c) => c.id));
// Group admin-1 features by parent ISO_A3 (their `adm0_a3`), in file order,
// keeping only parents that are one of our 177 countries.
const byParent = new Map();
for (const f of admin1.features) {
const p = f.properties.adm0_a3;
if (typeof p === 'string' && cset.has(p)) {
if (!byParent.has(p)) byParent.set(p, []);
byParent.get(p).push(f);
}
}
// Build the base specs (raw geometry + unique id + name + parent) in
// countries.geo.json file order, then per-region source order — deterministic.
const specs = [];
const seenIds = new Set();
const nextId = (base) => {
let id = base;
let k = 1;
while (seenIds.has(id)) {
k += 1;
id = `${base}-${k}`;
}
seenIds.add(id);
return id;
};
let fallbackCount = 0;
const fallbackCountries = [];
for (const c of countries.features) {
const regs = byParent.get(c.id) ?? [];
if (regs.length) {
let nn = 0;
for (const r of regs) {
nn += 1;
const iso = r.properties.iso_3166_2;
const base = typeof iso === 'string' && iso ? iso : `${c.id}-${String(nn).padStart(2, '0')}`;
const name = typeof r.properties.name === 'string' && r.properties.name ? r.properties.name : c.properties.name;
specs.push({ id: nextId(base), name, parent: c.id, geom: r.geometry });
}
} else {
fallbackCount += 1;
fallbackCountries.push(c.id);
specs.push({ id: nextId(`${c.id}-01`), name: c.properties.name, parent: c.id, geom: c.geometry });
}
}
const sortById = (a, b) => (a.properties.parent !== b.properties.parent ? (a.properties.parent < b.properties.parent ? -1 : 1) : a.id.localeCompare(b.id, 'en', { numeric: true }));
const build = (tol) => {
const fc = {
type: 'FeatureCollection',
features: specs.map((s) => ({
type: 'Feature',
id: s.id,
properties: { name: s.name, parent: s.parent },
geometry: transformGeom(s.geom, tol),
})),
};
fc.features.sort(sortById);
return fc;
};
// Base: 4 decimal places, no simplification.
let fc = build(0);
let json = JSON.stringify(fc);
let sizeKB = Buffer.byteLength(json) / 1024;
console.log(`base (4dp, no DP): ${sizeKB.toFixed(1)} KB (${fc.features.length} features)`);
// File-size guard: if the base is over the guard, simplify until it is under
// the target (or we exhaust the tolerance table).
let usedTol = 0;
if (sizeKB > SIZE_GUARD_KB) {
for (const t of DP_STEPS) {
fc = build(t);
json = JSON.stringify(fc);
sizeKB = Buffer.byteLength(json) / 1024;
usedTol = t;
console.log(`DP ${t}: ${sizeKB.toFixed(1)} KB`);
if (sizeKB < SIZE_TARGET_KB) break;
}
}
writeFileSync(path.join(root, 'public', 'regions.geo.json'), json + '\n');
// --- summary ----------------------------------------------------------------
const counts = new Map();
for (const f of fc.features) counts.set(f.properties.parent, (counts.get(f.properties.parent) ?? 0) + 1);
const sortedCounts = [...counts.values()].sort((a, b) => a - b);
const median =
sortedCounts.length % 2
? sortedCounts[Math.floor(sortedCounts.length / 2)]
: (sortedCounts[sortedCounts.length / 2 - 1] + sortedCounts[sortedCounts.length / 2]) / 2;
const maxCountry = [...counts.entries()].sort((a, b) => b[1] - a[1])[0];
const maxCountryName = countries.features.find((c) => c.id === maxCountry[0])?.properties.name ?? '';
const finalKB = Buffer.byteLength(json) / 1024;
console.log(`\nwrote public/regions.geo.json — ${finalKB.toFixed(1)} KB (${(finalKB / 1024).toFixed(2)} MB)`);
console.log(`features: ${fc.features.length} total across ${counts.size} of ${countries.features.length} countries`);
console.log(`per-country count: min ${sortedCounts[0]} / median ${median} / max ${sortedCounts[sortedCounts.length - 1]}`);
console.log(`max-count country: ${maxCountry[0]} (${maxCountryName}) with ${maxCountry[1]}`);
if (usedTol) console.log(`simplification: Douglas–Peucker @ ${usedTol}° (base was ${SIZE_GUARD_KB}+ KB)`);
console.log(`whole-country fallback: ${fallbackCount} ${fallbackCount ? `(${fallbackCountries.join(', ')})` : '(none)'}`);
}
main();
+570
View File
@@ -0,0 +1,570 @@
/**
* scripts/regions.test.ts — validation for the committed `public/regions.geo.json`.
*
* The dataset is REAL named sub-national administrative regions (Natural
* Earth admin-1: states, provinces, governorates, oblasts, …) that the
* coarsening step (`scripts/coarsen-regions.mjs`, v0.14) has merged down to a
* ~100×100 km (10,000 km²) floor: every small non-island region was dissolved
* into its nearest same-country neighbor, so the only regions left below the
* floor are islands (no same-country sibling nearby). One feature per named
* region, each carrying `properties = { name, parent }` where `parent` is the
* country's ISO_A3 (the RegionMap key the map resolves ownership through).
* Tiny or uncovered countries collapse to a single whole-country region
* (`<ISO_A3>-01`).
*
* v0.17 (`scripts/fill-gaps.mjs`) additionally fills the no-one's-land left
* between merged sub-regions: per country, the uncovered slivers of the
* country's landmass (≥ 25 km²) were added as extra parts of the nearest
* region, so the regions now cover the landmass almost completely (the
* sampling test below measures that per country).
*
* This test is self-contained (no import of the generator) and deliberately
* dependency-free — it re-implements the same planar area model the
* generator/analysis use, so the area-based assertions measure the same
* quantity:
*
* x = lon · 111.32 · cos(midLat), y = lat · 110.574 (km)
*
* with a shoelace per OUTER ring, each ring measured at its own mean latitude.
* Outer rings only — a region's inner rings (holes) are lakes and are ignored
* by design, the same way the coverage band already absorbed them.
*
* No geojson/@turf types are imported: the project keeps `@types/geojson`
* OUT of the tsc program (see tsconfig `types`) so maplibre-gl's d.ts stays
* in its loose (skipLibCheck) mode; the one coverage test below uses an
* inline even-odd ray cast instead of a geometry library.
*
* It reads each file exactly once and runs in O(total vertices).
*/
import { readFileSync } from 'node:fs';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { describe, expect, it } from 'vitest';
const here = path.dirname(fileURLToPath(import.meta.url));
const root = path.resolve(here, '..');
// --- area model (planar approximation; matches scripts/generate-regions.mjs) --
const KM_LON = 111.32;
const KM_LAT = 110.574;
const rad = (deg: number) => (deg * Math.PI) / 180;
type Ring = [number, number][];
type Geometry =
| { type: 'Polygon'; coordinates: Ring[] }
| { type: 'MultiPolygon'; coordinates: Ring[][] };
function ringAreaKm2(ring: Ring, midLat: number): number {
const kx = KM_LON * Math.cos(rad(midLat));
let a = 0;
const n = ring.length;
for (let i = 0; i < n; i++) {
const [lon1, lat1] = ring[i];
const [lon2, lat2] = ring[(i + 1) % n];
a += lon1 * kx * (lat2 * KM_LAT) - lon2 * kx * (lat1 * KM_LAT);
}
return Math.abs(a / 2);
}
function outerRings(geom: Geometry): Ring[] {
if (geom.type === 'Polygon') return [geom.coordinates[0]];
if (geom.type === 'MultiPolygon') return geom.coordinates.map((p) => p[0]);
return [];
}
/** Sum of a feature's outer-ring areas, each ring at its own mean latitude. */
function featureAreaKm2(geom: Geometry): number {
let total = 0;
for (const ring of outerRings(geom)) {
let lat = 0;
for (const [, la] of ring) lat += la;
total += ringAreaKm2(ring, ring.length ? lat / ring.length : 0);
}
return total;
}
function median(nums: number[]): number {
if (!nums.length) return 0;
const s = [...nums].sort((a, b) => a - b);
const m = Math.floor(s.length / 2);
return s.length % 2 ? s[m] : (s[m - 1] + s[m]) / 2;
}
/** Raw min/max bbox [w, s, e, n] of a geometry (all coordinates). */
function rawBBox(geom: Geometry): [number, number, number, number] {
const polys = geom.type === 'Polygon' ? [geom.coordinates] : geom.coordinates;
let w = Infinity, s = Infinity, e = -Infinity, n = -Infinity;
for (const poly of polys)
for (const ring of poly)
for (const [lo, la] of ring) {
if (lo < w) w = lo;
if (lo > e) e = lo;
if (la < s) s = la;
if (la > n) n = la;
}
return [w, s, e, n];
}
/**
* Even-odd ray cast: is `[lon, lat]` inside `ring`? Planar, in raw lon/lat
* space (no antimeridian handling — the polygons and the sample points live
* in the same unwrapped space, so containment is mathematically consistent
* even for countries that cross the date line). Used only as a fast,
* deterministic coverage proxy (see the sampling test), never for areas.
*/
function pointInRing(pt: [number, number], ring: Ring): boolean {
const [x, y] = pt;
let inside = false;
for (let i = 0, j = ring.length - 1; i < ring.length; j = i++) {
const [xi, yi] = ring[i];
const [xj, yj] = ring[j];
if (yi > y !== yj > y && x < ((xj - xi) * (y - yi)) / (yj - yi) + xi) inside = !inside;
}
return inside;
}
/** Is a point inside a (Multi)Polygon: inside the outer ring, outside all holes. */
function pointInGeom(pt: [number, number], geom: Geometry): boolean {
if (geom.type === 'Polygon') {
if (!pointInRing(pt, geom.coordinates[0])) return false;
return geom.coordinates.slice(1).every((h) => !pointInRing(pt, h));
}
if (geom.type === 'MultiPolygon')
return geom.coordinates.some((p) => pointInGeom(pt, { type: 'Polygon', coordinates: p }));
return false;
}
// ------------------------------------------------------------------------------
interface RegionFeature {
type: 'Feature';
id: string;
properties: { name: string; parent: string };
geometry: Geometry;
}
interface CountryFeature {
type: 'Feature';
id: string;
properties: { name: string };
geometry: Geometry;
}
// Read each file exactly once.
const regions = JSON.parse(
readFileSync(path.join(root, 'public', 'regions.geo.json'), 'utf8'),
) as { type: 'FeatureCollection'; features: RegionFeature[] };
const countries = JSON.parse(
readFileSync(path.join(root, 'public', 'countries.geo.json'), 'utf8'),
) as { type: 'FeatureCollection'; features: CountryFeature[] };
// Precompute once (O(total vertices)).
const countryIds = new Set(countries.features.map((c) => c.id));
const countryArea = new Map<string, number>();
for (const c of countries.features) countryArea.set(c.id, featureAreaKm2(c.geometry));
const regionArea = new Map<string, number>();
for (const f of regions.features) regionArea.set(f.id, featureAreaKm2(f.geometry));
const sumByParent = new Map<string, number>();
for (const f of regions.features)
sumByParent.set(f.properties.parent, (sumByParent.get(f.properties.parent) ?? 0) + (regionArea.get(f.id) ?? 0));
const countByParent = new Map<string, number>();
for (const f of regions.features)
countByParent.set(f.properties.parent, (countByParent.get(f.properties.parent) ?? 0) + 1);
// Raw bboxes for the sampling test's cheap reject (O(total vertices)).
const regionBB = new Map<string, [number, number, number, number]>();
for (const f of regions.features) regionBB.set(f.id, rawBBox(f.geometry));
// --- island/close-neighbor helpers (mirror scripts/coarsen-regions.mjs) ------
interface LonInt {
a: number;
b: number;
full: boolean;
}
interface RegionBBox {
latMin: number;
latMax: number;
lon: LonInt;
}
const COARSE_FLOOR_KM2 = 10_000; // the coarsener's ~100×100 km floor
const CLOSE_DEG = 0.2; // "spatially close" bbox gap (both lat and lon ≤ this)
/**
* Unwrap a ring's longitudes to a continuous line (np.unwrap shortest-diff
* scheme, anchored at the first vertex's [0,360) value). `full` when the
* unwrapped span is ≥ 300° (a full-360° antimeridian band, e.g. Antarctica).
* Must stay in sync with the coarsening script.
*/
function unwrapRing(ring: Ring) {
const n = ring.length;
const norm = (x: number) => ((x % 360) + 360) % 360;
const u: number[] = new Array(n);
u[0] = norm(ring[0][0]);
for (let i = 1; i < n; i++) {
// the previous UNWRAPPED value may lie outside [0,360); normalize it
// before measuring the shortest signed difference, or a bogus ~180° jump
// is inserted and the ring's span balloons.
const a = norm(u[i - 1]);
const b = norm(ring[i][0]);
const d = (((b - a) % 360) + 540) % 360 - 180;
u[i] = u[i - 1] + d;
}
let min = Infinity;
let max = -Infinity;
for (const v of u) {
if (v < min) min = v;
if (v > max) max = v;
}
return { lons: u, full: max - min >= 300 };
}
/**
* Cyclic 1-D gap (degrees) between two tight longitude intervals in their own
* unwrapped spaces; a `full` interval is close to everything.
*/
function lonGap(intA: LonInt, intB: LonInt): number {
if (intA.full || intB.full) return 0;
let best = Infinity;
for (const k of [-1, 0, 1]) {
const a2 = intB.a + 360 * k;
const b2 = intB.b + 360 * k;
const gap = intA.b < a2 ? a2 - intA.b : b2 < intA.a ? intA.a - b2 : 0;
if (gap < best) best = gap;
}
return best;
}
// Per-region bbox in antimeridian-safe unwrapped longitude space.
const regionBBox = new Map<string, RegionBBox>();
for (const f of regions.features) {
const polys = f.geometry.type === 'Polygon' ? [f.geometry.coordinates] : f.geometry.coordinates;
let latMin = Infinity;
let latMax = -Infinity;
let a = Infinity;
let b = -Infinity;
let full = false;
for (const poly of polys) {
const outer = poly[0];
for (const [, la] of outer) {
if (la < latMin) latMin = la;
if (la > latMax) latMax = la;
}
const { lons, full: fl } = unwrapRing(outer);
if (fl) full = true;
for (const v of lons) {
if (v < a) a = v;
if (v > b) b = v;
}
}
regionBBox.set(f.id, { latMin, latMax, lon: { a, b, full } });
}
/** Bounding-box closeness (same definition the coarsening script uses). */
function bboxesClose(x: RegionBBox, y: RegionBBox): boolean {
const latGap = x.latMax < y.latMin ? y.latMin - x.latMax : y.latMax < x.latMin ? x.latMin - y.latMax : 0;
if (latGap > CLOSE_DEG) return false;
return lonGap(x.lon, y.lon) <= CLOSE_DEG;
}
describe('regions.geo.json', () => {
it('is a valid GeoJSON FeatureCollection of well-formed features', () => {
expect(regions.type).toBe('FeatureCollection');
expect(Array.isArray(regions.features)).toBe(true);
expect(regions.features.length).toBeGreaterThan(0);
for (const f of regions.features) {
expect(f.type, `${f.id ?? '?'}: not a Feature`).toBe('Feature');
expect(typeof f.id, `${f.id ?? '?'}: id must be a string`).toBe('string');
expect(f.id.length, `${f.id ?? '?'}: empty id`).toBeGreaterThan(0);
expect(typeof f.properties?.name, `${f.id}: missing name`).toBe('string');
expect(f.properties.name.length, `${f.id}: empty name`).toBeGreaterThan(0);
expect(typeof f.properties.parent, `${f.id}: missing parent`).toBe('string');
expect(countryIds.has(f.properties.parent), `${f.id}: unknown parent ${f.properties.parent}`).toBe(true);
const g = f.geometry;
expect(
!!g && (g.type === 'Polygon' || g.type === 'MultiPolygon'),
`${f.id}: bad geometry type ${g?.type}`,
).toBe(true);
if (g) {
const polys = g.type === 'Polygon' ? [g.coordinates] : g.coordinates;
for (const poly of polys)
for (const ring of poly)
expect(ring.length, `${f.id}: ring with ${ring.length} pts`).toBeGreaterThanOrEqual(3);
}
}
});
it('has globally unique feature ids (ISO 3166-2 disambiguated on within-country collision)', () => {
const seen = new Set<string>();
const dups = new Set<string>();
for (const f of regions.features) {
if (seen.has(f.id)) dups.add(f.id);
seen.add(f.id);
}
expect(
dups.size,
`duplicate ids: ${[...dups].slice(0, 10).join(', ')}`,
).toBe(0);
expect(seen.size).toBe(regions.features.length);
});
it('covers every one of the 177 countries with at least one region', () => {
const counts = countries.features.map((c) => countByParent.get(c.id) ?? 0);
for (const c of countries.features) {
expect(countByParent.get(c.id) ?? 0, `country ${c.id} has no regions`).toBeGreaterThanOrEqual(1);
}
const min = Math.min(...counts);
const max = Math.max(...counts);
const med = median(counts);
const maxCountry = [...countByParent.entries()].sort((a, b) => b[1] - a[1])[0];
const maxCountryName = countries.features.find((c) => c.id === maxCountry[0])?.properties.name ?? '';
console.log(
`\n per-country region count: min ${min} / median ${med} / max ${max}` +
` (max: ${maxCountry[0]} ${maxCountryName} with ${maxCountry[1]})`,
);
});
it('has sane region areas: median >= 100 km2, and no non-Antarctica region >= 5,000,000 km2', () => {
const areas = regions.features.map((f) => regionArea.get(f.id) ?? 0);
const med = median(areas);
const maxRegion = regions.features.reduce((m, f) => ((regionArea.get(f.id) ?? 0) > (regionArea.get(m.id) ?? 0) ? f : m));
const minRegion = regions.features.reduce((m, f) => ((regionArea.get(f.id) ?? 0) < (regionArea.get(m.id) ?? 0) ? f : m));
const tiny = areas.filter((a) => a < 1).length;
// Antarctica (ATA) is a full-360° wrap ring, so the planar model can't
// measure it (it reports ~21.8M km2 for a ~14M km2 landmass) — exempt it.
for (const f of regions.features) {
if (f.properties.parent === 'ATA') continue;
const a = regionArea.get(f.id) ?? 0;
expect(a < 5_000_000, `${f.id}: area ${Math.round(a).toLocaleString('en-US')} km2 is absurdly large`).toBe(true);
}
expect(med, `median region area ${med.toFixed(1)} km2 is too small`).toBeGreaterThanOrEqual(100);
console.log(
`\n region area: min ${minRegion.id} (${minRegion.properties.name}) ≈ ${(regionArea.get(minRegion.id) ?? 0).toExponential(2)} km2` +
` / median ${med.toLocaleString('en-US')} km2` +
` / max ${maxRegion.id} (${maxRegion.properties.name}) ≈ ${Math.round(regionArea.get(maxRegion.id) ?? 0).toLocaleString('en-US')} km2` +
` — ${tiny} regions < 1 km2 (legit micro-regions: tiny islands, small urban districts, degenerate disputed enclaves)`,
);
});
it('leaves only islands below the ~10,000 km2 coarsening floor (non-island small regions merged)', () => {
// v0.14 coarsening: every region smaller than the floor that has a
// same-country sibling within CLOSE_DEG of its bbox is dissolved into its
// nearest such neighbor, so a below-floor region may only survive if it
// is an island. Count the non-island residuals below the floor and allow
// a small tolerance band (strictly < 1% of all regions) — the coarsener's
// fixed point leaves none, and this catches a regression in the merge
// logic (e.g. a broken neighbor test that exempts land regions) without
// being brittle to one or two borderline cases.
const smallNonIslands: string[] = [];
let smallIslands = 0;
let smallTotal = 0;
for (const f of regions.features) {
const a = regionArea.get(f.id) ?? 0;
if (a >= COARSE_FLOOR_KM2) continue;
smallTotal++;
const bb = regionBBox.get(f.id)!;
let hasNeighbor = false;
for (const g of regions.features) {
if (g.id === f.id || g.properties.parent !== f.properties.parent) continue;
if (bboxesClose(bb, regionBBox.get(g.id)!)) {
hasNeighbor = true;
break;
}
}
if (hasNeighbor) {
smallNonIslands.push(`${f.id} (${Math.round(a)} km2)`);
} else smallIslands++;
}
const frac = regions.features.length ? smallNonIslands.length / regions.features.length : 0;
expect(
frac < 0.01,
`${smallNonIslands.length} non-island region(s) below the ${COARSE_FLOOR_KM2} km2 floor ` +
`(${(100 * frac).toFixed(2)}% of all regions): ${smallNonIslands.slice(0, 10).join(', ')}`,
).toBe(true);
console.log(
`\n below-floor regions: ${smallTotal} — ${smallIslands} islands (exempt, no same-country neighbor within ${CLOSE_DEG}°)` +
` / ${smallNonIslands.length} non-island residuals (must stay < 1% of all regions)`,
);
});
it('leaves exactly one enclosed hole: KZ-KZY (the real Aral Sea), still large', () => {
// v0.15 filled every small hole; v0.16 smoothing never touches holes; and
// v0.17's gap-filler explicitly keeps the Aral hole (its centroid matches a
// pre-existing hole and it lies inside another country's landmass) while
// dropping phantom holes. So the whole file must contain exactly one hole,
// on KZ-KZY, at a realistic size (~5,860 km2 planar; the real Aral has
// shrunk to roughly this by the 2020s) — no new holes of any size.
let holes = 0;
let maxHole = 0;
const holeIds: string[] = [];
let kzkzyHoleArea = 0;
for (const f of regions.features) {
const polys = f.geometry.type === 'Polygon' ? [f.geometry.coordinates] : f.geometry.coordinates;
for (const poly of polys) {
for (let i = 1; i < poly.length; i++) {
holes++;
let lat = 0;
for (const [, la] of poly[i]) lat += la;
const area = ringAreaKm2(poly[i], poly[i].length ? lat / poly[i].length : 0);
if (area > maxHole) maxHole = area;
holeIds.push(f.id);
if (f.id === 'KZ-KZY') kzkzyHoleArea = area;
}
}
}
expect(holes, `expected exactly 1 hole (KZ-KZY), found ${holes}: ${[...new Set(holeIds)].join(', ')}`).toBe(1);
expect(holeIds, 'the one remaining hole is KZ-KZY').toEqual(['KZ-KZY']);
expect(
kzkzyHoleArea >= 5_000 && kzkzyHoleArea <= 7_000,
`KZ-KZY hole is ${Math.round(kzkzyHoleArea).toLocaleString('en-US')} km2 — outside the 5,000–7,000 km2 Aral band`,
).toBe(true);
console.log(
`\n holes: exactly 1 (KZ-KZY ≈ ${Math.round(kzkzyHoleArea).toLocaleString('en-US')} km2) — the Aral hole survived v0.17's fill`,
);
});
it('sums to within [40%, 190%] of each country area (median in [70%, 130%])', () => {
// The band is a planar-approximation sanity check. It is wider than a naive
// [40%, 110%] because Natural Earth's admin-1 polygons are digitized
// independently of the admin-0 country polygons (they are NOT clipped to
// them). v0.17's gap fill removed the large UNDER-fills (the old minimum
// was Brunei at ~52% — its regions now cover the landmass, ≈ 79%), but
// the OVER-fill tail is a pre-existing admin-1 artifact: a few tiny island
// nations (Vanuatu 178.9%, Solomon Is. 133%, Bahamas 129%) have admin-1
// polygons that extend beyond their own country polygon, and the fill
// only added area *inside* the country, so it can't shrink that tail.
// The band brackets the measured [78.8%, 178.9%] with margin while still
// catching a genuinely missing or doubled-up region.
const ratios: number[] = [];
let minRatio = Infinity;
let maxRatio = -Infinity;
let minId = '';
let maxId = '';
for (const c of countries.features) {
const ca = countryArea.get(c.id) ?? 0;
if (ca <= 0) continue;
const ratio = (sumByParent.get(c.id) ?? 0) / ca;
ratios.push(ratio);
if (ratio < minRatio) { minRatio = ratio; minId = c.id; }
if (ratio > maxRatio) { maxRatio = ratio; maxId = c.id; }
expect(
ratio >= 0.4 && ratio <= 1.9,
`${c.id}: coverage ${(100 * ratio).toFixed(1)}% is outside [40%, 190%]`,
).toBe(true);
}
const medRatio = median(ratios);
expect(
medRatio >= 0.7 && medRatio <= 1.3,
`median coverage ${(100 * medRatio).toFixed(1)}% is outside [70%, 130%]`,
).toBe(true);
console.log(
`\n coverage range: min ${minId} ${(100 * minRatio).toFixed(1)}%` +
` / median ${(100 * medRatio).toFixed(1)}%` +
` / max ${maxId} ${(100 * maxRatio).toFixed(1)}% (band 40–190%)`,
);
});
it('covers each country\'s landmass with no significant no-one\'s-land (v0.17 gap fill, grid-sampled)', () => {
// The v0.17 fill (scripts/fill-gaps.mjs) assigned every uncovered sliver of
// each country's landmass (≥ 25 km²) to its nearest region, so the residual
// no-one's-land per country should be small everywhere. Measuring the
// exact union is too slow, so this samples a 25×25 grid over each
// country's raw bbox (skipping points outside the country polygon) and
// counts the fraction of in-land sample points that fall in NONE of the
// country's regions — a fast, deterministic proxy (same planar space,
// inline even-odd ray cast; antimeridian-safe because points and polygons
// share the raw coordinate space). Sampling over-counts coastline
// mismatch (admin-0 vs admin-1 edges), so the thresholds are generous:
// they catch a real regression (a whole sliver left unfilled) without
// being brittle to digitization fuzz.
const N = 25;
const results: { id: string; name: string; frac: number; land: number }[] = [];
for (const c of countries.features) {
const [w, s, e, n] = rawBBox(c.geometry);
if (e - w < 0.01 || n - s < 0.01) continue; // degenerate (point-like) country
const regs = regions.features.filter((f) => f.properties.parent === c.id);
let land = 0;
let uncov = 0;
for (let i = 0; i < N; i++) {
const la = s + ((i + 0.5) / N) * (n - s);
for (let j = 0; j < N; j++) {
const lo = w + ((j + 0.5) / N) * (e - w);
const pt: [number, number] = [lo, la];
if (!pointInGeom(pt, c.geometry)) continue;
land++;
// cheap bbox reject first, then the full containment test
if (!regs.some((f) => {
const [rw, rs, re, rn] = regionBB.get(f.id)!;
if (lo < rw || lo > re || la < rs || la > rn) return false;
return pointInGeom(pt, f.geometry);
}))
uncov++;
}
}
if (land >= 4) results.push({ id: c.id, name: c.properties.name, frac: uncov / land, land });
}
expect(results.length, `only ${results.length} countries sampled (expected ~176)`).toBeGreaterThanOrEqual(150);
const fracs = results.map((r) => r.frac).sort((a, b) => a - b);
const med = median(fracs);
const p90 = fracs[Math.floor(fracs.length * 0.9)];
const worst = results.reduce((m, r) => (r.frac > m.frac ? r : m));
const over20 = results.filter((r) => r.frac > 0.2).sort((a, b) => b.frac - a.frac);
expect(
med <= 0.05,
`median country gap ${(100 * med).toFixed(1)}% > 5% — significant no-one's-land remains`,
).toBe(true);
expect(
p90 <= 0.15,
`p90 country gap ${(100 * p90).toFixed(1)}% > 15% — many countries have real gaps`,
).toBe(true);
expect(
worst.frac <= 0.4,
`worst country ${worst.id} (${worst.name}) gap ${(100 * worst.frac).toFixed(1)}% > 40%`,
).toBe(true);
expect(
over20.length <= 3,
`${over20.length} countries with > 20% gap: ${over20.map((r) => `${r.id} ${(100 * r.frac).toFixed(1)}%`).join(', ')}`,
).toBe(true);
console.log(
`\n no-one's-land (grid-sampled, N=${N}): median ${(100 * med).toFixed(1)}% / p90 ${(100 * p90).toFixed(1)}%` +
` / max ${worst.id} (${worst.name}) ${(100 * worst.frac).toFixed(1)}%` +
(over20.length ? ` — >20%: ${over20.map((r) => `${r.id} ${(100 * r.frac).toFixed(1)}%`).join(', ')}` : ' — no country > 20%'),
);
});
it('is at the v0.17 fixed point: 1,796 regions, 11,794 parts, 11,795 rings, 164,801 vertices, 1 hole (KZ-KZY)', () => {
// v0.17 (scripts/fill-gaps.mjs) APPENDED cleaned gap pieces to the v0.16
// fixed point: it never moves an existing border, merges a part, or
// removes a ring — it only adds new parts (+6,768: 5,026 → 11,794) and
// keeps the single KZ-KZY hole. The region count (1,796), the
// per-feature ids/names/parents and their order are unchanged; only the
// part/ring/vertex totals and the hole's part structure moved. Pinning
// the signature guards against a non-idempotent or destructive re-run.
// The fill is byte-deterministic per input and idempotent (a second run
// on the filled file changes nothing).
const polysOf = (g: Geometry) => (g.type === 'Polygon' ? [g.coordinates] : g.coordinates);
let verts = 0,
rings = 0,
parts = 0,
holes = 0;
const holeIds: string[] = [];
for (const f of regions.features) {
const polys = polysOf(f.geometry);
parts += polys.length;
for (const poly of polys) {
rings += poly.length;
holes += Math.max(0, poly.length - 1);
if (poly.length > 1) holeIds.push(f.id);
for (const ring of poly) verts += ring.length;
}
}
expect(regions.features.length, 'region count').toBe(1796); // unchanged by the fill
expect(parts, 'parts').toBe(11_794); // v0.16: 5,026 → +6,768 appended gap pieces
expect(rings, 'rings').toBe(11_795); // every appended part is a single-ring polygon (+1 hole = KZ-KZY, pre-existing)
expect(holes, 'holes').toBe(1); // the single KZ-KZY hole, unchanged
expect(holeIds, 'the one remaining hole is KZ-KZY').toEqual(['KZ-KZY']);
expect(verts, 'total vertices (incl. ring closure)').toBe(164_801); // v0.16: 111,175
console.log(
`\n v0.17 gap fill: ${regions.features.length} regions, ${parts} parts, ${rings} rings, ` +
`${holes} hole (KZ-KZY), ${verts} vertices — v0.16 topology preserved, 6,768 gap pieces appended`,
);
});
});
+180
View File
@@ -0,0 +1,180 @@
#!/usr/bin/env node
/**
* scripts/smooth-regions.mjs — smooths jagged sub-national region boundaries.
*
* Run: npm run smooth:regions (in place on public/regions.geo.json)
* node scripts/smooth-regions.mjs [out] [src]
*
* The v0.14 coarsening (boolean dissolve) and Natural Earth's 1:10m digitization
* left some sub-national boundaries overly jagged — the worst being coastal /
* borderland regions that the dissolve split into many small, zig-zag fragments
* (e.g. SI-048 Kocevje, Slovenia, 57 parts; MK-36 Kavadartsi, N. Macedonia, 8
* parts). This cleans the jaggedness in place with **Douglas–Peucker
* vertex-thinning** (`@turf/simplify`), applied to every ring of every polygon.
*
* DOUGLAS–PEUCKER — `@turf/simplify` keeps a vertex only when it deviates from
* the chord joining its kept neighbours by more than the tolerance, removing
* the redundant "in-between" points of a shallow zig-zag. The tolerance is
* expressed in the GeoJSON degree space (its distance metric treats 1° lon
* == 1° lat); TOLERANCE_M (metres) is converted with the same ~111 km/° the
* area model uses, so TOLERANCE_M = 50 is a gentle ~50 m pass. Bump it to
* 100 / 200 for a stronger pass and re-run — the pass is idempotent either way.
*
* VERTEX-THINNING ONLY — DP only removes points. It never moves a border,
* never merges/dissolves regions or parts, and never creates or removes a
* ring, so topology is preserved exactly: the region count, every `id`,
* `properties.name`/`properties.parent`, the part count of every feature, the
* single real hole (KZ-KZY), and all 83 islands are all unchanged. Only the
* redundant vertices along each ring are dropped.
*
* Deterministic + idempotent: one @turf/simplify pass at a fixed tolerance, then
* 4-dp rounding (the same convention as the other scripts). Because the output
* is already at the tolerance's fixed point, re-running on the smoothed file
* yields a byte-identical file (sha256-verified). The 18 degenerate 3-point
* micro-rings (the ~0-area "dots" like Ragged Island / the Paracels) are kept
* verbatim — @turf/simplify requires ≥4 points and would otherwise throw — so
* no ring is ever dropped and every feature keeps its exact part/ring count.
*/
import { readFileSync, writeFileSync } from 'node:fs';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { simplify } from '@turf/simplify';
const here = path.dirname(fileURLToPath(import.meta.url));
const root = path.resolve(here, '..');
const DEFAULT_FILE = path.join(root, 'public', 'regions.geo.json');
const args = process.argv.slice(2).filter((a) => !a.startsWith('-'));
const OUT = args[0] ? path.resolve(args[0]) : DEFAULT_FILE;
const SRC = args[1] ? path.resolve(args[1]) : DEFAULT_FILE;
// --- parameters ---------------------------------------------------------------
const TOLERANCE_M = 50; // DP tolerance in metres — ~50 m is gentle (bump to 100/200 for more)
const M_PER_DEG = 111_000; // ~111 km per degree (same scale as the area model's 111.32/110.574)
const TOL_DEG = TOLERANCE_M / M_PER_DEG; // @turf/simplify works in degree space → ≈ 0.00045°
const R4 = 4; // coordinate precision (decimal places) — same as the other scripts
// --- rounding / normalization (same conventions as the other scripts) ----------
const rN = (v, N) => Math.round(v * 10 ** N) / 10 ** N;
function roundRing(ring, N = R4) {
const out = [];
for (const [x, y] of ring) {
const p = [rN(x, N), rN(y, N)];
const last = out[out.length - 1];
if (!last || last[0] !== p[0] || last[1] !== p[1]) out.push(p);
}
if (out.length > 1 && out[0][0] === out[out.length - 1][0] && out[0][1] === out[out.length - 1][1]) out.pop();
if (out.length < 3) return ring; // degenerate — keep verbatim, never corrupt a ring
return [...out, [...out[0]]];
}
// --- tiny geometry helpers -----------------------------------------------------
const polysOf = (g) => (g.type === 'Polygon' ? [g.coordinates] : g.coordinates);
const ringsOf = (g) => polysOf(g).flatMap((p) => p);
const countVerts = (g) => ringsOf(g).reduce((s, r) => s + r.length, 0);
const countParts = (g) => (g.type === 'Polygon' ? 1 : g.coordinates.length);
const countRings = (g) => ringsOf(g).length;
const countHoles = (g) => polysOf(g).reduce((s, p) => s + Math.max(0, p.length - 1), 0);
/**
* Smooth one closed ring with a single @turf/simplify (Douglas–Peucker) pass.
* Only removes vertices — never adds, never drops the ring. Degenerate rings
* (<4 pts) are returned verbatim (simplify would throw); a ring DP would
* over-collapse below a valid 4-pt ring is kept as-is; any error keeps the
* original. Never throws.
*/
function smoothRing(ring) {
if (!Array.isArray(ring) || ring.length < 4) return ring; // keep degenerate verbatim
try {
const feat = { type: 'Feature', geometry: { type: 'Polygon', coordinates: [ring] } };
const next = simplify(feat, { tolerance: TOL_DEG }).geometry.coordinates[0];
if (!Array.isArray(next) || next.length < 4) return ring; // over-collapsed — keep original
const closed =
next[next.length - 1][0] === next[0][0] && next[next.length - 1][1] === next[0][1]
? next
: [...next, [next[0][0], next[0][1]]];
const rounded = roundRing(closed);
return rounded.length >= 4 ? rounded : ring;
} catch {
return ring;
}
}
/** Smooth every ring of a geometry. Never drops a ring or a part. */
function smoothGeom(geom) {
const newPolys = polysOf(geom).map((poly) => poly.map(smoothRing));
if (geom.type === 'Polygon' && newPolys.length === 1) return { type: 'Polygon', coordinates: newPolys[0] };
return { type: 'MultiPolygon', coordinates: newPolys };
}
// --- main ----------------------------------------------------------------------
function main() {
const t0 = Date.now();
const rawIn = readFileSync(SRC);
const fc = JSON.parse(rawIn);
const inBytes = Buffer.byteLength(rawIn);
console.log(`input: ${fc.features.length} regions (${(inBytes / 1024).toFixed(0)} KB) from ${SRC}`);
console.log(`mode: Douglas–Peucker via @turf/simplify, tolerance ${TOLERANCE_M} m (≈ ${TOL_DEG}°)`);
// before stats
let vb = 0, hb = 0, pb = 0, rb = 0, degenerate = 0;
for (const f of fc.features) {
vb += countVerts(f.geometry);
hb += countHoles(f.geometry);
pb += countParts(f.geometry);
rb += countRings(f.geometry);
for (const r of ringsOf(f.geometry)) if (r.length < 4) degenerate++;
}
const outFeatures = fc.features.map((f) => {
const g = smoothGeom(f.geometry);
return { type: 'Feature', id: f.id, properties: { name: f.properties.name, parent: f.properties.parent }, geometry: g };
});
const out = { type: 'FeatureCollection', features: outFeatures };
// after stats + change count (compare against the original, in order)
let va = 0, ha = 0, pa = 0, ra = 0, changed = 0;
for (let i = 0; i < out.features.length; i++) {
const f = out.features[i];
va += countVerts(f.geometry);
ha += countHoles(f.geometry);
pa += countParts(f.geometry);
ra += countRings(f.geometry);
if (JSON.stringify(f.geometry) !== JSON.stringify(fc.features[i].geometry)) changed++;
}
const afterVerts = new Map(out.features.map((f) => [f.id, countVerts(f.geometry)]));
const json = JSON.stringify(out);
writeFileSync(OUT, json + '\n');
const outBytes = Buffer.byteLength(json) + 1;
console.log(`\n--- RESULTS ---`);
console.log(`regions: ${fc.features.length} → ${out.features.length} (unchanged)`);
console.log(`vertices (incl. ring closure): ${vb} → ${va} removed ${vb - va} (${(100 * (vb - va) / vb).toFixed(2)}%)`);
console.log(`rings: ${rb} → ${ra} parts: ${pb} → ${pa} holes: ${hb} → ${ha} (all unchanged)`);
console.log(`regions whose geometry changed: ${changed} / ${fc.features.length}`);
console.log(`degenerate rings (<4 pts, kept verbatim): ${degenerate}`);
console.log(`file: ${(inBytes / 1024).toFixed(0)} KB → ${(outBytes / 1024).toFixed(0)} KB (${(outBytes / 1024 / 1024).toFixed(2)} MB)`);
// Diagnose the "messy" regions: the real problem is fragmentation — the
// dissolve left coherent regions as many disconnected parts. Rank by part
// count (then total vertices) so these surface; Kocelje/Kavadartsi are here.
const messy = fc.features
.map((f) => ({
id: f.id,
name: f.properties.name,
parent: f.properties.parent,
parts: countParts(f.geometry),
vb: countVerts(f.geometry),
}))
.sort((a, b) => b.parts - a.parts || b.vb - a.vb)
.slice(0, 15);
console.log(`\nMOST-MESSY (top ${messy.length} by fragmentation = parts, then vertices):`);
console.log(` id name country parts verts verts(after)`);
for (const m of messy)
console.log(` ${m.id.padEnd(10)} ${m.name.slice(0, 37).padEnd(38)} ${m.parent.padEnd(7)} ${String(m.parts).padStart(4)} ${String(m.vb).padStart(5)} ${String(afterVerts.get(m.id)).padStart(5)}`);
console.log(`\nwrote ${OUT}; elapsed ${((Date.now() - t0) / 1000).toFixed(1)}s`);
}
main();
+15
View File
@@ -72,4 +72,19 @@ describe('openDb', () => {
expect(db.load('missing')).toBeNull();
db.close();
});
it('delete removes a game by id and reports absence otherwise', () => {
const db = openDb(':memory:');
db.save(makeState('a'));
db.save(makeState('b'));
expect(db.delete('nope')).toBe(false); // unknown id
expect(db.delete('a')).toBe(true); // removes a
expect(db.load('a')).toBeNull();
expect(db.load('b')?.id).toBe('b');
expect([...db.listIds()].sort()).toEqual(['b']);
expect(db.delete('a')).toBe(false); // already gone
db.close();
});
});
+11 -1
View File
@@ -3,11 +3,13 @@ import { mkdirSync } from 'node:fs';
import path from 'node:path';
import Database from 'better-sqlite3';
import type { GameState } from '../shared/types';
import { migrateTerritoryToRegions } from './regions';
export interface Db {
save(state: GameState): void;
load(id: string): GameState | null;
listIds(): string[];
delete(id: string): boolean;
close(): void;
}
@@ -29,6 +31,7 @@ export function openDb(filePath: string): Db {
);
const byId = db.prepare('SELECT data FROM games WHERE id = ?');
const all = db.prepare('SELECT id FROM games ORDER BY updated_at DESC');
const del = db.prepare('DELETE FROM games WHERE id = ?');
return {
save(state) {
upsert.run(state.id, JSON.stringify(state), new Date().toISOString());
@@ -37,7 +40,11 @@ export function openDb(filePath: string): Db {
const row = byId.get(id) as { data: string } | undefined;
if (!row) return null;
try {
return JSON.parse(row.data) as GameState;
// v0.19: migrate any pre-v0.19 (whole-country ISO_A3) territory to
// sub-region ids on read. A no-op when the region geo is not loaded,
// and idempotent once a state has been migrated (the next save then
// persists the region-level territory).
return migrateTerritoryToRegions(JSON.parse(row.data) as GameState);
} catch {
return null;
}
@@ -45,6 +52,9 @@ export function openDb(filePath: string): Db {
listIds() {
return (all.all() as { id: string }[]).map((r) => r.id);
},
delete(id) {
return del.run(id).changes > 0;
},
close() {
db.close();
},
+145 -12
View File
@@ -1,10 +1,12 @@
import { describe, expect, it } from 'vitest';
import { beforeAll, describe, expect, it } from 'vitest';
import type { GameState, Preset, RoundItem } from '../shared/types';
import type { TurnResult } from '../shared/protocol';
import { makeEvent, type TurnResult } from '../shared/protocol';
import type { LlmClient } from './llm';
import { makeStubLlmClient } from './stub';
import { _setRegionsForTests } from './regions';
import {
applyTurnResult,
buildSystemPrompt,
buildUserPrompt,
isMeaningful,
parseTurnResult,
@@ -23,6 +25,27 @@ function fakeLlm(responses: string[]): LlmClient {
};
}
// Give the region module a small, deterministic index so `buildUserPrompt`'s
// `regions` reference table is populated in these fast unit tests (the real
// 3.4 MB geo stays out of this file). The ids match the synthetic territories
// below.
beforeAll(() => {
_setRegionsForTests(
{
'GB-01': { name: 'Greater London', parent: 'GBR' },
'GB-02': { name: 'Scotland', parent: 'GBR' },
'US-01': { name: 'New England', parent: 'USA' },
'US-02': { name: 'The Midwest', parent: 'USA' },
'PL-01': { name: 'Pomerania', parent: 'POL' },
'DE-01': { name: 'Rhineland', parent: 'DEU' },
},
{ GBR: ['GB-01', 'GB-02'], USA: ['US-01', 'US-02'], POL: ['PL-01'], DEU: ['DE-01'] },
);
});
// As of v0.19 territory is a list of **sub-region ids** (the RegionMap keys),
// not whole-country ISO_A3 codes. `us` also holds `PL-01` so that a canned or
// stubbed gain of that region has a prior owner to move it from.
const preset: Preset = {
id: 'test',
title: 'Test',
@@ -36,7 +59,7 @@ const preset: Preset = {
name: 'UK',
type: 'major',
stats: { military: 80, economy: 70, stability: 60, population: 50 },
territory: ['GBR'],
territory: ['GB-01', 'GB-02'],
relations: { us: 'neutral', de: 'hostile' },
},
{
@@ -44,7 +67,7 @@ const preset: Preset = {
name: 'US',
type: 'major',
stats: { military: 60, economy: 90, stability: 80, population: 80 },
territory: ['USA'],
territory: ['US-01', 'US-02', 'PL-01'],
relations: { uk: 'neutral' },
},
{
@@ -52,7 +75,7 @@ const preset: Preset = {
name: 'DE',
type: 'major',
stats: { military: 95, economy: 70, stability: 75, population: 90 },
territory: ['DEU'],
territory: ['DE-01'],
relations: {},
},
],
@@ -87,7 +110,7 @@ const validResult = JSON.stringify({
{ nation: 'de', stat: 'economy', op: 'add', value: 10 },
],
relations: [{ a: 'uk', b: 'us', set: 'ally' }],
territoryChanges: [{ nation: 'de', gain: ['POL'], lose: [] }],
territoryChanges: [{ nation: 'de', gain: ['PL-01'], lose: [] }],
});
describe('runTurn', () => {
@@ -108,8 +131,9 @@ describe('runTurn', () => {
// relations are symmetric
expect(state.nations.uk.relations.us).toBe('ally');
expect(state.nations.us.relations.uk).toBe('ally');
// territory moved to DE
expect(state.nations.de.territory).toContain('POL');
// the region moved to DE, out of its prior owner (us)
expect(state.nations.de.territory).toContain('PL-01');
expect(state.nations.us.territory).not.toContain('PL-01');
// one event appended, tagged with the turn that was resolved (1)
expect(state.events).toHaveLength(1);
expect(state.events[0].turn).toBe(1);
@@ -120,7 +144,8 @@ describe('runTurn', () => {
// and the original state object is NOT mutated
expect(original.turn).toBe(1);
expect(original.nations.uk.stats.military).toBe(80);
expect(original.nations.de.territory).not.toContain('POL');
expect(original.nations.us.territory).toContain('PL-01');
expect(original.nations.de.territory).not.toContain('PL-01');
});
it('clamps out-of-range stat values into 0-100', async () => {
@@ -190,7 +215,7 @@ describe('runTurn', () => {
});
describe('runTurn (batched round, deterministic stub)', () => {
it('a single action item: turn+1, date+2, pending cleared, one military event, military set to clamp(cur+5)', async () => {
it('a single action item: turn+1, date+2, pending cleared, one military event, military set to clamp(cur+5), one deterministic region gain', async () => {
const original = baseState();
original.pending = [{ kind: 'action', text: 'Fortify the coast and mobilize the home guard' }];
const { state, result } = await runTurn({
@@ -208,6 +233,12 @@ describe('runTurn (batched round, deterministic stub)', () => {
expect(state.events[0].nation).toBe('uk');
expect(state.events[0].outcome).toBe('success');
expect(result.stateChanges).toEqual([{ nation: 'uk', stat: 'military', op: 'set', value: 85 }]);
// the stub's one deterministic per-turn territory move: the player annexes
// the lexicographically-first region of the first other nation (us holds
// PL-01, US-01, US-02 → PL-01 wins), moved out of us.
expect(result.territoryChanges).toEqual([{ nation: 'uk', gain: ['PL-01'], lose: [] }]);
expect(state.nations.uk.territory).toEqual(['GB-01', 'GB-02', 'PL-01']);
expect(state.nations.us.territory).toEqual(['US-01', 'US-02']);
// committing a turn is a new revision too
expect(state.version).toBe(2);
// the original object is not mutated (a fresh queue was consumed)
@@ -215,7 +246,7 @@ describe('runTurn (batched round, deterministic stub)', () => {
expect(original.version).toBe(1);
});
it('an empty round: turn advances, one political "world moves on" event, pending stays empty', async () => {
it('an empty round: turn advances, one political "world moves on" event, no territory move', async () => {
const { state } = await runTurn({
llm: makeStubLlmClient(),
preset,
@@ -229,9 +260,13 @@ describe('runTurn (batched round, deterministic stub)', () => {
expect(state.events[0].type).toBe('political');
expect(state.events[0].title).toBe('The world moves on');
expect(state.events[0].outcome).toBe('neutral');
// an empty round makes no move: every territory is untouched
expect(state.nations.uk.territory).toEqual(['GB-01', 'GB-02']);
expect(state.nations.us.territory).toEqual(['US-01', 'US-02', 'PL-01']);
expect(state.nations.de.territory).toEqual(['DE-01']);
});
it('a round with two actions and one diplomacy: 3 events (2 military + 1 diplomatic), exactly one turn advance', async () => {
it('a round with two actions and one diplomacy: 3 events (2 military + 1 diplomatic), exactly one turn advance, one region gain', async () => {
const state = baseState();
state.pending = [
{ kind: 'action', text: 'Reinforce the Atlantic convoys' },
@@ -250,6 +285,9 @@ describe('runTurn (batched round, deterministic stub)', () => {
expect(next.events.filter((e) => e.type === 'military')).toHaveLength(2);
expect(next.events.filter((e) => e.type === 'diplomatic')).toHaveLength(1);
expect(next.nations.uk.stats.military).toBe(85); // one +5 per turn, not per item
// …and one (not three) territory move for the whole batch
expect(next.nations.uk.territory).toEqual(['GB-01', 'GB-02', 'PL-01']);
expect(next.nations.us.territory).toEqual(['US-01', 'US-02']);
});
});
@@ -263,6 +301,7 @@ describe('buildUserPrompt (batched round)', () => {
pending: RoundItem[];
playerActions: unknown[];
roundInstruction: string;
regions: Record<string, string>;
};
expect(parsed.pending).toEqual(items);
expect(parsed.playerActions).toEqual(['Fortify Dover', { to: 'us', message: 'Propose a pact' }]);
@@ -270,6 +309,20 @@ describe('buildUserPrompt (batched round)', () => {
expect(parsed.roundInstruction).toContain('Propose a pact');
});
it('emits a regions reference table ("id → name (parent)") covering every territory id in the state', () => {
const parsed = JSON.parse(buildUserPrompt(baseState(), [])) as {
regions: Record<string, string>;
state: { nations: Record<string, { territory: string[] }> };
};
// the table is keyed by the union of all nations' (sub-region) territory ids
const allIds = Object.values(parsed.state.nations).flatMap((n) => n.territory);
expect(Object.keys(parsed.regions).sort()).toEqual([...allIds].sort());
// each id maps to a human "name (parent)" label from the region index
expect(parsed.regions['GB-01']).toBe('Greater London (GBR)');
expect(parsed.regions['DE-01']).toBe('Rhineland (DEU)');
expect(parsed.regions['PL-01']).toBe('Pomerania (POL)');
});
it('frames an empty round as "the world advances on its own momentum"', () => {
const parsed = JSON.parse(buildUserPrompt(baseState(), [])) as {
pending: RoundItem[];
@@ -279,6 +332,44 @@ describe('buildUserPrompt (batched round)', () => {
expect(parsed.roundInstruction).toMatch(/no action/i);
expect(parsed.roundInstruction).toMatch(/own momentum/i);
});
it('caps recentEvents at the last 5 (in order) when the state has more than 5 events', () => {
const state = baseState();
const events = Array.from({ length: 8 }, (_, i) =>
makeEvent(
{
nation: 'uk',
type: 'political',
title: `Event ${i + 1}`,
text: `Narrative ${i + 1}`,
outcome: 'neutral',
},
i + 1,
`1939-09-0${i + 1}`,
),
);
state.events = events;
const parsed = JSON.parse(buildUserPrompt(state, [])) as {
state: { recentEvents: Array<{ title: string; turn: number; date: string }> };
};
expect(parsed.state.recentEvents).toHaveLength(5);
// the last 5 of the 8 input events, in order
expect(parsed.state.recentEvents[0].title).toBe(events[3].title); // 'Event 4'
expect(parsed.state.recentEvents[4].title).toBe(events[7].title); // 'Event 8'
expect(parsed.state.recentEvents.map((e) => e.title)).toEqual([
events[3].title,
events[4].title,
events[5].title,
events[6].title,
events[7].title,
]);
});
it('asks the model to keep its internal reasoning brief (concise-CoT constraint)', () => {
expect(buildSystemPrompt(preset)).toMatch(/reasoning brief|a few sentences/i);
});
});
describe('queueRoundItem', () => {
@@ -422,6 +513,48 @@ describe('applyTurnResult', () => {
expect(state.pending).toHaveLength(1); // original untouched
expect(state.version).toBe(1);
});
it('moves a gained region out of its prior owner (region-level transfer)', () => {
const state = baseState();
const result: TurnResult = {
date: '1939-09-03',
events: [],
stateChanges: [],
relations: [],
territoryChanges: [{ nation: 'de', gain: ['PL-01'], lose: [] }],
};
const next = applyTurnResult(state, result);
expect(next.nations.de.territory).toContain('PL-01');
expect(next.nations.us.territory).not.toContain('PL-01'); // spliced out of the prior owner
expect(next.nations.uk.territory).toEqual(['GB-01', 'GB-02']);
});
it('adds a region nobody owned (no prior owner to splice from)', () => {
const state = baseState();
const result: TurnResult = {
date: '1939-09-03',
events: [],
stateChanges: [],
relations: [],
territoryChanges: [{ nation: 'uk', gain: ['FR-57'], lose: [] }],
};
const next = applyTurnResult(state, result);
expect(next.nations.uk.territory).toEqual(['GB-01', 'GB-02', 'FR-57']);
});
it('drops a lost region with no gainer (it becomes unowned / no-man\'s-land)', () => {
const state = baseState();
const result: TurnResult = {
date: '1939-09-03',
events: [],
stateChanges: [],
relations: [],
territoryChanges: [{ nation: 'us', gain: [], lose: ['PL-01'] }],
};
const next = applyTurnResult(state, result);
expect(next.nations.us.territory).toEqual(['US-01', 'US-02']);
expect(Object.values(next.nations).every((n) => !n.territory.includes('PL-01'))).toBe(true);
});
});
describe('isMeaningful', () => {
+15 -3
View File
@@ -24,6 +24,7 @@ import {
} from '../shared/protocol';
import { DEFAULT_MAX_TOKENS, type LlmClient } from './llm';
import { ADVISOR_MARKER } from './stub';
import { regionNamesFor } from './regions';
const VALID_EVENT_TYPES = new Set<string>(EVENT_TYPES);
const VALID_RELATIONS = new Set<string>(RELATION_STATUSES);
@@ -53,12 +54,14 @@ export function buildSystemPrompt(preset: Preset): string {
' ],',
' "stateChanges": [{"nation":"<nationId>","stat":"<military|economy|stability|population>","op":"<set|add>","value":<0-100>}],',
' "relations": [{"a":"<nationId>","b":"<nationId>","set":"<ally|neutral|rival|hostile|war>"}],',
' "territoryChanges": [{"nation":"<nationId>","gain":["<ISO_A3>"],"lose":["<ISO_A3>"]}]',
' "territoryChanges": [{"nation":"<nationId>","gain":["<regionId>"],"lose":["<regionId>"]}]',
'}',
'',
'HARD CONSTRAINTS',
'- Use only nation ids and ISO_A3 codes that exist in the provided state.',
'- Use only nation ids and sub-region ids (e.g. `FR-57`) that exist in the provided state.',
'- A region id (e.g. `FR-57`) identifies a single sub-region — the `regions` table below lists each id with its name and country; a nation\'s border can change one region at a time.',
'- Prefer 1-4 events per turn; keep each text 1-3 sentences.',
'- Keep your internal reasoning brief (a few sentences) and go straight to the JSON result; do not over-deliberate or re-derive facts already present in the state.',
'- Keep every stat value between 0 and 100.',
'- Only change borders when war or a decisive political shift justifies it.',
'- If a field is not relevant this turn, set it to an empty array.',
@@ -95,7 +98,7 @@ export function buildUserPrompt(state: GameState, items: RoundItem[]): string {
nations: Object.fromEntries(
Object.entries(state.nations).map(([id, n]) => [id, nationForPrompt(n)]),
),
recentEvents: state.events.slice(-10).map((e) => ({
recentEvents: state.events.slice(-5).map((e) => ({
turn: e.turn,
date: e.date,
nation: e.nation,
@@ -105,6 +108,15 @@ export function buildUserPrompt(state: GameState, items: RoundItem[]): string {
outcome: e.outcome,
})),
},
// A name lookup for every region id referenced anywhere in the state, so the
// model can map an id it is considering (e.g. `FR-57`) to a place it
// recognizes. This is a top-level reference table keyed by sub-region id;
// each nation's own `territory` still carries raw ids (via nationForPrompt,
// unchanged) so the deterministic stub can parse them. When the region geo
// is not loaded the table is empty and the model falls back to the raw ids.
regions: regionNamesFor(
Object.values(state.nations).flatMap((n) => n.territory),
),
playerActions,
pending: items,
roundInstruction,
+26 -1
View File
@@ -19,6 +19,7 @@ import type { GameState } from '../shared/types';
import { createLlmClient } from './llm';
import { makeStubLlmClient } from './stub';
import { askAdvisor, queueRoundItem, removeRoundItem, runTurn } from './engine';
import { expandTerritory, loadRegions } from './regions';
import { buildRegionMap } from './map';
import { createPresetStore } from './presets';
import { openDb, type Db } from './db';
@@ -41,6 +42,10 @@ function findRoot(): string {
}
const root = findRoot();
// Load the sub-region geo once at boot (a graceful no-op, with a warning, when
// the file is missing — the territory model then degrades to whole-country
// ISO_A3 codes). Must run before the first game creation/load.
loadRegions(root);
const presetsDir = path.join(root, 'presets');
const clientDir = process.env.CLIENT_DIST ?? path.join(root, 'dist');
const dataDir = process.env.DATA_DIR ?? path.join(root, 'data');
@@ -116,7 +121,16 @@ app.post('/api/games', (req: Request, res) => {
playerNationId: nation.id,
turn: 1,
date: preset.startDate,
nations: Object.fromEntries(preset.nations.map((n) => [n.id, deepClone(n)])),
// v0.19: territory is at sub-region granularity — expand each preset
// nation's ISO_A3 country codes into all their sub-region ids (a no-op that
// keeps the country codes when the region geo is not loaded).
nations: Object.fromEntries(
preset.nations.map((n) => {
const nation = deepClone(n);
nation.territory = expandTerritory(nation.territory);
return [n.id, nation];
}),
),
events: [],
pending: [],
version: 1, // the first saved revision; every later mutation bumps it
@@ -156,6 +170,17 @@ app.get('/api/games/:id/map', (req, res) => {
res.json({ regions: buildRegionMap(game) });
});
// Delete a saved game entirely. Fast, non-LLM. 404 if it doesn't exist; on
// success broadcast an SSE `error` to any other open tab watching it so it
// returns home (see the `event: error` handling in src/lib/sse.ts).
app.delete('/api/games/:id', (req, res) => {
const id = req.params.id;
const removed = db.delete(id);
if (!removed) return res.status(404).json({ error: 'game not found' });
broadcast(id, 'error', { message: 'game deleted' });
res.json({ deleted: true });
});
// Queue a free-text player action onto the pending round. No LLM call and no
// turn advance — the round is only committed (in one turn) by "Jump forward".
app.post('/api/games/:id/action', (req, res) => {
+59 -34
View File
@@ -1,8 +1,10 @@
import { describe, expect, it } from 'vitest';
import { buildRegionMap } from './map';
import { nationColor, regionOwner, type RegionMap } from '../shared/protocol';
import { mapFeatureOwner, nationColor, regionOwner, type RegionMap } from '../shared/protocol';
import type { GameState } from '../shared/types';
// As of v0.19 territory is a list of **sub-region ids** (the RegionMap keys),
// not whole-country ISO_A3 codes.
const state: GameState = {
id: 'g',
presetId: 'p',
@@ -16,7 +18,7 @@ const state: GameState = {
name: 'UK',
type: 'major',
stats: { military: 80, economy: 70, stability: 60, population: 50 },
territory: ['GBR', 'IRL'],
territory: ['GB-01', 'GB-02'],
relations: {},
},
de: {
@@ -24,7 +26,7 @@ const state: GameState = {
name: 'DE',
type: 'major',
stats: { military: 90, economy: 70, stability: 70, population: 90 },
territory: ['DEU'],
territory: ['DE-01'],
relations: {},
},
},
@@ -33,28 +35,29 @@ const state: GameState = {
version: 1,
};
// The RegionMap built from the fixture: the authoritative ISO_A3 → owner source.
// The RegionMap built from the fixture: the authoritative sub-region id → owner
// source.
const regions: RegionMap = buildRegionMap(state);
describe('buildRegionMap', () => {
it('maps each ISO_A3 region to its owner + that nation\'s stable color', () => {
it('maps each sub-region id to its owner + that nation\'s stable color', () => {
const m = buildRegionMap(state);
expect(m.GBR).toEqual({ color: nationColor('uk'), owner: 'UK', ownerId: 'uk' });
expect(m.IRL).toEqual({ color: nationColor('uk'), owner: 'UK', ownerId: 'uk' });
expect(m.DEU).toEqual({ color: nationColor('de'), owner: 'DE', ownerId: 'de' });
// a region nobody owns is simply absent
expect(m.FRA).toBeUndefined();
expect(m['GB-01']).toEqual({ color: nationColor('uk'), owner: 'UK', ownerId: 'uk' });
expect(m['GB-02']).toEqual({ color: nationColor('uk'), owner: 'UK', ownerId: 'uk' });
expect(m['DE-01']).toEqual({ color: nationColor('de'), owner: 'DE', ownerId: 'de' });
// a sub-region nobody owns is simply absent
expect(m['FR-57']).toBeUndefined();
});
});
describe('regionOwner', () => {
it('resolves an owned region\'s ISO_A3 to its owner record', () => {
expect(regionOwner(regions, 'GBR')).toEqual({
it('resolves an owned sub-region id to its owner record', () => {
expect(regionOwner(regions, 'GB-01')).toEqual({
color: nationColor('uk'),
owner: 'UK',
ownerId: 'uk',
});
expect(regionOwner(regions, 'DEU')).toEqual({
expect(regionOwner(regions, 'DE-01')).toEqual({
color: nationColor('de'),
owner: 'DE',
ownerId: 'de',
@@ -62,11 +65,11 @@ describe('regionOwner', () => {
});
it('returns undefined for an unowned region (no RegionMap entry)', () => {
expect(regionOwner(regions, 'FRA')).toBeUndefined();
expect(regionOwner(regions, 'USA')).toBeUndefined();
expect(regionOwner(regions, 'FR-57')).toBeUndefined();
expect(regionOwner(regions, 'US-01')).toBeUndefined();
});
it('returns undefined for an empty or missing code', () => {
it('returns undefined for an empty or missing id', () => {
expect(regionOwner(regions, '')).toBeUndefined();
expect(regionOwner(regions, null)).toBeUndefined();
expect(regionOwner(regions, undefined)).toBeUndefined();
@@ -74,38 +77,60 @@ describe('regionOwner', () => {
});
/**
* #6 regression guard. The click/hover handlers resolve the owning nation from a
* map feature. MapLibre repacks a GeoJSON source's top-level `id` (the ISO_A3
* string) into a *numeric index* when it stores the source, so a feature the map
* hands back at interaction time has a number for `id` and the ISO_A3 only lives
* in `properties.regionId`. This test pins the exact data shape and proves the
* fix: resolution via `properties.regionId` works, while the pre-fix path that
* read `feature.id` does not.
* #6 regression guard (sub-national map, v0.19 region-level ownership). The
* click/hover handlers resolve the owning nation from a rendered map feature.
* MapLibre repacks a GeoJSON source's top-level `id` into a *numeric index*
* when it stores the source, so a feature the map hands back at interaction
* time has a number for `id`. Since v0.19 ownership is at **sub-region**
* granularity: a feature's owner lives at its **own sub-region id** (e.g.
* `DE-01`), which the client stamps into `properties.regionId` (the RegionMap
* is keyed by that id). This pins the exact data shape and proves the
* resolution: `mapFeatureOwner` works via `properties.regionId`, while the
* repacked numeric `feature.id` path does not.
*/
describe('#6 — owner must be resolved from properties.regionId, not the repacked feature.id', () => {
// The shape MapLibre returns for a source feature after setData(): `id` is a
// number (here 0, as observed in the live map), and the ISO_A3 is preserved
// only in properties (the client stamps it as `regionId`).
describe('#6 — region owner must be resolved from properties.regionId, never the repacked feature.id', () => {
// The shape MapLibre returns for a sub-region feature after setData(): `id`
// is a number (repacked), and the stable identifiers live only in properties
// — `regionId` (the sub-region id, the RegionMap key) and `parent` (the
// static parent country's ISO_A3).
const repackedFeature = {
id: 0,
properties: { name: 'DE', regionId: 'DEU' },
properties: { name: 'Rhineland', regionId: 'DE-01', parent: 'DEU' },
};
it('resolves the owner from properties.regionId (the fix)', () => {
const code = typeof repackedFeature.properties.regionId === 'string' ? repackedFeature.properties.regionId : '';
expect(regionOwner(regions, code)).toEqual({
expect(mapFeatureOwner(regions, repackedFeature)).toEqual({
color: nationColor('de'),
owner: 'DE',
ownerId: 'de',
});
});
it('the old path (feature.id as a string key) does NOT resolve — the bug', () => {
// String(0) === '0' is not a valid ISO_A3 key, so the pre-fix lookup failed
// and the click popup reported "No owner" even for owned regions.
expect(regions[String(repackedFeature.id)]).toBeUndefined();
it('the repacked numeric feature.id does NOT resolve — the original bug', () => {
// String(0) === '0' is not a valid key, so the pre-fix lookup failed and
// reported "No owner" even for owned regions.
expect(regionOwner(regions, String(repackedFeature.id))).toBeUndefined();
});
it('a sub-region id nobody owns does NOT resolve', () => {
expect(regionOwner(regions, 'FR-57')).toBeUndefined();
});
});
describe('mapFeatureOwner', () => {
it('returns undefined for a missing feature, missing regionId, or non-string regionId', () => {
expect(mapFeatureOwner(regions, null)).toBeUndefined();
expect(mapFeatureOwner(regions, undefined)).toBeUndefined();
expect(mapFeatureOwner(regions, {})).toBeUndefined();
expect(mapFeatureOwner(regions, { properties: {} })).toBeUndefined();
expect(mapFeatureOwner(regions, { properties: { regionId: 42 } })).toBeUndefined();
expect(mapFeatureOwner(regions, { properties: { regionId: '' } })).toBeUndefined();
});
it('returns undefined for a sub-region nobody owns', () => {
expect(mapFeatureOwner(regions, { properties: { regionId: 'FR-57' } })).toBeUndefined();
expect(mapFeatureOwner(regions, { properties: { regionId: 'US-01' } })).toBeUndefined();
});
});
describe('nationColor', () => {
+9 -5
View File
@@ -1,6 +1,10 @@
// Build the choropleth payload from a GameState: every ISO_A3 region maps to its
// owning nation plus that nation's stable color (see shared.nationColor). The
// client merges this onto public/countries.geo.json and calls source.setData().
// Build the choropleth payload from a GameState: every **sub-region id** in a
// nation's territory maps to its owning nation plus that nation's stable color
// (see shared.nationColor). The client merges this onto public/regions.geo.json
// and calls source.setData(). The map is keyed by whatever ids sit in
// `nation.territory` — sub-region ids (e.g. `FR-57`) as of v0.19 — so it needs
// no change to move from country to sub-region granularity; a sub-region in no
// nation's territory is simply absent (unowned, rendered grey by the map).
import { nationColor, type RegionMap } from '../shared/protocol';
import type { GameState } from '../shared/types';
@@ -8,8 +12,8 @@ export function buildRegionMap(state: GameState): RegionMap {
const map: RegionMap = {};
for (const [id, nation] of Object.entries(state.nations)) {
const color = nationColor(id);
for (const code of nation.territory) {
map[code] = { color, owner: nation.name, ownerId: id };
for (const regionId of nation.territory) {
map[regionId] = { color, owner: nation.name, ownerId: id };
}
}
return map;
+176
View File
@@ -0,0 +1,176 @@
/**
* server/regions.test.ts — the sub-region data module (v0.19).
*
* The first suite loads the REAL `public/regions.geo.json` (the same file the
* production server loads at boot), so expansion/migration runs against the
* actual 1,796-region dataset. The second suite exercises the graceful
* "geo missing" path (module not loaded) via the `_resetRegionsForTests` seam,
* and pins the `_setRegionsForTests` fixture seam used by the other unit tests.
* Module state is per vitest file, so these suites never collide with other
* test files.
*/
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
import type { GameState } from '../shared/types';
import {
_resetRegionsForTests,
_setRegionsForTests,
expandTerritory,
hasRegionData,
loadRegions,
migrateTerritoryToRegions,
regionLabel,
regionNamesFor,
} from './regions';
const here = path.dirname(fileURLToPath(import.meta.url));
const root = path.resolve(here, '..');
function makeState(territory: string[]): GameState {
return {
id: 'g',
presetId: 'p',
presetTitle: 'P',
playerNationId: 'uk',
turn: 1,
date: '1939-09-01',
nations: {
uk: {
id: 'uk',
name: 'UK',
type: 'major',
stats: { military: 80, economy: 70, stability: 60, population: 50 },
territory,
relations: {},
},
},
events: [],
pending: [],
version: 1,
};
}
describe('server/regions (real geo)', () => {
beforeAll(() => {
_resetRegionsForTests();
loadRegions(root);
});
it('loads public/regions.geo.json (hasRegionData becomes true)', () => {
expect(hasRegionData()).toBe(true);
});
it('loadRegions is idempotent: a second call keeps the loaded data', () => {
loadRegions(root);
expect(hasRegionData()).toBe(true);
});
it('expandTerritory expands an ISO_A3 into its sub-region ids (unique, all with that parent)', () => {
const ids = expandTerritory(['FRA']);
expect(ids.length).toBeGreaterThan(1); // France is subdivided, not one region
expect(new Set(ids).size).toBe(ids.length); // deduped
// every expanded id resolves back to the same parent country
const names = regionNamesFor(ids);
for (const id of ids) expect(names[id]).toMatch(/\(FRA\)$/);
});
it('expandTerritory is order-preserving and dedupes repeated country codes', () => {
expect(expandTerritory(['FRA', 'FRA'])).toEqual(expandTerritory(['FRA']));
// two countries: the union, in first-seen order (the ids are disjoint)
expect(expandTerritory(['FRA', 'DEU'])).toEqual([
...expandTerritory(['FRA']),
...expandTerritory(['DEU']),
]);
});
it('expandTerritory of an empty or unknown list yields no regions', () => {
expect(expandTerritory([])).toEqual([]);
expect(expandTerritory(['XXX'])).toEqual([]); // no country with that code
});
it('regionNamesFor maps every known id to "name (parent)"', () => {
const ids = expandTerritory(['DEU']);
const names = regionNamesFor(ids);
expect(Object.keys(names).sort()).toEqual([...ids].sort());
for (const id of ids) expect(names[id]).toMatch(/\(DEU\)$/);
});
it('regionNamesFor skips ids that are not in the loaded index', () => {
expect(regionNamesFor(['NO-SUCH-01'])).toEqual({});
});
it('regionLabel is "id — name (parent)" for known ids and the bare id for unknown', () => {
const [id] = expandTerritory(['FRA']);
expect(regionLabel(id)).toMatch(new RegExp(`^${id} — .+ \\(FRA\\)$`));
expect(regionLabel('NO-SUCH-01')).toBe('NO-SUCH-01');
});
it('migrateTerritoryToRegions rewrites ISO_A3 entries to region ids, keeps existing region ids, and is idempotent', () => {
const [deId] = expandTerritory(['DEU']); // a real region id of another country
const state = makeState(['FRA', deId]); // mixed: legacy ISO_A3 + already migrated
const originalArray = state.nations.uk.territory;
// it mutates and returns the (fresh) state it is given — callers pass a
// just-parsed object (db.load), so the in-place mutation is safe
const out = migrateTerritoryToRegions(state);
expect(out).toBe(state);
// the original array object is never mutated in place — a new one is
// installed on the nation, and the original stays as it was
expect(out.nations.uk.territory).not.toBe(originalArray);
expect(originalArray).toEqual(['FRA', deId]);
// the ISO_A3 entry is gone, replaced by its sub-region ids…
expect(out.nations.uk.territory).not.toContain('FRA');
for (const id of expandTerritory(['FRA'])) expect(out.nations.uk.territory).toContain(id);
// …and the existing region id survives, exactly once
expect(out.nations.uk.territory.filter((t) => t === deId)).toEqual([deId]);
// idempotent: a second migration changes nothing
expect(migrateTerritoryToRegions(out).nations.uk.territory).toEqual(out.nations.uk.territory);
});
});
describe('server/regions (fallback: geo not loaded)', () => {
beforeAll(() => {
_resetRegionsForTests();
});
afterAll(() => {
// restore the real geo for anything in this file that runs later
_resetRegionsForTests();
loadRegions(root);
});
it('hasRegionData is false after a reset', () => {
expect(hasRegionData()).toBe(false);
});
it('expandTerritory returns its input unchanged (whole-country fallback)', () => {
expect(expandTerritory(['FRA'])).toEqual(['FRA']);
expect(expandTerritory([])).toEqual([]);
});
it('regionNamesFor is empty and regionLabel falls back to the bare id', () => {
expect(regionNamesFor(['FRA'])).toEqual({});
expect(regionLabel('FRA')).toBe('FRA');
});
it('migrateTerritoryToRegions is a no-op (returns the state untouched)', () => {
const state = makeState(['FRA']);
const out = migrateTerritoryToRegions(state);
expect(out).toBe(state);
expect(out.nations.uk.territory).toEqual(['FRA']);
});
it('_setRegionsForTests loads a fixture and drives the pure helpers', () => {
_setRegionsForTests(
{
'GB-01': { name: 'Greater London', parent: 'GBR' },
'GB-02': { name: 'Scotland', parent: 'GBR' },
},
{ GBR: ['GB-01', 'GB-02'] },
);
expect(hasRegionData()).toBe(true);
expect(expandTerritory(['GBR'])).toEqual(['GB-01', 'GB-02']);
expect(regionNamesFor(['GB-01'])).toEqual({ 'GB-01': 'Greater London (GBR)' });
const state = makeState(['GBR']);
expect(migrateTerritoryToRegions(state).nations.uk.territory).toEqual(['GB-01', 'GB-02']);
});
});
+187
View File
@@ -0,0 +1,187 @@
// Sub-national region data: loaded ONCE at server boot from
// `public/regions.geo.json` (dev) or `dist/regions.geo.json` (prod — Vite copies
// `public/` → `dist/`). It builds two in-memory maps that power the
// sub-region-level territory model (v0.19):
//
// - `regionIndex` : region id → { name, parent } (parent = ISO_A3 country)
// - `regionsByCountry`: ISO_A3 country → array of its region ids
//
// These are used to (a) expand a nation's ISO_A3 territory into its sub-region
// ids at game creation / load-time migration, and (b) hand the LLM a human
// name for each region id it may reference in a TurnResult.
//
// This is deliberately turf-free (plain `JSON.parse`): importing `@turf/*`
// would pull `@types/geojson` into the tsc program and break `WorldMap.tsx`
// (see AGENTS.md / the v0.17 changelog note on the geojson type gotcha).
//
// The server must still boot and the app still work when the geo file is
// missing or unreadable: the maps stay empty, `hasRegionData()` stays false,
// and the territory model gracefully degrades to whole-country ISO_A3 codes
// (the pre-v0.19 behavior). Nothing here ever throws.
import { existsSync, readFileSync } from 'node:fs';
import path from 'node:path';
import type { GameState } from '../shared/types';
/** A region's stable identity: display name + the parent country's ISO_A3. */
export interface RegionInfo {
name: string;
parent: string;
}
let regionIndex: Record<string, RegionInfo> = {};
let regionsByCountry: Record<string, string[]> = {};
let loaded = false;
/** True once the region geo has been loaded successfully. */
export function hasRegionData(): boolean {
return loaded;
}
/**
* (Re)build the in-memory region maps from the region geo. Idempotent: a second
* call is a no-op. Tries `<root>/public/regions.geo.json` first (dev), then
* `<root>/dist/regions.geo.json` (prod, where Vite copies `public/` → `dist/`).
* If no candidate file is found, or it fails to parse, the maps stay empty and
* `hasRegionData()` stays false (graceful fallback to ISO_A3) — never throws.
*/
export function loadRegions(root: string): void {
if (loaded) return;
const candidates = [
path.join(root, 'public', 'regions.geo.json'),
path.join(root, 'dist', 'regions.geo.json'),
];
const file = candidates.find((c) => existsSync(c));
if (!file) {
console.warn(
'[history] regions.geo.json not found (tried: ' + candidates.join(', ') +
') — falling back to whole-country (ISO_A3) territory',
);
return;
}
try {
const geo = JSON.parse(readFileSync(file, 'utf8')) as {
features?: Array<{
id?: string | number;
properties?: { name?: string; parent?: string };
}>;
};
const index: Record<string, RegionInfo> = {};
const byCountry: Record<string, string[]> = {};
for (const f of geo.features ?? []) {
const id = f.id == null ? '' : String(f.id);
const parent = typeof f.properties?.parent === 'string' ? f.properties.parent : '';
const name = typeof f.properties?.name === 'string' ? f.properties.name : '';
if (!id || !parent) continue;
index[id] = { name, parent };
(byCountry[parent] ??= []).push(id);
}
regionIndex = index;
regionsByCountry = byCountry;
loaded = Object.keys(index).length > 0;
} catch (e) {
console.warn('[history] failed to load regions.geo.json (' + file + '):', e);
}
}
/**
* Expand a list of ISO_A3 country codes into the union of all their sub-region
* ids (deduped, preserving first-seen order). When the region data is not
* loaded, returns the input unchanged (graceful fallback to ISO_A3 territory).
*/
export function expandTerritory(countryCodes: string[]): string[] {
if (!loaded) return countryCodes;
const seen = new Set<string>();
const out: string[] = [];
for (const code of countryCodes) {
for (const id of regionsByCountry[code] ?? []) {
if (!seen.has(id)) {
seen.add(id);
out.push(id);
}
}
}
return out;
}
/**
* A `{ [regionId]: "name (parent)" }` object for the given region ids, for the
* LLM prompt. Unknown ids (not in the loaded index) are skipped. Empty when the
* region data is not loaded.
*/
export function regionNamesFor(ids: Iterable<string>): Record<string, string> {
const out: Record<string, string> = {};
for (const id of ids) {
const info = regionIndex[id];
if (info) out[id] = `${info.name} (${info.parent})`;
}
return out;
}
/**
* Human-readable label for a single region id: `id — name (parent)`, or just
* the id when it is unknown (e.g. a region that predates the geo or a
* synthetic id).
*/
export function regionLabel(id: string): string {
const info = regionIndex[id];
return info ? `${id} — ${info.name} (${info.parent})` : id;
}
/** A bare ISO_A3 country code: exactly three uppercase letters (no hyphen). */
const ISO_A3_RE = /^[A-Z]{3}$/;
/**
* Migrate a loaded game's territory from whole-country ISO_A3 codes to
* sub-region ids, for nations that still carry ISO_A3 entries (i.e. games
* saved before v0.19). Each such nation's ISO_A3 codes are expanded to all
* their sub-region ids; any entries that are already region ids (they contain
* a hyphen, so they never match `ISO_A3_RE`) are kept. Idempotent and
* no-op when the region data is not loaded or a nation has no ISO_A3 codes.
* Mutates and returns the (fresh) state it is given.
*/
export function migrateTerritoryToRegions(state: GameState): GameState {
if (!loaded) return state;
for (const n of Object.values(state.nations)) {
if (!n.territory.some((t) => ISO_A3_RE.test(t))) continue;
const isoCodes = n.territory.filter((t) => ISO_A3_RE.test(t));
const existingRegions = n.territory.filter((t) => !ISO_A3_RE.test(t));
const merged = expandTerritory(isoCodes).concat(existingRegions);
const seen = new Set<string>();
const out: string[] = [];
for (const id of merged) {
if (!seen.has(id)) {
seen.add(id);
out.push(id);
}
}
n.territory = out;
}
return state;
}
// --- Test-only seams ---------------------------------------------------------
/**
* Test-only: reset the module state to "not loaded" (empty maps,
* `hasRegionData()` false). Lets a test exercise the graceful-fallback path.
*/
export function _resetRegionsForTests(): void {
regionIndex = {};
regionsByCountry = {};
loaded = false;
}
/**
* Test-only: inject region maps directly (bypassing the file load) so a unit
* test can drive `expandTerritory` / `regionNamesFor` / `regionLabel` /
* `migrateTerritoryToRegions` against a small, deterministic fixture without
* reading the 3.4 MB geo file. `loaded` becomes true iff `index` is non-empty.
*/
export function _setRegionsForTests(
index: Record<string, RegionInfo>,
byCountry: Record<string, string[]>,
): void {
regionIndex = index;
regionsByCountry = byCountry;
loaded = Object.keys(index).length > 0;
}
+12 -3
View File
@@ -13,7 +13,8 @@ export interface StubPayload {
turn: number;
date: string;
playerNationId: string;
nations: Record<string, { stats: Record<string, number> }>;
/** As of v0.19 territory is a list of sub-region ids (not ISO_A3 codes). */
nations: Record<string, { stats: Record<string, number>; territory?: string[] }>;
};
/** The raw pending round the engine emitted (one entry per queued item). */
pending?: RoundItem[];
@@ -30,7 +31,12 @@ function truncate(s: string, n: number): string {
* single political "The world moves on" event when the round is empty — so a
* caller can predict the exact next state for assertions. It always sets the
* player's military to (current + 5) and allies the player with the first other
* nation, advancing the date by 2 days.
* nation (by key order), advancing the date by 2 days. As of v0.19, when the
* round is non-empty it also makes exactly **one** territory move: the player
* annexes the lexicographically-first sub-region id of that first other
* nation's territory (an empty round makes no move, and a player with nothing
* to annex from that nation also makes no move) — so unit tests and e2e can
* assert the exact region that changes hands.
*/
export function deterministicTurn(p: StubPayload): TurnResult {
const state = p.state;
@@ -41,6 +47,9 @@ export function deterministicTurn(p: StubPayload): TurnResult {
? (Object.keys(state.nations).find((id) => id !== pid) ?? '')
: 'us';
const items = p.pending ?? [];
// The one deterministic per-turn territory move (see the doc above).
const otherTerritory = [...(state?.nations?.[otherId]?.territory ?? [])].sort();
const gain = items.length > 0 && otherTerritory.length > 0 ? [otherTerritory[0]] : [];
const events: TurnEventSpec[] =
items.length === 0
@@ -76,7 +85,7 @@ export function deterministicTurn(p: StubPayload): TurnResult {
events,
stateChanges: [{ nation: pid, stat: 'military', op: 'set', value: mil }],
relations: otherId ? [{ a: pid, b: otherId, set: 'ally' }] : [],
territoryChanges: [],
territoryChanges: gain.length > 0 ? [{ nation: pid, gain, lose: [] }] : [],
};
}
+51 -14
View File
@@ -23,7 +23,13 @@ export interface RelationChange {
set: RelationStatus;
}
/** A nation gains/loses ISO_A3 regions this turn. */
/**
* A nation gains/loses **sub-region ids** this turn (e.g. `FR-57`), not
* whole-country ISO_A3 codes. Each id identifies a single sub-region, so a
* border can shift one region at a time; a gained region is moved out of
* whichever nation currently owns it, and a lost region with no matching
* gainer simply becomes unowned (no-man's-land).
*/
export interface TerritoryChange {
nation: string;
gain: string[];
@@ -48,29 +54,55 @@ export interface TurnResult {
territoryChanges: TerritoryChange[];
}
/** Per-region map payload: ISO_A3 -> owning nation + its stable color. */
/** Per-region map payload: **sub-region id** -> owning nation + its stable color. */
export interface RegionOwner {
color: string;
owner: string;
ownerId: string;
}
/**
* The authoritative region→owner map, **keyed by sub-region id** (e.g. `FR-57`).
* Every sub-region any nation owns appears here; a sub-region in no nation's
* territory is absent (unowned / no-man's-land) and rendered grey by the map.
*/
export type RegionMap = Record<string, RegionOwner>;
/**
* Look up the owner record for a map region from the authoritative RegionMap by
* its ISO_A3 code. Returns `undefined` for an empty/missing code or an unowned
* region. Pure + shared: the client resolves a clicked or hovered map feature by
* first reading the feature's stable ISO_A3 code (stored in `properties.regionId`
* by the client when it repacks the source — see WorldMap) and then calling this.
* Look up the owner record from the authoritative RegionMap by a RegionMap key.
* The RegionMap is keyed by the **sub-region's own id** (e.g. `FR-57` — never a
* bare ISO_A3 like `FRA`, and never the repacked numeric `feature.id`), so `key`
* is a sub-region id such as `FR-57`. Returns `undefined` for an empty/missing
* key or an unowned region (one in no nation's territory).
*
* The code must NOT be taken from the feature's top-level `id`: MapLibre repacks
* a GeoJSON source's `id` (an ISO_A3 string) into a numeric index when it stores
* the source, so at click/hover time `feature.id` is a number, never the ISO_A3
* — resolving from it is exactly the "no owner" bug (#6).
* Pure + shared: the primitive "key → owner" lookup. The *map feature → owner*
* resolution (deciding which key to pass) lives in {@link mapFeatureOwner}
* below, which reads the feature's `properties.regionId` — never the repacked
* top-level `id` (MapLibre turns it into a numeric index, the "no owner" bug
* #6).
*/
export function regionOwner(regions: RegionMap, isoA3: string | null | undefined): RegionOwner | undefined {
if (!isoA3) return undefined;
return regions[isoA3];
export function regionOwner(regions: RegionMap, key: string | null | undefined): RegionOwner | undefined {
if (!key) return undefined;
return regions[key];
}
/**
* Resolve the owning-nation record for a **rendered map feature** from the
* authoritative RegionMap. Ownership is now at **sub-region** granularity, so a
* feature's owner is found via its **own sub-region id** — the client stamps
* the feature's id into `properties.regionId` (see WorldMap `applyRegions`), and
* we look that up with `regionOwner`. This is the single shared source of truth
* for that resolution, so the "use `properties.regionId`, never the repacked
* top-level `feature.id` (a MapLibre numeric index, the "no owner" bug #6)" rule
* lives in one tested place rather than in the React component.
*
* Returns `undefined` for a missing feature/regionId or an unowned region.
*/
export function mapFeatureOwner(
regions: RegionMap,
feature: { properties?: { regionId?: unknown } } | null | undefined,
): RegionOwner | undefined {
const regionId = feature?.properties?.regionId;
return regionOwner(regions, typeof regionId === 'string' ? regionId : '');
}
/** Server -> client Server-Sent Events payload (see server/index.ts /sse). */
@@ -141,6 +173,11 @@ export interface GameSummary {
date: string;
}
/** Response for deleting a saved game (see `DELETE /api/games/:id`). */
export interface DeleteGameResponse {
deleted: boolean;
}
/**
* Deterministic, stable per-nation color for the choropleth. Hashes the nation id
* to a hue; sat/light tuned for the dark command-center theme. Pure + shared so
+9 -2
View File
@@ -26,8 +26,15 @@ export const RELATION_STATUSES: RelationStatus[] = [
];
/**
* A single nation in the world. `territory` holds ISO_A3 codes; the map colors
* each of those regions with this nation's stable color (see protocol.nationColor).
* A single nation in the world. `territory` holds **sub-region ids** (e.g.
* `FR-57`) — one entry per individually-ownable sub-region, at sub-region
* granularity rather than whole-country ISO_A3. The map colors each sub-region
* with this nation's stable color (see protocol.nationColor). At scenario start
* a nation owns **all** sub-regions of the countries it holds (the server
* expands each ISO_A3 to its sub-regions; see server/regions.expandTerritory),
* so no region starts unowned. A sub-region that is in **no** nation's list is
* unowned (no-man's-land) — the map renders it grey and it can be gained or
* lost region-by-region by the LLM.
*/
export interface Nation {
id: string;
+57 -2
View File
@@ -309,6 +309,12 @@ export default function App() {
useSse(game?.id ?? null, {
onState: applyState,
onTurn: applyState,
// The game disappeared while this tab had it open — either deleted from
// another tab (the server broadcasts an SSE `error`) or a stale deep link to
// a missing game (the SSE connect emits `error`). Return this tab home.
onError: (msg) => {
if (/deleted|not found/i.test(msg)) latestRef.current?.goHome();
},
});
const play = useCallback(async (presetId: string) => {
@@ -465,6 +471,29 @@ export default function App() {
setAdvisors([]);
}, []);
// Delete a saved game. Removes it from the "Saved games" list, clears it if it
// was the remembered active game, and heads home if it's the one currently
// shown. The server also broadcasts an SSE `error` to any *other* open tab of
// this game, which the `useSse` `onError` handler above turns into a go-home.
const runDeleteGame = useCallback(
async (id: string) => {
try {
await api.deleteGame(id);
} catch (e) {
toastError(e);
return;
}
setSavedGames((prev) => prev.filter((g) => g.id !== id));
if (activeGameId === id) {
clearActiveGameId();
setActiveGameId(null);
}
if (game?.id === id) goHome();
toast.success('Game deleted');
},
[activeGameId, game, goHome],
);
// Expose the latest game + handlers to the mount-once hashchange listener.
latestRef.current = { game, goHome, loadGame };
@@ -509,6 +538,7 @@ export default function App() {
savedGames={savedGames}
activeGameId={activeGameId}
onResume={resumeGame}
onDelete={runDeleteGame}
/>
</>
);
@@ -559,6 +589,19 @@ function GameScreen({
}: GameScreenProps) {
// Which nation's dossier to show. Defaults to the player; remounts per game.
const [viewingId, setViewingId] = useState(game.playerNationId);
// When the dossier target was set by a map click, remember which sub-region
// was clicked, for a small label in the dossier. The label shows only the
// region's name — the static parent-country code (which never updates on a
// transfer) is no longer displayed, though the info object still carries it.
// Cleared when the user picks a nation via the manual Inspect select.
const [selectedRegion, setSelectedRegion] = useState<{ parent?: string; name?: string } | null>(null);
const focusNation = useCallback(
(id: string, info?: { parent?: string; name?: string }) => {
setViewingId(id);
setSelectedRegion(info ?? null);
},
[],
);
const player = game.nations[game.playerNationId];
const viewed = game.nations[viewingId] ?? player;
const nations = Object.values(game.nations).sort((a, b) => a.name.localeCompare(b.name));
@@ -611,7 +654,7 @@ function GameScreen({
playerNationId={game.playerNationId}
nations={game.nations}
presetId={game.presetId}
onFocusNation={setViewingId}
onFocusNation={focusNation}
/>
{/* Pinned top bar: brand, turn + date, player nation, live status, Focus map.
@@ -717,7 +760,14 @@ function GameScreen({
<div className="mb-1.5 text-xs font-medium uppercase tracking-wide text-muted-foreground">
Inspect
</div>
<Select value={viewingId} onValueChange={setViewingId}>
<Select
value={viewingId}
onValueChange={(id) => {
// A manual pick supersedes a map-click selection: clear the label.
setViewingId(id);
setSelectedRegion(null);
}}
>
<SelectTrigger className="w-full" data-testid="inspect-select">
<SelectValue />
</SelectTrigger>
@@ -729,6 +779,11 @@ function GameScreen({
))}
</SelectContent>
</Select>
{selectedRegion && (
<div className="mt-1.5 truncate text-[11px] text-muted-foreground" data-testid="selected-region">
Selected: {selectedRegion.name ?? 'region'}
</div>
)}
</div>
<NationPanel nation={viewed} nations={game.nations} isPlayer={viewingId === game.playerNationId} inWindow />
</FloatingWindow>
+72 -6
View File
@@ -1,7 +1,16 @@
import { Play } from 'lucide-react';
import { useState } from 'react';
import { Play, Trash2 } from 'lucide-react';
import { Badge } from './ui/badge';
import { Button } from './ui/button';
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from './ui/card';
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from './ui/dialog';
import type { PresetMeta } from '@shared/types';
import type { GameSummary } from '@shared/protocol';
@@ -15,12 +24,14 @@ interface Props {
activeGameId?: string | null;
/** Resume a saved game by id (shared by the resume button and saved-games rows). */
onResume?: (id: string) => void;
/** Delete a saved game by id (confirmed by a dialog in this component). */
onDelete?: (id: string) => void;
}
/**
* Home screen: a grid of scenario cards (each with a Play button), a prominent
* "Resume last game" affordance, and a "Saved games" section listing prior
* games so the user can get back into one.
* games so the user can get back into one — or delete it.
*/
export default function PresetPicker({
presets,
@@ -29,8 +40,14 @@ export default function PresetPicker({
savedGames = [],
activeGameId,
onResume,
onDelete,
}: Props) {
const activeGame = activeGameId ? savedGames.find((g) => g.id === activeGameId) : undefined;
// The game awaiting a delete confirmation (null = dialog closed).
const [confirmDeleteId, setConfirmDeleteId] = useState<string | null>(null);
const confirmDeleteTarget = confirmDeleteId
? savedGames.find((g) => g.id === confirmDeleteId)
: undefined;
return (
<div className="mx-auto max-w-6xl px-6 py-10">
@@ -90,7 +107,7 @@ export default function PresetPicker({
))}
</div>
{/* Saved games: get back into any prior game. */}
{/* Saved games: get back into any prior game (or delete it). */}
{savedGames.length > 0 && (
<section className="mt-12" data-testid="saved-games">
<h2 className="mb-4 text-xl font-bold tracking-tight">Saved games</h2>
@@ -100,13 +117,28 @@ export default function PresetPicker({
key={g.id}
className="flex flex-col"
data-testid="saved-game"
data-game-id={g.id}
>
<CardHeader>
<div className="flex items-start justify-between gap-2">
<CardTitle className="text-base">{g.presetTitle}</CardTitle>
<Badge variant="secondary" className="shrink-0 text-xs">
{g.date}
</Badge>
<div className="flex shrink-0 items-center gap-1">
<Badge variant="secondary" className="text-xs">
{g.date}
</Badge>
<Button
variant="ghost"
size="icon-sm"
className="text-muted-foreground hover:text-destructive"
data-testid="delete-game"
aria-label={`Delete ${g.presetTitle}`}
title="Delete this game"
onClick={() => setConfirmDeleteId(g.id)}
disabled={loading}
>
<Trash2 />
</Button>
</div>
</div>
<CardDescription className="text-sm">Turn {g.turn}</CardDescription>
</CardHeader>
@@ -125,6 +157,40 @@ export default function PresetPicker({
</div>
</section>
)}
{/* Confirm before permanently deleting a saved game. */}
<Dialog open={confirmDeleteId !== null} onOpenChange={(o) => !o && setConfirmDeleteId(null)}>
<DialogContent className="max-w-sm" data-testid="delete-game-confirm-dialog">
<DialogHeader>
<DialogTitle>Delete this game?</DialogTitle>
<DialogDescription>
{confirmDeleteTarget
? `"${confirmDeleteTarget.presetTitle}" (turn ${confirmDeleteTarget.turn}, ${confirmDeleteTarget.date}) will be permanently removed. This cannot be undone.`
: 'This game will be permanently removed.'}
</DialogDescription>
</DialogHeader>
<DialogFooter>
<Button
variant="outline"
data-testid="delete-game-cancel"
onClick={() => setConfirmDeleteId(null)}
>
Cancel
</Button>
<Button
variant="destructive"
data-testid="delete-game-confirm"
onClick={() => {
const id = confirmDeleteId;
setConfirmDeleteId(null);
if (id) onDelete?.(id);
}}
>
Delete
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</div>
);
}
+158 -96
View File
@@ -8,11 +8,16 @@ import 'maplibre-gl/dist/maplibre-gl.css';
// Point it at a Vite-emitted copy of the worker module so it loads in prod.
import workerUrl from 'maplibre-gl/dist/maplibre-gl-worker.mjs?url';
maplibregl.setWorkerUrl(workerUrl);
import { regionOwner, type RegionMap, type RegionOwner } from '@shared/protocol';
import { mapFeatureOwner, type RegionMap, type RegionOwner } from '@shared/protocol';
import type { Nation } from '@shared/types';
import { cn } from '@/lib/utils';
// Minimal GeoJSON types (avoids a hard @types/geojson dependency).
// Minimal GeoJSON types (avoids a hard @types/geojson dependency). The choropleth
// source is the sub-national `regions.geo.json`: each feature is a sub-region with
// a stable top-level `id` (ISO 3166-2 style, e.g. `FR-57`, `US-AK`) and
// `properties = { name, parent }` where `parent` is the parent country's ISO_A3.
// As of v0.19 the top-level `id` is also the RegionMap key: ownership (and the
// LLM) live at sub-region granularity, so a nation owns individual sub-regions.
interface GeoFeature {
type: 'Feature';
id?: string | number;
@@ -27,7 +32,7 @@ type GeoSource = maplibregl.GeoJSONSource;
// Inline basemap style — a visible dark-navy background plus a subtle
// OpenFreeMap shaded-relief raster so the ocean is never pure black and terrain
// is faintly visible. The country choropleth (added in `ensureLayers`) is drawn
// is faintly visible. The regional choropleth (added in `ensureLayers`) is drawn
// on top and is the real star.
//
// Why inline instead of a remote style URL: the OFM "dark" style's vector tiles
@@ -61,7 +66,7 @@ const INLINE_STYLE: maplibregl.StyleSpecification = {
type: 'raster',
source: 'terrain',
paint: {
'raster-opacity': 0.5,
'raster-opacity': 0.15,
'raster-brightness-max': 0.8,
'raster-fade-duration': 200,
},
@@ -69,11 +74,11 @@ const INLINE_STYLE: maplibregl.StyleSpecification = {
],
};
const COUNTRIES_SOURCE = 'countries';
const REGIONS_SOURCE = 'regions';
const HOVER_SOURCE = 'hover';
const FLASH_SOURCE = 'flash';
const FILL_LAYER = 'countries-fill';
const LINE_LAYER = 'countries-line';
const FILL_LAYER = 'regions-fill';
const LINE_LAYER = 'regions-line';
const PLAYER_LINE = 'player-line';
const FLASH_LINE = 'flash-line';
const HOVER_FILL = 'hover-fill';
@@ -97,38 +102,52 @@ function cameraForPreset(presetId: string): { center: [number, number]; zoom: nu
}
/**
* Stamp the current ownership + colors onto a clone of the base geo. Each region
* carries its owner's stable fill color, a subtle stroke, and a flag for the
* player's own regions (rendered as a brighter, thicker border by a dedicated
* layer). Unknown owners fall back to a faint neutral fill — never an error.
* Stamp the current ownership + colors onto a clone of the sub-national base geo.
* Since v0.19 ownership and the LLM live at **sub-region** granularity: a nation
* owns individual sub-region ids, so each sub-region carries the color of the
* nation that owns that exact sub-region (a country can now be split between
* nations, and a sub-region in no nation's territory renders grey). Each
* sub-region therefore carries:
*
* Crucially, the base GeoJSON feature's top-level `id` (the ISO_A3 code) is
* stamped into `properties.regionId`, and the owner's id into `properties.ownerId`.
* MapLibre repacks a GeoJSON source's top-level `id` into a numeric index when it
* stores it, so a later click/hover event exposes that number on
* `e.features[i].id` — the top-level `id` is *not* a reliable lookup key at
* interaction time (the root cause of #6). `properties`, however, survive into the
* rendered features, so the interaction handlers resolve the owning nation from
* `properties.regionId` via the RegionMap (see `regionOwner`).
* - `regionId` – its own sub-region id (e.g. `FR-57`), kept in a property that
* survives into the features MapLibre hands back on click/hover
* (the top-level `id` is repacked into a numeric index, #6) —
* and the **RegionMap key** the owner is resolved through;
* - `parent` – the parent country's ISO_A3 (e.g. `FRA`); a static geographic
* fact shown in the dossier label, **not** used for ownership;
* - `fill` – the owning nation's stable color (from `RegionMap[regionId]`);
* - `owner`/`ownerId` – that nation's name/id (empty for an unowned sub-region);
* - `stroke` – a per-border alpha (owned brighter than unowned);
* - `isPlayer` – 1 when the owning nation is the player (drives the amber
* player-highlight border).
*
* Crucially, the owner lookup keys the RegionMap by the feature's **own
* sub-region id** (as `properties.regionId` at interaction time, via
* `mapFeatureOwner` in @shared/protocol) — **never** by the repacked top-level
* `id` (a MapLibre numeric index, #6) and **never** by the parent country code.
*/
function applyRegions(geo: FeatureCollection, regions: RegionMap, playerNationId: string): FeatureCollection {
const out: FeatureCollection = JSON.parse(JSON.stringify(geo));
for (const f of out.features) {
f.properties = f.properties ?? {};
// The base GeoJSON `id` is the ISO_A3 code; keep it in a property that
// survives into the features MapLibre hands back on click/hover.
const code = f.id == null ? '' : String(f.id);
f.properties.regionId = code;
const r = code ? regions[code] : undefined;
// The sub-region's own id (e.g. `FR-57`) — stamped into a property that
// survives into the rendered features (the top-level `id` gets repacked).
const regionId = f.id == null ? '' : String(f.id);
f.properties.regionId = regionId;
// The parent country's ISO_A3 (e.g. `FRA`) — a static geographic fact used
// for the dossier label only; ownership is resolved by `regionId`.
const parent = typeof f.properties.parent === 'string' ? f.properties.parent : '';
f.properties.parent = parent;
const r = regionId ? regions[regionId] : undefined;
if (r) {
f.properties.fill = r.color;
f.properties.owner = r.owner;
f.properties.ownerId = r.ownerId;
f.properties.stroke = 'rgba(255,255,255,0.10)';
f.properties.stroke = 'rgba(255,255,255,0.30)';
f.properties.isPlayer = r.ownerId === playerNationId ? 1 : 0;
} else {
f.properties.fill = 'rgba(148,163,184,0.05)';
f.properties.stroke = 'rgba(255,255,255,0.06)';
f.properties.stroke = 'rgba(255,255,255,0.14)';
f.properties.owner = '';
f.properties.ownerId = '';
f.properties.isPlayer = 0;
@@ -137,9 +156,15 @@ function applyRegions(geo: FeatureCollection, regions: RegionMap, playerNationId
return out;
}
/** Build a FeatureCollection of just the features whose id is in `codes` (cloned). */
function featuresByCodes(geo: FeatureCollection, codes: Iterable<string>): FeatureCollection {
const set = new Set(codes);
/**
* Build a FeatureCollection of just the sub-regions whose **own sub-region id**
* is in `regionIds` (cloned). Used by the territory-change flash: since v0.19
* a turn changes individual sub-regions (the RegionMap is keyed by sub-region
* id), so each changed id lights up exactly its feature — no expansion to a
* whole country needed.
*/
function featuresByRegionIds(geo: FeatureCollection, regionIds: Iterable<string>): FeatureCollection {
const set = new Set(regionIds);
const features = geo.features.filter((f) => f.id != null && set.has(String(f.id)));
return { type: 'FeatureCollection', features: JSON.parse(JSON.stringify(features)) };
}
@@ -152,14 +177,21 @@ function statRow(label: string, value?: number): string {
return `<div class="hm-stat"><span class="hm-stat-k">${label}</span><span class="hm-stat-v">${Math.round(value)}</span></div>`;
}
/** Compact hover tooltip: country, its owner (color-chipped), and 1–2 key stats. */
function hoverHtml(countryName: string, region?: RegionOwner, nation?: Nation): string {
/**
* Compact hover tooltip: the sub-region's name, its **current owner**
* (color-chipped), and 1–2 key stats. When the region has no owning nation, a
* minimal "No owner" card is shown instead. The static parent-country code
* (`properties.parent`) is deliberately NOT printed here — it is a geographic
* fact that never updates when ownership is transferred, so only the live
* owner chip (resolved from the RegionMap by sub-region id) is shown.
*/
function hoverHtml(subRegionName: string, region?: RegionOwner, nation?: Nation): string {
if (!region || !nation) {
return `<div class="hm-popup"><div class="hm-popup-title">${esc(countryName || 'Unclaimed')}</div><div class="hm-popup-sub">No owner</div></div>`;
return `<div class="hm-popup"><div class="hm-popup-title">${esc(subRegionName || 'Unclaimed')}</div><div class="hm-popup-sub">No owner</div></div>`;
}
const stats = [statRow('Mil', nation.stats.military), statRow('Eco', nation.stats.economy)].join('');
return `<div class="hm-popup">
<div class="hm-popup-title">${esc(countryName || region.owner)}</div>
<div class="hm-popup-title">${esc(subRegionName || region.owner)}</div>
<div class="hm-popup-owner"><span class="hm-chip" style="background:${region.color}"></span>${esc(region.owner)}</div>
<div class="hm-stats">${stats}</div>
</div>`;
@@ -174,27 +206,40 @@ interface Props {
presetId: string;
className?: string;
/**
* Called with a region's owning-nation id when that region is clicked, so the
* dossier switches to that nation. Not called for unowned regions (the dossier
* keeps its current target). See the component doc for the full behavior.
* Called with a region's owning-nation id when a sub-region is clicked, so the
* dossier switches to that nation. Since v0.19 the owner is the nation that
* owns that very sub-region (resolved from the RegionMap by sub-region id).
* The optional `info` carries the clicked sub-region's own name and its parent
* country's ISO_A3, for a small "which region" label in the dossier. Not
* called for unowned regions (the dossier keeps its current target). See the
* component doc for the full behavior.
*/
onFocusNation?: (id: string) => void;
onFocusNation?: (id: string, info?: { parent?: string; name?: string }) => void;
}
/**
* World basemap (MapLibre GL) + a country choropleth colored by the owning
* nation. Rendered as a fixed, full-viewport background layer (z-0) behind the
* floating HUD windows: a dark-navy basemap with subtle terrain, per-nation
* stable fills (the choropleth is the star), thin borders, a brighter/thicker
* border for the player, a hover tooltip (owner + key stats), a **click that
* switches the dossier to the region's owning nation** (no popup — see #7), a
* transient flash on territory changes, and a per-scenario initial camera.
* World basemap (MapLibre GL) + a **sub-national** choropleth. The map renders
* the finer `regions.geo.json` dataset: each country is subdivided into
* ~100–200 km sub-regions, drawn as a finer choropleth with thin internal border
* lines. Since v0.19 ownership and the LLM live at **sub-region** granularity:
* a nation owns individual sub-region ids, so each feature is filled with the
* color of the nation owning that exact sub-region (a country can be split
* between nations; unowned sub-regions render grey). Rendered as a fixed,
* full-viewport background layer (z-0) behind the floating HUD windows: a
* dark-navy basemap with subtle terrain, per-region stable fills (the
* choropleth is the star), thin sub-region borders, a brighter/thicker amber
* border for the player's regions, a hover tooltip (sub-region name + current
* owner + key stats), a **click that switches the dossier to the sub-region's
* owning nation** (no popup — see #7), a transient flash when a region's owner
* changes (lighting up exactly the changed features), and a per-scenario
* initial camera.
*
* Ownership for a hovered/clicked region is resolved from the authoritative
* RegionMap by the feature's stable ISO_A3 code in `properties.regionId`
* (see `regionOwner` in @shared/protocol) — never from the feature's top-level
* `id`, which MapLibre repacks into a numeric index at interaction time (#6).
* Unowned regions (no RegionMap entry) simply do not change the dossier.
* Ownership for a hovered/clicked sub-region is resolved from the authoritative
* RegionMap by the feature's **own sub-region id** (`properties.regionId`, via
* `mapFeatureOwner` in @shared/protocol) — never from the feature's top-level
* `id` (MapLibre repacks it into a numeric index at interaction time, #6).
* Unowned sub-regions (no RegionMap entry for the id) simply do not change the
* dossier.
*
* Zoom and pan are driven directly by the user (MapLibre wheel/trackpad + drag)
* — no floating control and no external API.
@@ -255,9 +300,9 @@ export default function WorldMap({
const loadGeo = (): Promise<FeatureCollection> =>
baseGeoRef.current
? Promise.resolve(baseGeoRef.current)
: fetch('/countries.geo.json')
: fetch('/regions.geo.json')
.then((r) => {
if (!r.ok) throw new Error(`countries.geo.json → HTTP ${r.status}`);
if (!r.ok) throw new Error(`regions.geo.json → HTTP ${r.status}`);
return r.json();
})
.then((g: FeatureCollection) => {
@@ -268,12 +313,14 @@ export default function WorldMap({
const emptyFC = (): FeatureCollection => ({ type: 'FeatureCollection', features: [] });
// Transient flash: pulse a bright outline over the changed regions, then fade
// to zero over a few seconds and self-clean. Idempotent per call.
// to zero over a few seconds and self-clean. Idempotent per call. `codes`
// are sub-region ids (the RegionMap keys that changed owner since the last
// update); each lights up exactly its feature.
function animateFlash(codes: string[]) {
const geo = baseGeoRef.current;
const src = map.getSource(FLASH_SOURCE) as GeoSource | undefined;
if (!geo || !src || cancelled) return;
src.setData(featuresByCodes(geo, codes));
src.setData(featuresByRegionIds(geo, codes));
if (!map.getLayer(FLASH_LINE)) {
// Defensive re-add (normally created by ensureLayers). Keep it beneath the
// hover highlight when that layer exists; otherwise just append.
@@ -306,33 +353,33 @@ export default function WorldMap({
}
flashApiRef.current = animateFlash;
// The region a hovered/clicked feature belongs to is identified by its stable
// ISO_A3 code, read from `properties.regionId` (stamped by `applyRegions`).
// We must NOT use the feature's top-level `id`: MapLibre repacks a GeoJSON
// source's `id` into a numeric index when it stores the source, so the value
// exposed on `e.features[i].id` at interaction time is a number, never the
// ISO_A3 — resolving the owner from it is the "no owner" bug (#6).
// The sub-region a hovered/clicked feature belongs to is identified by its
// stable sub-region id in `properties.regionId` (stamped by `applyRegions`),
// and its **owner** is resolved from the authoritative RegionMap via that
// same `properties.regionId` through `mapFeatureOwner` — since v0.19 the
// RegionMap is keyed by the sub-region's own id. Never the repacked
// top-level `id` (a numeric index, #6).
const onHover = (e: maplibregl.MapLayerMouseEvent) => {
const f = e.features?.[0];
if (!f) return;
const p = f.properties as { name?: string; regionId?: string };
const code = typeof p?.regionId === 'string' ? p.regionId : '';
if (code && code !== lastHoverId) {
lastHoverId = code;
const subId = typeof p?.regionId === 'string' ? p.regionId : '';
if (subId && subId !== lastHoverId) {
lastHoverId = subId;
const geo = baseGeoRef.current;
// The base GeoJSON feature's top-level `id` IS the ISO_A3, so match on
// that to recover the feature for the hover-highlight outline (the
// feature MapLibre hands us has a repacked numeric `id` we can't use).
const feat = geo?.features.find((x) => x.id != null && String(x.id) === code);
// The base GeoJSON feature's top-level `id` IS the sub-region id, so
// match on it to recover the exact feature for the hover-highlight
// outline (the feature MapLibre hands us has a repacked numeric `id`).
const feat = geo?.features.find((x) => x.id != null && String(x.id) === subId);
(map.getSource(HOVER_SOURCE) as GeoSource | undefined)?.setData(
feat ? { type: 'FeatureCollection', features: [JSON.parse(JSON.stringify(feat))] } : emptyFC(),
);
}
const region = regionOwner(regionsRef.current, code);
const region = mapFeatureOwner(regionsRef.current, f);
const nation = region ? nationsRef.current[region.ownerId] : undefined;
hoverPopup
.setLngLat(e.lngLat)
.setHTML(hoverHtml(p?.name ?? code, region, nation))
.setHTML(hoverHtml(p?.name ?? subId, region, nation))
.addTo(map);
map.getCanvas().style.cursor = 'pointer';
};
@@ -345,17 +392,23 @@ export default function WorldMap({
};
// #7: a click does NOT open a popup — it switches the dossier to the region's
// owning nation. The owner is resolved from the stable ISO_A3 in
// `properties.regionId` via the RegionMap (never the repacked top-level
// `f.id`, #6). A region with no owner in the RegionMap (unowned territory)
// leaves the current dossier target unchanged — never a broken dossier.
// owning nation. Since v0.19 the owner is the nation that owns **this**
// sub-region, resolved from `properties.regionId` via the RegionMap (never
// the repacked top-level `f.id`, #6). A sub-region with no owner leaves the
// current dossier target unchanged — never a broken dossier.
const onClick = (e: maplibregl.MapLayerMouseEvent) => {
const f = e.features?.[0];
if (!f) return;
const p = f.properties as { regionId?: string };
const code = typeof p?.regionId === 'string' ? p.regionId : '';
const region = regionOwner(regionsRef.current, code);
if (region?.ownerId) onFocusNationRef.current?.(region.ownerId);
const region = mapFeatureOwner(regionsRef.current, f);
if (!region?.ownerId) return;
// Carry the clicked sub-region's identity (own id/name + parent ISO_A3) so
// the dossier can show which region was selected.
const p = f.properties as { regionId?: string; parent?: string; name?: string };
const info = {
parent: typeof p?.parent === 'string' ? p.parent : undefined,
name: typeof p?.name === 'string' ? p.name : undefined,
};
onFocusNationRef.current?.(region.ownerId, info);
};
// Idempotent: (re)creates the sources + layers after any style (re)load and
@@ -363,16 +416,16 @@ export default function WorldMap({
// automatically, so no setWorkerUrl is needed.)
//
// The three choropleth sources are created up front (empty until the base
// geo arrives) so the layer structure always exists; `paintCountries` then
// stamps ownership + colors onto the countries source. This makes it immune
// geo arrives) so the layer structure always exists; `paintRegions` then
// stamps ownership + colors onto the regions source. This makes it immune
// to load-order races: if `ensureLayers` runs before the geo fetch
// resolves, the data is applied the moment the fetch lands; if the geo
// resolves first, `ensureLayers` uses it. No source is ever left stuck on
// `emptyFC()` — `ensureLayers` is retried on every `styledata`, and the
// regions effect re-paints whenever ownership changes.
const ensureSources = () => {
if (!map.getSource(COUNTRIES_SOURCE)) {
map.addSource(COUNTRIES_SOURCE, { type: 'geojson', data: emptyFC() });
if (!map.getSource(REGIONS_SOURCE)) {
map.addSource(REGIONS_SOURCE, { type: 'geojson', data: emptyFC() });
}
if (!map.getSource(HOVER_SOURCE)) {
map.addSource(HOVER_SOURCE, { type: 'geojson', data: emptyFC() });
@@ -382,10 +435,10 @@ export default function WorldMap({
}
};
// Stamp ownership + colors onto the countries source (no-op until geo loads).
const paintCountries = () => {
// Stamp ownership + colors onto the regions source (no-op until geo loads).
const paintRegions = () => {
const geo = baseGeoRef.current;
const src = map.getSource(COUNTRIES_SOURCE) as GeoSource | undefined;
const src = map.getSource(REGIONS_SOURCE) as GeoSource | undefined;
if (!geo || !src) return;
src.setData(applyRegions(geo, regionsRef.current, playerRef.current));
};
@@ -394,32 +447,39 @@ export default function WorldMap({
if (cancelled) return;
ensureSources();
if (baseGeoRef.current) {
paintCountries();
paintRegions();
} else {
try {
await loadGeo();
} catch (err) {
console.error('failed to load countries geojson', err);
console.error('failed to load regions geojson', err);
}
if (cancelled) return;
paintCountries();
paintRegions();
}
if (!map.getLayer(FILL_LAYER)) {
// The choropleth is the star: a high opacity so the vivid per-nation
// colors read clearly even on the dark background / over the terrain.
// Since v0.19 each sub-region carries the color of the nation owning
// that exact sub-region, so a country taken at region level shows the
// split directly in the fill.
map.addLayer({
id: FILL_LAYER,
type: 'fill',
source: COUNTRIES_SOURCE,
paint: { 'fill-color': ['get', 'fill'], 'fill-opacity': 0.85 },
source: REGIONS_SOURCE,
paint: { 'fill-color': ['get', 'fill'], 'fill-opacity': 1.0 },
});
}
if (!map.getLayer(LINE_LAYER)) {
// Thin internal borders: every sub-region outline at a light weight so
// the subdivision reads within each country's uniform fill. The per-
// feature `stroke` alpha keeps owned borders a touch brighter than
// unowned ones (the v0.10 treatment, thinned for the finer grid).
map.addLayer({
id: LINE_LAYER,
type: 'line',
source: COUNTRIES_SOURCE,
paint: { 'line-color': ['get', 'stroke'], 'line-width': 0.7, 'line-opacity': 0.95 },
source: REGIONS_SOURCE,
paint: { 'line-color': ['get', 'stroke'], 'line-width': 0.75, 'line-opacity': 0.95 },
});
}
// NOTE: layers are added in bottom→top order (each appends on top). The
@@ -430,7 +490,7 @@ export default function WorldMap({
map.addLayer({
id: PLAYER_LINE,
type: 'line',
source: COUNTRIES_SOURCE,
source: REGIONS_SOURCE,
filter: ['==', ['get', 'isPlayer'], 1],
paint: { 'line-color': '#f59e0b', 'line-width': 2.2, 'line-opacity': 0.95 },
});
@@ -482,8 +542,10 @@ export default function WorldMap({
};
}, []);
// Re-color the choropleth whenever ownership changes, and flash any regions
// whose owner changed since the last update (transient, self-cleaning).
// Re-color the choropleth whenever ownership changes, and flash any sub-region
// whose owner changed since the last update (a transient, self-cleaning pulse).
// The diff is over the sub-region-id-keyed RegionMap; `animateFlash` lights up
// exactly the features whose own id changed owner.
useEffect(() => {
const map = mapRef.current;
const geo = baseGeoRef.current;
@@ -494,14 +556,14 @@ export default function WorldMap({
if (Object.keys(cur).length > 0) primedRef.current = true;
if (map && geo) {
const src = map.getSource(COUNTRIES_SOURCE) as GeoSource | undefined;
const src = map.getSource(REGIONS_SOURCE) as GeoSource | undefined;
if (src) void src.setData(applyRegions(geo, cur, playerNationId));
}
if (wasPrimed && prev) {
const changed = new Set<string>();
for (const code of new Set([...Object.keys(prev), ...Object.keys(cur)])) {
if ((prev[code]?.ownerId ?? '') !== (cur[code]?.ownerId ?? '')) changed.add(code);
for (const regionId of new Set([...Object.keys(prev), ...Object.keys(cur)])) {
if ((prev[regionId]?.ownerId ?? '') !== (cur[regionId]?.ownerId ?? '')) changed.add(regionId);
}
if (changed.size > 0) flashApiRef.current?.([...changed]);
}
+4
View File
@@ -7,6 +7,7 @@ import type {
AddDiplomacyResponse,
AdvisorResponse,
CreateGameResponse,
DeleteGameResponse,
GameSummary,
RemoveQueueItemResponse,
TurnResponse,
@@ -33,6 +34,9 @@ export const api = {
body: JSON.stringify({ presetId, playerNationId }),
}),
getGame: (id: string) => req<{ game: GameState }>(`/api/games/${id}`),
// Delete a saved game entirely. Fast, non-LLM. Returns { deleted: true }.
deleteGame: (id: string) =>
req<DeleteGameResponse>(`/api/games/${id}`, { method: 'DELETE' }),
// Every saved game as a lightweight summary, newest-updated first (for the
// home screen's "Saved games" section / resume affordances).
listGames: () => req<{ games: GameSummary[] }>('/api/games'),
+17
View File
@@ -5,6 +5,12 @@ import type { TurnResult } from '@shared/protocol';
interface SseHandlers {
onState?: (state: GameState) => void;
onTurn?: (state: GameState, result: TurnResult) => void;
/**
* Fired for a server-sent NAMED `event: error` (a MessageEvent with a JSON
* body `{ message }`) — e.g. the game was deleted or no longer exists. Pure
* connection errors (no data) are ignored and EventSource auto-reconnects.
*/
onError?: (message: string) => void;
}
/**
@@ -37,8 +43,19 @@ export function useSse(id: string | null, handlers: SseHandlers): void {
/* ignore malformed */
}
};
const onError = (e: Event) => {
if (e instanceof MessageEvent && e.data) {
try {
const d = JSON.parse(e.data) as { message?: string };
if (d.message) handlersRef.current.onError?.(d.message);
} catch {
/* ignore malformed */
}
}
};
es.addEventListener('state', onState);
es.addEventListener('turn', onTurn);
es.addEventListener('error', onError);
return () => es.close();
}, [id]);
}
+1 -1
View File
@@ -20,5 +20,5 @@
"@/*": ["./src/*"]
}
},
"include": ["src", "server", "shared", "e2e", "vite.config.ts"]
"include": ["src", "server", "shared", "e2e", "scripts", "vite.config.ts"]
}
+1 -1
View File
@@ -13,7 +13,7 @@ export default defineConfig({
},
test: {
environment: 'node',
include: ['server/**/*.test.ts'],
include: ['server/**/*.test.ts', 'scripts/**/*.test.ts'],
testTimeout: 20000,
hookTimeout: 20000,
},