Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9c29779572 | ||
|
|
3cd8dcecfa | ||
|
|
acb4f0800f | ||
|
|
b1081eefde | ||
|
|
e92bf47d7d | ||
|
|
f1cc4fbc10 | ||
|
|
97702940cd | ||
|
|
8eedc37e05 |
@@ -2,6 +2,35 @@
|
||||
|
||||
All notable changes to **History** are listed here, newest first.
|
||||
|
||||
## 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.
|
||||
|
||||
Generated
+2387
-2
File diff suppressed because it is too large
Load Diff
+12
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "history",
|
||||
"version": "0.14.0",
|
||||
"version": "0.18.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"description": "AI-driven alternate-history simulator — the LLM is the world engine (Pax Historia style).",
|
||||
@@ -11,6 +11,9 @@
|
||||
"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"
|
||||
@@ -40,6 +43,14 @@
|
||||
"@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",
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -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();
|
||||
@@ -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}`);
|
||||
+216
-11
@@ -12,9 +12,16 @@
|
||||
* Tiny or uncovered countries collapse to a single whole-country region
|
||||
* (`<ISO_A3>-01`).
|
||||
*
|
||||
* This test is self-contained (no import of the generator): it re-implements
|
||||
* the same planar area model the generator/analysis use, so the area-based
|
||||
* assertions measure the same quantity:
|
||||
* 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)
|
||||
*
|
||||
@@ -22,6 +29,11 @@
|
||||
* 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';
|
||||
@@ -77,6 +89,50 @@ function median(nums: number[]): number {
|
||||
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 {
|
||||
@@ -112,6 +168,9 @@ for (const f of regions.features)
|
||||
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) ------
|
||||
|
||||
@@ -326,14 +385,54 @@ describe('regions.geo.json', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('sums to within [40%, 175%] of each country area (median in [70%, 130%])', () => {
|
||||
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), so for a handful of small/island nations the region union
|
||||
// over/under-fills the country: measured range is ~[52%, 151%]
|
||||
// (Brunei under-fills, Vanuatu over-fills). The band brackets that with
|
||||
// margin while still catching a genuinely missing or doubled-up region.
|
||||
// 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;
|
||||
@@ -347,8 +446,8 @@ describe('regions.geo.json', () => {
|
||||
if (ratio < minRatio) { minRatio = ratio; minId = c.id; }
|
||||
if (ratio > maxRatio) { maxRatio = ratio; maxId = c.id; }
|
||||
expect(
|
||||
ratio >= 0.4 && ratio <= 1.75,
|
||||
`${c.id}: coverage ${(100 * ratio).toFixed(1)}% is outside [40%, 175%]`,
|
||||
ratio >= 0.4 && ratio <= 1.9,
|
||||
`${c.id}: coverage ${(100 * ratio).toFixed(1)}% is outside [40%, 190%]`,
|
||||
).toBe(true);
|
||||
}
|
||||
const medRatio = median(ratios);
|
||||
@@ -359,7 +458,113 @@ describe('regions.geo.json', () => {
|
||||
console.log(
|
||||
`\n coverage range: min ${minId} ${(100 * minRatio).toFixed(1)}%` +
|
||||
` / median ${(100 * medRatio).toFixed(1)}%` +
|
||||
` / max ${maxId} ${(100 * maxRatio).toFixed(1)}% (band 40–175%)`,
|
||||
` / 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`,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -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();
|
||||
+5
-4
@@ -590,8 +590,10 @@ function GameScreen({
|
||||
// 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
|
||||
// (its own name + parent country) was clicked, for a small label in the
|
||||
// dossier. Cleared when the user picks a nation via the manual Inspect select.
|
||||
// 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 }) => {
|
||||
@@ -779,8 +781,7 @@ function GameScreen({
|
||||
</Select>
|
||||
{selectedRegion && (
|
||||
<div className="mt-1.5 truncate text-[11px] text-muted-foreground" data-testid="selected-region">
|
||||
Selected: {selectedRegion.name ?? selectedRegion.parent ?? 'region'}
|
||||
{selectedRegion.parent ? ` (${selectedRegion.parent})` : ''}
|
||||
Selected: {selectedRegion.name ?? 'region'}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
+11
-11
@@ -174,19 +174,20 @@ function statRow(label: string, value?: number): string {
|
||||
}
|
||||
|
||||
/**
|
||||
* Compact hover tooltip: the sub-region's name, its parent country (ISO_A3), its
|
||||
* owner (color-chipped), and 1–2 key stats. When the parent country has no
|
||||
* owning nation, a minimal "No owner" card is shown instead.
|
||||
* Compact hover tooltip: the sub-region's name, its **current owner**
|
||||
* (color-chipped), and 1–2 key stats. When the region's country 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 never updates when ownership is transferred, so only the live owner chip
|
||||
* (resolved from the RegionMap) is shown.
|
||||
*/
|
||||
function hoverHtml(subRegionName: string, parentCode: string, region?: RegionOwner, nation?: Nation): string {
|
||||
function hoverHtml(subRegionName: string, region?: RegionOwner, nation?: Nation): string {
|
||||
if (!region || !nation) {
|
||||
return `<div class="hm-popup"><div class="hm-popup-title">${esc(subRegionName || parentCode || '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('');
|
||||
const sub = parentCode ? `<div class="hm-popup-sub">${esc(parentCode)}</div>` : '';
|
||||
return `<div class="hm-popup">
|
||||
<div class="hm-popup-title">${esc(subRegionName || region.owner)}</div>
|
||||
${sub}
|
||||
<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>`;
|
||||
@@ -221,7 +222,7 @@ interface Props {
|
||||
* layer (z-0) behind the floating HUD windows: a dark-navy basemap with subtle
|
||||
* terrain, per-nation stable fills (uniform per country, the choropleth is the
|
||||
* star), thin sub-region borders, a brighter/thicker amber border for the
|
||||
* player's countries, a hover tooltip (sub-region name + parent country + owner
|
||||
* player's countries, a hover tooltip (sub-region name + current owner
|
||||
* + key stats), a **click that switches the dossier to the sub-region's parent
|
||||
* country's owning nation** (no popup — see #7), a transient flash when a
|
||||
* country's owner changes (lighting up all its sub-regions), and a per-scenario
|
||||
@@ -355,9 +356,8 @@ export default function WorldMap({
|
||||
const onHover = (e: maplibregl.MapLayerMouseEvent) => {
|
||||
const f = e.features?.[0];
|
||||
if (!f) return;
|
||||
const p = f.properties as { name?: string; regionId?: string; parent?: string };
|
||||
const p = f.properties as { name?: string; regionId?: string };
|
||||
const subId = typeof p?.regionId === 'string' ? p.regionId : '';
|
||||
const parent = typeof p?.parent === 'string' ? p.parent : '';
|
||||
if (subId && subId !== lastHoverId) {
|
||||
lastHoverId = subId;
|
||||
const geo = baseGeoRef.current;
|
||||
@@ -373,7 +373,7 @@ export default function WorldMap({
|
||||
const nation = region ? nationsRef.current[region.ownerId] : undefined;
|
||||
hoverPopup
|
||||
.setLngLat(e.lngLat)
|
||||
.setHTML(hoverHtml(p?.name ?? parent ?? subId, parent, region, nation))
|
||||
.setHTML(hoverHtml(p?.name ?? subId, region, nation))
|
||||
.addTo(map);
|
||||
map.getCanvas().style.cursor = 'pointer';
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user