Merge the pilot (cf0146775: pins-in-state) into the poster type registry
This commit is contained in:
Doxa Maps
commit
dd4131907a
3 changed files with 445 additions and 6 deletions
237
library/packet/pins-in-state.js
Normal file
237
library/packet/pins-in-state.js
Normal file
|
|
@ -0,0 +1,237 @@
|
|||
/**
|
||||
* pins-in-state.js — place people-group pins on a multi-state poster so that
|
||||
* (a) no two pins overlap (every pair ≥ 2r+gap apart, where feasible), AND
|
||||
* (b) every pin stays inside its OWN state's land.
|
||||
*
|
||||
* It is a self-contained copy of the poster engine's pin de-overlap relaxation
|
||||
* (poster-render.js, the pass that settles the `_fixed` pins): a repulsion loop
|
||||
* in pixel space that pushes any pair closer than MIN_SEP apart along the line
|
||||
* between them, capped so a pin never drifts far from its true position. The one
|
||||
* addition is the state constraint: where the engine re-anchors a drifted pin to
|
||||
* the map rect, this re-anchors it to its state polygon — a pin pushed outside is
|
||||
* pulled back to the nearest point just inside (by `inset`). The engine is read,
|
||||
* not called, so the whole-India classic4 mode can own the constraint without
|
||||
* reaching into the renderer.
|
||||
*
|
||||
* PX ONLY. Pins and polygons arrive already projected to poster pixels through
|
||||
* the renderer's own proj(lng,lat); this module never projects.
|
||||
*
|
||||
* DETERMINISTIC. Fixed iteration order, golden-angle split for exact coincidence,
|
||||
* no Math.random — the same input yields the same output bytes, so the sheet is
|
||||
* stable across runs.
|
||||
*
|
||||
* @param {object} opts
|
||||
* @param {Array} opts.pins [{ id, x, y, stateId }] in poster px. Not mutated.
|
||||
* @param {object} opts.states { [stateId]: polygonsPx }, where polygonsPx is a
|
||||
* GeoJSON-Polygon-like list of PARTS; each part is
|
||||
* [outerRing, ...holeRings]; each ring is [[x,y],…]
|
||||
* in px. "Inside the state" = inside ANY part's
|
||||
* outer ring and outside that part's holes.
|
||||
* @param {number} opts.r pin radius in px.
|
||||
* @param {number} [opts.gap=0] extra clearance between pin edges; MIN_SEP = 2r+gap.
|
||||
* @param {number} [opts.iters=260] relaxation passes (matches the engine).
|
||||
* @param {number} [opts.maxDrift=58] hard cap on how far a pin may move from truth.
|
||||
* @param {number} [opts.inset=0.5] how far INSIDE the boundary a pulled-back pin lands.
|
||||
* @returns {{
|
||||
* pins: Array<{id,x,y,stateId,moved:boolean,dx:number,dy:number}>,
|
||||
* moved: number, maxDisp: number, meanDisp: number,
|
||||
* overlapsRemaining: number,
|
||||
* outsideState: number,
|
||||
* infeasible: Array<{ stateId: string, pins: Array }>,
|
||||
* }}
|
||||
*/
|
||||
export function placePinsInState({ pins, states, r, gap = 0, iters = 260, maxDrift = 58, inset = 0.5 }) {
|
||||
if (!Array.isArray(pins)) throw new TypeError('pins must be an array');
|
||||
if (!states || typeof states !== 'object') throw new TypeError('states must be an object');
|
||||
if (!(r > 0)) throw new TypeError('r must be a positive number');
|
||||
|
||||
const MIN_SEP = r * 2 + gap;
|
||||
|
||||
// Working copy — input is never mutated. _ox/_oy hold the true (projected) origin.
|
||||
const work = pins.map((p) => ({
|
||||
id: p.id, stateId: p.stateId,
|
||||
x: p.x, y: p.y, _ox: p.x, _oy: p.y,
|
||||
}));
|
||||
|
||||
// Resolve each pin's state parts once. A pin whose stateId has no polygon is
|
||||
// left unconstrained by the land test (it still de-overlaps) and is reported.
|
||||
const partsOf = (stateId) => {
|
||||
const poly = states[stateId];
|
||||
return Array.isArray(poly) ? poly : null;
|
||||
};
|
||||
|
||||
for (let pass = 0; pass < iters; pass++) {
|
||||
let moved = false;
|
||||
|
||||
// Pairwise repulsion — same shape as the engine's pass, same fixed order.
|
||||
for (let i = 0; i < work.length; i++) {
|
||||
for (let j = i + 1; j < work.length; j++) {
|
||||
const a = work[i], b = work[j];
|
||||
let dx = b.x - a.x, dy = b.y - a.y;
|
||||
let dist = Math.hypot(dx, dy);
|
||||
if (dist >= MIN_SEP) continue;
|
||||
if (dist < 0.0001) { // exactly coincident — split on a
|
||||
const ang = i * 2.399963; // golden angle, deterministic
|
||||
dx = Math.cos(ang); dy = Math.sin(ang); dist = 1;
|
||||
}
|
||||
const push = (MIN_SEP - dist) / 2 + 0.15;
|
||||
const ux = dx / dist, uy = dy / dist;
|
||||
a.x -= ux * push; a.y -= uy * push;
|
||||
b.x += ux * push; b.y += uy * push;
|
||||
moved = true;
|
||||
}
|
||||
}
|
||||
|
||||
// Re-anchor: cap drift from truth, then keep each pin inside its own state.
|
||||
for (const it of work) {
|
||||
const ddx = it.x - it._ox, ddy = it.y - it._oy;
|
||||
const d = Math.hypot(ddx, ddy);
|
||||
if (d > maxDrift) { it.x = it._ox + (ddx / d) * maxDrift; it.y = it._oy + (ddy / d) * maxDrift; }
|
||||
const parts = partsOf(it.stateId);
|
||||
if (parts && !pointInState(it.x, it.y, parts)) {
|
||||
const near = nearestInside(it.x, it.y, parts, inset);
|
||||
it.x = near.x; it.y = near.y;
|
||||
}
|
||||
}
|
||||
|
||||
if (!moved) break;
|
||||
}
|
||||
|
||||
// ── Report ────────────────────────────────────────────────────────────────
|
||||
let maxDisp = 0, sumDisp = 0, movedCount = 0, outsideState = 0;
|
||||
const outPins = work.map((it) => {
|
||||
const dx = it.x - it._ox, dy = it.y - it._oy;
|
||||
const disp = Math.hypot(dx, dy);
|
||||
const didMove = disp > 1e-6;
|
||||
if (didMove) { movedCount++; sumDisp += disp; if (disp > maxDisp) maxDisp = disp; }
|
||||
const parts = partsOf(it.stateId);
|
||||
if (parts && !pointInState(it.x, it.y, parts)) outsideState++;
|
||||
return { id: it.id, x: it.x, y: it.y, stateId: it.stateId, moved: didMove, dx, dy };
|
||||
});
|
||||
|
||||
// Overlaps remaining: count unordered pairs still closer than MIN_SEP.
|
||||
let overlapsRemaining = 0;
|
||||
const infeasibleByState = new Map();
|
||||
for (let i = 0; i < outPins.length; i++) {
|
||||
for (let j = i + 1; j < outPins.length; j++) {
|
||||
const a = outPins[i], b = outPins[j];
|
||||
if (Math.hypot(b.x - a.x, b.y - a.y) < MIN_SEP - 1e-6) {
|
||||
overlapsRemaining++;
|
||||
// An overlap that survives is a feasibility failure of the state(s)
|
||||
// holding these pins — record both so nothing is silently stacked.
|
||||
for (const p of [a, b]) {
|
||||
if (!infeasibleByState.has(p.stateId)) infeasibleByState.set(p.stateId, new Set());
|
||||
infeasibleByState.get(p.stateId).add(p.id);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const infeasible = [...infeasibleByState.entries()]
|
||||
.map(([stateId, ids]) => ({ stateId, pins: [...ids] }))
|
||||
.sort((p, q) => String(p.stateId).localeCompare(String(q.stateId)));
|
||||
|
||||
return {
|
||||
pins: outPins,
|
||||
moved: movedCount,
|
||||
maxDisp,
|
||||
meanDisp: movedCount ? sumDisp / movedCount : 0,
|
||||
overlapsRemaining,
|
||||
outsideState,
|
||||
infeasible,
|
||||
};
|
||||
}
|
||||
|
||||
// ── Geometry (self-contained; px space) ───────────────────────────────────────
|
||||
|
||||
// Ray-casting point-in-ring. A point ON an edge counts as inside (poster pins on
|
||||
// a coast must not be rejected for landing exactly on the line).
|
||||
function pointInRing(x, y, ring) {
|
||||
let inside = false;
|
||||
for (let i = 0, k = ring.length - 1; i < ring.length; k = i++) {
|
||||
const xi = ring[i][0], yi = ring[i][1];
|
||||
const xk = ring[k][0], yk = ring[k][1];
|
||||
const intersect = ((yi > y) !== (yk > y)) &&
|
||||
(x < ((xk - xi) * (y - yi)) / ((yk - yi) || 1e-12) + xi);
|
||||
if (intersect) inside = !inside;
|
||||
}
|
||||
return inside;
|
||||
}
|
||||
|
||||
// Inside the state = inside ANY part's outer ring AND outside that part's holes.
|
||||
function pointInState(x, y, parts) {
|
||||
for (const part of parts) {
|
||||
if (!part || !part.length) continue;
|
||||
const [outer, ...holes] = part;
|
||||
if (!outer || outer.length < 3) continue;
|
||||
if (!pointInRing(x, y, outer)) continue;
|
||||
let inHole = false;
|
||||
for (const h of holes) { if (h && h.length >= 3 && pointInRing(x, y, h)) { inHole = true; break; } }
|
||||
if (!inHole) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// Nearest point ON a ring's edges to (x,y), as {x,y,d2}.
|
||||
function nearestOnRing(x, y, ring) {
|
||||
let best = null;
|
||||
for (let i = 0, k = ring.length - 1; i < ring.length; k = i++) {
|
||||
const p = nearestOnSegment(x, y, ring[k][0], ring[k][1], ring[i][0], ring[i][1]);
|
||||
if (!best || p.d2 < best.d2) best = p;
|
||||
}
|
||||
return best;
|
||||
}
|
||||
|
||||
function nearestOnSegment(px, py, ax, ay, bx, by) {
|
||||
const abx = bx - ax, aby = by - ay;
|
||||
const len2 = abx * abx + aby * aby;
|
||||
let t = len2 ? ((px - ax) * abx + (py - ay) * aby) / len2 : 0;
|
||||
t = t < 0 ? 0 : t > 1 ? 1 : t;
|
||||
const x = ax + t * abx, y = ay + t * aby;
|
||||
const dx = px - x, dy = py - y;
|
||||
return { x, y, d2: dx * dx + dy * dy };
|
||||
}
|
||||
|
||||
// Pull an outside point to the nearest point just INSIDE the state, by `inset`.
|
||||
// Nearest boundary over ALL parts' rings (outer + holes), then step inward along
|
||||
// the direction from the boundary toward the pin, re-tested; if that still reads
|
||||
// outside (a thin neck), fall to the nearest part's centroid, which is inside a
|
||||
// simple part by construction and a safe honest fallback for a degenerate one.
|
||||
function nearestInside(x, y, parts, inset) {
|
||||
let best = null, bestPart = null;
|
||||
for (const part of parts) {
|
||||
for (const ring of part) {
|
||||
if (!ring || ring.length < 2) continue;
|
||||
const cand = nearestOnRing(x, y, ring);
|
||||
if (cand && (!best || cand.d2 < best.d2)) { best = cand; bestPart = part; }
|
||||
}
|
||||
}
|
||||
if (!best) return { x, y };
|
||||
// Step from the boundary toward the original pin (inward for an outer edge);
|
||||
// if the pin sat in a hole this points out of the hole, also inward to land.
|
||||
const vx = x - best.x, vy = y - best.y;
|
||||
const vlen = Math.hypot(vx, vy) || 1;
|
||||
let nx = best.x + (vx / vlen) * inset;
|
||||
let ny = best.y + (vy / vlen) * inset;
|
||||
if (pointInState(nx, ny, parts)) return { x: nx, y: ny };
|
||||
// Thin-neck fallback: step the other way, then the part centroid.
|
||||
nx = best.x - (vx / vlen) * inset; ny = best.y - (vy / vlen) * inset;
|
||||
if (pointInState(nx, ny, parts)) return { x: nx, y: ny };
|
||||
const c = ringCentroid(bestPart[0]);
|
||||
return pointInState(c.x, c.y, parts) ? c : { x: best.x, y: best.y };
|
||||
}
|
||||
|
||||
function ringCentroid(ring) {
|
||||
let a = 0, cx = 0, cy = 0;
|
||||
for (let i = 0, k = ring.length - 1; i < ring.length; k = i++) {
|
||||
const cross = ring[k][0] * ring[i][1] - ring[i][0] * ring[k][1];
|
||||
a += cross; cx += (ring[k][0] + ring[i][0]) * cross; cy += (ring[k][1] + ring[i][1]) * cross;
|
||||
}
|
||||
if (Math.abs(a) < 1e-9) { // degenerate: mean of vertices
|
||||
let mx = 0, my = 0; for (const p of ring) { mx += p[0]; my += p[1]; }
|
||||
return { x: mx / ring.length, y: my / ring.length };
|
||||
}
|
||||
return { x: cx / (3 * a), y: cy / (3 * a) };
|
||||
}
|
||||
|
||||
export default placePinsInState;
|
||||
200
library/packet/scripts/check-pins-in-state.mjs
Normal file
200
library/packet/scripts/check-pins-in-state.mjs
Normal file
|
|
@ -0,0 +1,200 @@
|
|||
#!/usr/bin/env node
|
||||
/**
|
||||
* check-pins-in-state.mjs — unit check for library/packet/pins-in-state.js.
|
||||
*
|
||||
* Verifies, at the whole-India 60x96in poster's px scale (sheet 2500x4000,
|
||||
* PIN_R_BASE 8.0, MIN_SEP = 2r*1.16 ≈ the engine's), that placePinsInState():
|
||||
* 1. leaves 0 pins outside their own state polygon,
|
||||
* 2. leaves 0 overlaps that are NOT reported in `infeasible`,
|
||||
* 3. is DETERMINISTIC (two runs, identical output), and
|
||||
* 4. is poison-tested: a state too small for its pins is NAMED in `infeasible`,
|
||||
* never silently overlapped.
|
||||
*
|
||||
* Runs on the REAL India data when it is present (the state-assignment JSON that
|
||||
* reg-post provides); otherwise on a self-contained synthetic 60x96 fixture, so
|
||||
* the gate is runnable now and tightens automatically once the data lands. A
|
||||
* vacuous pass is refused: the run asserts a floor on how many pins it exercised.
|
||||
*
|
||||
* No browser, no network. Exit 0 PASS, 1 FAIL (reason flushed first), 75 NOT
|
||||
* MEASURED only if the module cannot be imported.
|
||||
*/
|
||||
import { readFileSync, existsSync } from 'node:fs';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { dirname, resolve } from 'node:path';
|
||||
|
||||
const HERE = dirname(fileURLToPath(import.meta.url));
|
||||
const REPO = resolve(HERE, '..', '..', '..');
|
||||
|
||||
let placePinsInState;
|
||||
try {
|
||||
({ placePinsInState } = await import('../pins-in-state.js'));
|
||||
} catch (e) {
|
||||
console.error(`NOT MEASURED: cannot import pins-in-state.js — ${e.message}`);
|
||||
process.exitCode = 75;
|
||||
}
|
||||
|
||||
if (placePinsInState) {
|
||||
// ── Scale constants, taken from poster-render.js for the 60x96 sheet ─────────
|
||||
const SHEET_W = 2500, SHEET_H = 4000; // '60x96': { w:2500, h:4000 }
|
||||
const GUTTER = 572;
|
||||
const MAP_X = GUTTER, MAP_W = SHEET_W - 2 * GUTTER; // ≈1356
|
||||
const MAP_Y = 360, MAP_H = SHEET_H - 760; // generous India map band
|
||||
const R = 8.0; // PIN_R_BASE
|
||||
const GAP = R * 2 * 0.16; // MIN_SEP = 2r+GAP ≈ 2r*1.16
|
||||
const MIN_SEP = R * 2 + GAP;
|
||||
|
||||
let pins, states, source;
|
||||
const real = findRealData();
|
||||
if (real) { ({ pins, states } = real); source = 'REAL India data'; }
|
||||
else { ({ pins, states } = synthFixture()); source = 'synthetic 60x96 fixture'; }
|
||||
|
||||
const FLOOR = 200; // refuse a vacuous pass
|
||||
const fails = [];
|
||||
const note = [];
|
||||
|
||||
if (pins.length < FLOOR) {
|
||||
fails.push(`exercised only ${pins.length} pins (floor ${FLOOR}) — vacuous`);
|
||||
}
|
||||
|
||||
// ── 1+2: the real placement ─────────────────────────────────────────────────
|
||||
const res = placePinsInState({ pins, states, r: R, gap: GAP, maxDrift: 58 });
|
||||
note.push(`${source}: ${pins.length} pins across ${Object.keys(states).length} states`);
|
||||
note.push(`moved ${res.moved}, maxDisp ${res.maxDisp.toFixed(1)}px, meanDisp ${res.meanDisp.toFixed(1)}px, ` +
|
||||
`overlapsRemaining ${res.overlapsRemaining}, outsideState ${res.outsideState}, ` +
|
||||
`infeasible states ${res.infeasible.length}`);
|
||||
|
||||
if (res.outsideState !== 0) fails.push(`${res.outsideState} pins ended OUTSIDE their own state`);
|
||||
|
||||
// Input must be unmutated.
|
||||
if (pins.some((p, i) => p.x !== (real ? real.origX[i] : p.x))) { /* only meaningful for real */ }
|
||||
|
||||
// Every surviving overlap must be accounted for in `infeasible`.
|
||||
const infeasibleIds = new Set(res.infeasible.flatMap((f) => f.pins));
|
||||
let unaccountedOverlaps = 0;
|
||||
for (let i = 0; i < res.pins.length; i++) {
|
||||
for (let j = i + 1; j < res.pins.length; j++) {
|
||||
const a = res.pins[i], b = res.pins[j];
|
||||
if (Math.hypot(b.x - a.x, b.y - a.y) < MIN_SEP - 1e-6) {
|
||||
if (!infeasibleIds.has(a.id) || !infeasibleIds.has(b.id)) unaccountedOverlaps++;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (unaccountedOverlaps !== 0) fails.push(`${unaccountedOverlaps} overlaps NOT reported in infeasible (silent stacking)`);
|
||||
|
||||
// ── 3: determinism ───────────────────────────────────────────────────────────
|
||||
const res2 = placePinsInState({ pins, states, r: R, gap: GAP, maxDrift: 58 });
|
||||
const same = JSON.stringify(res.pins) === JSON.stringify(res2.pins);
|
||||
if (!same) fails.push('NON-DETERMINISTIC: two runs produced different output');
|
||||
|
||||
// ── 4: poison — a UT too small to hold its pins must be NAMED infeasible ──────
|
||||
const poison = poisonFixture(R, GAP);
|
||||
const pres = placePinsInState({ pins: poison.pins, states: poison.states, r: R, gap: GAP });
|
||||
const poisonNamed = pres.infeasible.some((f) => f.stateId === 'tiny-UT' && f.pins.length >= 2);
|
||||
// Count overlaps inside the tiny UT; they MUST all be reported (not silent).
|
||||
let poisonSilent = 0;
|
||||
for (let i = 0; i < pres.pins.length; i++)
|
||||
for (let j = i + 1; j < pres.pins.length; j++) {
|
||||
const a = pres.pins[i], b = pres.pins[j];
|
||||
if (Math.hypot(b.x - a.x, b.y - a.y) < MIN_SEP - 1e-6) {
|
||||
const ids = new Set(pres.infeasible.flatMap((f) => f.pins));
|
||||
if (!ids.has(a.id) || !ids.has(b.id)) poisonSilent++;
|
||||
}
|
||||
}
|
||||
if (!poisonNamed) fails.push('POISON: a too-small state was NOT named in infeasible');
|
||||
if (poisonSilent !== 0) fails.push(`POISON: ${poisonSilent} overlaps in the tiny state went unreported`);
|
||||
// Poison pins must still be INSIDE the tiny state (constraint beats separation).
|
||||
if (pres.outsideState !== 0) fails.push(`POISON: ${pres.outsideState} pins escaped the tiny state`);
|
||||
note.push(`poison: tiny-UT named=${poisonNamed}, silent overlaps=${poisonSilent}, outside=${pres.outsideState}`);
|
||||
|
||||
// ── 5: multipolygon + hole + island-fallback paths (the island/coast cases) ──
|
||||
{
|
||||
const outer = [[100, 100], [400, 100], [400, 400], [100, 400], [100, 100]];
|
||||
const hole = [[200, 200], [300, 200], [300, 300], [200, 300], [200, 200]];
|
||||
const island = [[600, 100], [680, 100], [680, 180], [600, 180], [600, 100]];
|
||||
const mstates = { A: [[outer, hole], [island]] };
|
||||
const mpins = [
|
||||
{ id: 'inHole', x: 250, y: 250, stateId: 'A' }, // in the mainland hole → must leave it
|
||||
{ id: 'onIsland', x: 640, y: 140, stateId: 'A' }, // on the island part → inside
|
||||
{ id: 'mainland', x: 150, y: 150, stateId: 'A' }, // inside mainland
|
||||
];
|
||||
const mres = placePinsInState({ pins: mpins, states: mstates, r: R, gap: GAP });
|
||||
if (mres.outsideState !== 0) fails.push(`multipoly: ${mres.outsideState} pins outside a 2-part state with a hole`);
|
||||
const moved = mres.pins.find((p) => p.id === 'inHole');
|
||||
if (Math.abs(moved.dx) + Math.abs(moved.dy) < 1e-6) fails.push('multipoly: the in-hole pin was not moved onto land');
|
||||
|
||||
// Island fallback: a pin geocoded OFF its state is pulled onto the state's land.
|
||||
const istates = { Lakshadweep: [[[[50, 50], [90, 50], [90, 90], [50, 90], [50, 50]]]] };
|
||||
const ires = placePinsInState({ pins: [{ id: 'offshore', x: 300, y: 300, stateId: 'Lakshadweep' }], states: istates, r: R, gap: GAP });
|
||||
if (ires.outsideState !== 0) fails.push('island: an offshore pin was not pulled onto its state');
|
||||
note.push(`multipoly+hole outside=${mres.outsideState}, in-hole moved=${(Math.abs(moved.dx) + Math.abs(moved.dy) > 1e-6)}; island pulled ${Math.hypot(ires.pins[0].dx, ires.pins[0].dy).toFixed(1)}px onto land`);
|
||||
}
|
||||
|
||||
for (const n of note) console.log(` · ${n}`);
|
||||
if (fails.length) {
|
||||
console.error(`FAIL check:pins-in-state (${source})`);
|
||||
for (const f of fails) console.error(` ✗ ${f}`);
|
||||
process.exitCode = 1;
|
||||
} else {
|
||||
console.log(`PASS check:pins-in-state — ${pins.length} pins, 0 outside-state, 0 silent overlaps, deterministic, poison caught (${source})`);
|
||||
}
|
||||
}
|
||||
|
||||
// ── Real-data loader (best-effort; the shapes reg-post controls) ───────────────
|
||||
function findRealData() {
|
||||
// Candidate committed locations for the India state-assignment + boundary px.
|
||||
const candidates = [
|
||||
'plugin-designs/country-posters/data/india-pins-in-state.json',
|
||||
'plugin-designs/country-posters/data/india-state-pins-px.json',
|
||||
];
|
||||
for (const rel of candidates) {
|
||||
const p = resolve(REPO, rel);
|
||||
if (!existsSync(p)) continue;
|
||||
try {
|
||||
const j = JSON.parse(readFileSync(p, 'utf8'));
|
||||
if (Array.isArray(j.pins) && j.states && typeof j.states === 'object') {
|
||||
const origX = j.pins.map((q) => q.x);
|
||||
return { pins: j.pins, states: j.states, origX };
|
||||
}
|
||||
} catch { /* fall through to synthetic */ }
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// ── Synthetic 60x96 fixture: a grid of states, pins clustered so de-overlap bites,
|
||||
// every pin tagged to the state it sits in. Deterministic, ≥ FLOOR pins. ──────
|
||||
function synthFixture() {
|
||||
const states = {};
|
||||
const pins = [];
|
||||
const COLS = 6, ROWS = 7; // 42 states
|
||||
const CW = 1356 / COLS, CH = 2600 / ROWS; // within the India map band
|
||||
const X0 = 572, Y0 = 400, PAD = 6;
|
||||
let pid = 0;
|
||||
for (let c = 0; c < COLS; c++) {
|
||||
for (let r = 0; r < ROWS; r++) {
|
||||
const id = `S${c}-${r}`;
|
||||
const x0 = X0 + c * CW + PAD, y0 = Y0 + r * CH + PAD;
|
||||
const x1 = X0 + (c + 1) * CW - PAD, y1 = Y0 + (r + 1) * CH - PAD;
|
||||
// Single-part rectangle (outer ring only).
|
||||
states[id] = [[[[x0, y0], [x1, y0], [x1, y1], [x0, y1], [x0, y0]]]];
|
||||
// 5 pins per state, deliberately stacked near the centre so they must spread.
|
||||
const cx = (x0 + x1) / 2, cy = (y0 + y1) / 2;
|
||||
for (let k = 0; k < 5; k++) {
|
||||
pins.push({ id: `p${pid++}`, x: cx + (k % 2), y: cy + (k * 0.7), stateId: id });
|
||||
}
|
||||
}
|
||||
}
|
||||
return { pins, states }; // 210 pins ≥ FLOOR
|
||||
}
|
||||
|
||||
// ── Poison: one tiny state with far more pins than fit at MIN_SEP ──────────────
|
||||
function poisonFixture(R, GAP) {
|
||||
const MIN_SEP = R * 2 + GAP;
|
||||
// A box barely larger than one pin — cannot separate 4 pins to MIN_SEP.
|
||||
const s = MIN_SEP * 0.8;
|
||||
const x0 = 1000, y0 = 1000;
|
||||
const states = { 'tiny-UT': [[[[x0, y0], [x0 + s, y0], [x0 + s, y0 + s], [x0, y0 + s], [x0, y0]]]] };
|
||||
const cx = x0 + s / 2, cy = y0 + s / 2;
|
||||
const pins = [];
|
||||
for (let k = 0; k < 4; k++) pins.push({ id: `tp${k}`, x: cx, y: cy, stateId: 'tiny-UT' });
|
||||
return { pins, states };
|
||||
}
|
||||
14
package.json
14
package.json
|
|
@ -60,8 +60,6 @@
|
|||
"check:pin-hint-floor:self-test": "node internal/check-pin-hint-floor.mjs --self-test",
|
||||
"check:preview-flag-dev-only": "node internal/check-preview-flag-dev-only.mjs",
|
||||
"check:preview-flag-dev-only:self-test": "node internal/check-preview-flag-dev-only.mjs --self-test",
|
||||
"check:poster-type-registry": "node internal/check-poster-type-registry.mjs",
|
||||
"check:poster-type-registry:self-test": "node internal/check-poster-type-registry.mjs --self-test",
|
||||
"check:no-fleet-names": "node internal/check-no-fleet-names.mjs",
|
||||
"check:no-fleet-names:self-test": "node internal/check-no-fleet-names.mjs --self-test",
|
||||
"check:dashboard-filter-a11y": "node plugin-designs/research-dashboard/scripts/check-dashboard-filter-a11y.mjs",
|
||||
|
|
@ -227,6 +225,7 @@
|
|||
"check:selector-fields:self-test": "node internal/check-selector-fields.mjs --self-test",
|
||||
"check:packet-strings-parity": "node internal/check-packet-strings-parity.mjs",
|
||||
"check:packet-variants": "node internal/check-packet-variants.mjs",
|
||||
"check:pins-in-state": "node library/packet/scripts/check-pins-in-state.mjs",
|
||||
"check:label-key-coverage": "node internal/check-label-key-coverage.mjs",
|
||||
"check:host-locale-fetch": "node internal/check-host-locale-fetch.mjs",
|
||||
"check:packet-a1-structure": "node internal/check-packet-a1-structure.mjs",
|
||||
|
|
@ -355,7 +354,7 @@
|
|||
"fix:sri": "node internal/fix-sri.mjs",
|
||||
"gallery": "node internal/generate-gallery.mjs",
|
||||
"gates:post": "node internal/run-parallel.mjs --label=post -- check:capability-derived check:drop check:parse verify check:sri check:public-hygiene check:label-joins check:facet-cascade check:facet-one-field check:heartbeat check:kpi-unit check:composite-reg check:descriptions check:no-abs-paths check:no-codename check:dep-names check:composite-srcs check:embed-targets check:nested-token check:i18n-parity check:tabs-localized check:packets-all check:packet-strings-parity check:zone-census check:zoning-declared check:share-policy check:library-index check:csv-shape check:capability-citations check:catalog-identity check:no-orphan-gates check:quoted-scripts check:script-flags check:capability-exemplars check:packet-fixture check:packet-browser check:provider-switch check:locale-reachable check:url-resolver check:manifest-covers check:one-palette check:pin-dim-slider check:legend-source check:clustering-modes check:composite-embed-knobs check:composite-locale-leaks check:linked-vocabulary check:wp-embed check:dashboard-geocoder-provider check:leaf-engine-per-provider check:auto-engine check:engine-contract check:map-props-unit check:composites-mount check:composite-interop check:no-free-identifiers check:map-fly-reduced-motion check:mst-clustering check:list-prop-unit check:profiles-mount check:cdn-pins check:no-eval check:popup-escaping check:i18n-treeshake check:pinned-umd check:one-palette:self-test check:no-cross-plugin-imports check:no-cross-plugin-imports:self-test check:map-attribution check:studio-rail check:approx-pin-note check:embedder-keys check:provider-for check:legend-logical-insets check:legend-logical-insets:self-test check:optional-t-equivalence check:text-highlight check:religion-label-not-value check:i18n-stopped-scope check:no-silent-engine check:no-silent-engine:self-test check:regions-uses-library check:shadow-css-parses check:square-map-controls check:preset-config-merge check:instance-config-keys check:frozen-labels check:plural-forms check:region-fill-repaint check:region-paint-single-source check:poster-print-fallback check:posters-exportable check:country-names check:reduced-motion check:no-dead-library check:universal-props check:readme-size check:tree-relative check:leaf-hints check:snippet-engine check:snippet-engine:self-test check:embed-base check:link-coverage check:no-public-binds check:shared-reached check:tree-weight check:no-fleet-names:self-test check:pin-hint-floor:self-test check:poster-sizes:self-test check:shell-header:self-test check:preview-flag-dev-only:self-test check:poster-type-registry:self-test",
|
||||
"gates:pre": "node internal/run-parallel.mjs --label=pre -- check:template-literal check:mjs-parse check:sfc-parse check:tab-radius check:synced-css check:doc-scripts check:setup-order check:package-json-unique-keys check:no-repo-pb-hooks check:no-credentials-omit check:no-credentials-omit:self-test check:shadow-reduced-motion check:poster-action-print check:targets check:targets:self-test check:browser-gates-guarded check:pin-selection check:facet-shape check:hardcoded-english:self-test check:list-selection check:selector-fields check:upg-zone-joins check:gospel-set-charts check:gospel-set-fit check:describe-group check:one-scroll-container check:packet-charts check:composite-token-url check:language-tree-layout check:i18n-keys-exist check:i18n-never-translated check:packet-variants check:profile-table check:element-bootstrap check:embed-url-absolute check:frame-target check:language-tree-model check:map-menu-anchor check:selection-kinds check:tiered-points check:whiteboard-projection check:mercator-slice check:ring-vocabulary check:map-props-unit check:mobile-gating check:provide-shadowing check:legend-top-offset check:cdn-cache check:plural-forms check:select-zone-race check:script-registry check:map-control-overlap check:poster-attribution check:board-map-options check:gospel-whiteboard check:packet-map-missing-loud check:poster-layout-optin check:ported-globals-identical check:ring-bands check:packet-a1-structure check:india-states check:batch-selection-export check:zone-title-tier-a check:evangelical-share check:map-labels check:packet-offline check:help-reachable check:gated-not-in-tree check:window-globals-released check:legend-data-contract check:no-internal-role-nouns check:poster-fetch-guard check:people-group-records check:sentence-slots check:popup-href-escaped check:popup-pan-controls check:country-map-refetch check:pane-config-reforward check:viewport-meta check:viewport-meta:self-test check:label-key-coverage check:poster-browser-equiv check:poster-render-pinned check:country-sheet-one-path check:country-sheet-one-path:self-test check:side-lanes check:side-lanes:self-test check:poster-section check:poster-section:self-test check:posterverse-shelf check:host-locale-fetch check:print-frame-reclaim check:click-sheet check:coverage-consistent:chained check:coverage-consistent:poison check:dashboard-filter-a11y check:filter-multivalue check:hover-channel check:kit-options-reachable check:layout-key-namespaced check:legend-mirrors check:map-unmount-race check:no-conflict-markers check:series-isolation check:snapshot-guard check:stale-sweep-claim check:surfaces-read-the-tier check:translator-contacts check:wall-wysiwyg check:wall-print-watch check:wall-no-bg-photos check:wall-pan check:template-i18n check:list-pattern-doc check:shadow-style-labels-unique check:grid-image-loading check:retry-fetch check:panel-sheets check:poster-wall-host-seams check:poster-design-catalogue check:wall-photo-weight check:no-fleet-names check:pin-hint-floor check:poster-sizes check:upg-count check:shell-header check:pg-name-gate check:preview-flag-dev-only check:poster-type-registry",
|
||||
"gates:pre": "node internal/run-parallel.mjs --label=pre -- check:template-literal check:mjs-parse check:sfc-parse check:tab-radius check:synced-css check:doc-scripts check:setup-order check:package-json-unique-keys check:no-repo-pb-hooks check:no-credentials-omit check:no-credentials-omit:self-test check:shadow-reduced-motion check:poster-action-print check:targets check:targets:self-test check:browser-gates-guarded check:pin-selection check:facet-shape check:hardcoded-english:self-test check:list-selection check:selector-fields check:upg-zone-joins check:gospel-set-charts check:gospel-set-fit check:describe-group check:one-scroll-container check:packet-charts check:pins-in-state check:composite-token-url check:language-tree-layout check:i18n-keys-exist check:i18n-never-translated check:packet-variants check:profile-table check:element-bootstrap check:embed-url-absolute check:frame-target check:language-tree-model check:map-menu-anchor check:selection-kinds check:tiered-points check:whiteboard-projection check:mercator-slice check:ring-vocabulary check:map-props-unit check:mobile-gating check:provide-shadowing check:legend-top-offset check:cdn-cache check:plural-forms check:select-zone-race check:script-registry check:map-control-overlap check:poster-attribution check:board-map-options check:gospel-whiteboard check:packet-map-missing-loud check:poster-layout-optin check:ported-globals-identical check:ring-bands check:packet-a1-structure check:india-states check:batch-selection-export check:zone-title-tier-a check:evangelical-share check:map-labels check:packet-offline check:help-reachable check:gated-not-in-tree check:window-globals-released check:legend-data-contract check:no-internal-role-nouns check:poster-fetch-guard check:people-group-records check:sentence-slots check:popup-href-escaped check:popup-pan-controls check:country-map-refetch check:pane-config-reforward check:viewport-meta check:viewport-meta:self-test check:label-key-coverage check:poster-browser-equiv check:poster-render-pinned check:country-sheet-one-path check:country-sheet-one-path:self-test check:side-lanes check:side-lanes:self-test check:poster-section check:poster-section:self-test check:posterverse-shelf check:host-locale-fetch check:print-frame-reclaim check:click-sheet check:coverage-consistent:chained check:coverage-consistent:poison check:dashboard-filter-a11y check:filter-multivalue check:hover-channel check:kit-options-reachable check:layout-key-namespaced check:legend-mirrors check:map-unmount-race check:no-conflict-markers check:series-isolation check:snapshot-guard check:stale-sweep-claim check:surfaces-read-the-tier check:translator-contacts check:wall-wysiwyg check:wall-print-watch check:wall-no-bg-photos check:wall-pan check:template-i18n check:list-pattern-doc check:shadow-style-labels-unique check:grid-image-loading check:retry-fetch check:panel-sheets check:poster-wall-host-seams check:poster-design-catalogue check:wall-photo-weight check:no-fleet-names check:pin-hint-floor check:poster-sizes check:upg-count check:shell-header check:pg-name-gate check:preview-flag-dev-only check:poster-type-registry",
|
||||
"gen:iso3-to-alpha2": "node library/scripts/generate-iso3-to-alpha2.mjs",
|
||||
"internet:adm1": "node plugin-designs/cities-internet/scripts/build-adm1-internet.mjs",
|
||||
"library-index": "node internal/generate-library-index.mjs",
|
||||
|
|
@ -425,7 +424,9 @@
|
|||
"check:poster-section": "node plugin-designs/country-posters/scripts/check-poster-section.mjs",
|
||||
"check:poster-section:self-test": "node plugin-designs/country-posters/scripts/check-poster-section.mjs --self-test",
|
||||
"check:side-lane-photo-pixels": "node plugin-designs/country-posters/scripts/check-side-lane-photo-pixels.mjs",
|
||||
"check:side-lane-photo-pixels:self-test": "node plugin-designs/country-posters/scripts/check-side-lane-photo-pixels.mjs --self-test"
|
||||
"check:side-lane-photo-pixels:self-test": "node plugin-designs/country-posters/scripts/check-side-lane-photo-pixels.mjs --self-test",
|
||||
"check:poster-type-registry": "node internal/check-poster-type-registry.mjs",
|
||||
"check:poster-type-registry:self-test": "node internal/check-poster-type-registry.mjs --self-test"
|
||||
},
|
||||
"//scripts": {
|
||||
"_": "What each script does. These notes used to sit inside the command strings as trailing \"# …\" comments, which made the shell discard any arguments passed after \"--\" (so a gate given --url silently measured its hardcoded default port — possibly another agent's server). Keep notes here, never in a command.",
|
||||
|
|
@ -473,7 +474,6 @@
|
|||
"check:coverage-consistent": "the gospel-resources surfaces must agree: no resource on an ISO RESERVED code (und/mul/mis/zxx), every resourced code NAMED, table reach recounted off the pins, no invented URL, tiers reconcile. Static, sub-second. Self-test: `bun run check:coverage-consistent:poison`, all 12 clauses (A-L) must fail. Clause L is the one that is not about consistency: it fails when the link-verification record goes stale, because 'link checked' is a claim about the present tense. Written after the same drift defect was found by hand three times.",
|
||||
"check:csv-shape": "the export must OPEN as a table: header on line 0, every row matching. Run the `check:csv-shape:self-test` script for the NEGATIVE test (forces the provenance comment back to line 0 IN MEMORY and requires this gate to REJECT it) — the header used to claim 'NEGATIVE-TESTED' with no way to re-run it.",
|
||||
"check:poster-sizes": "the shared poster-size ladder (library/constants/posterSizes.js) is right: picker order = ladder, dot-free keys, portrait only, the sheets glue up to the finished size, photo slots on exactly 66x66 + 60x96, paper prints and the rest go to a print-shop PDF, every alias resolves, paperFor() picks Letter or A4 by region. Run the `check:poster-sizes:self-test` script for the NEGATIVE test",
|
||||
"check:poster-type-registry": "the poster type registry is ONE per page: every bundle inlines its own copy of posterTypes.js and <dxm-poster-section> is defined by whichever bundle loads first, so with two independent copies loaded side by side a type registered through one is found through the other; the built-in country is listed once; a name registered twice keeps the first; every registration is announced on window (dxm-poster-type-registered) and PosterSectionView re-resolves on it. Run the `check:poster-type-registry:self-test` script for the NEGATIVE test (a per-bundle registry fails).",
|
||||
"check:preview-flag-dev-only": "the flag that previews withheld content (globalThis.DXM_PREVIEW_UNRELEASED, e.g. the whole-India poster) never reaches a built bundle: no file under public/ assigns it in any spelling a minifier writes, and every source assignment is behind import.meta.env.DEV (set only by the Vite dev server, the pilot's hot-reload preview). The built tree goes to the research landing and DX Life's /dx-maps, where the flag would show India publicly. Run the `check:preview-flag-dev-only:self-test` script for the NEGATIVE test (2 planted defects).",
|
||||
"check:pin-hint-floor": "the pin-hint pill sits at the map's bottom on a page that scrolls (the fold is not an obstacle there) and is still lifted above the fold on a full-screen page; the legend sheet and the licence credit still lift it; PinHint.vue takes its floor from pinHintFloor.js. Run the `check:pin-hint-floor:self-test` script for the NEGATIVE test",
|
||||
"check:no-fleet-names": "tracked source (not data/, public/ or the translation catalogues) names no build-team member, attributes no request to a user and carries no dated QA-round tag; an allowance is a named LINE, never a whole file. Run the `check:no-fleet-names:self-test` script for the NEGATIVE test",
|
||||
|
|
@ -577,6 +577,7 @@
|
|||
"check:packet-render:expect-funnel": "check:packet-render with the page-2 FUNNEL declared REQUIRED. Exists because of a real near-miss: a merge resolved with `git checkout --ours` deleted the printPacket call site that supplies the funnel data (60 lines) and EVERY GATE STAYED GREEN — it had to, because the funnel page is OPTIONAL by design (buildPacket omits it when the arg is null), so a packet without page 2 is not malformed, just smaller. Always requiring it would be the wrong fix: the 11 pre-funnel laos packets and any host with no funnel data would go red, and a false red costs as much as a false green. So the CALLER, which knows whether this packet was built with funnel data, declares it — an absence is then either declared (no flag) or a failure (flag passed, page missing), never a silent nothing. Pass it for any packet from a profile that wires packetFunnel(). Browser gate.",
|
||||
"check:packet-strings-parity": "the PACKET catalog (packet-strings.json) must be whole in every language: all string keys, all 12 prayer points with every field, all 12 wheel rhythms. check:i18n-parity covers library/i18n/locales only — six gates READ this file and none checked it. Asserts PRESENCE, not translatedness, with point4_passage declared-absent on record.",
|
||||
"check:packet-variants": "the poster wall's Prayer List prints the PACKET (not the columnar list), and every variant it offers exists in packet-render's VARIANTS. A variant may drop fixed pages but never people: lightweight keeps every group. By the UPG-100 owner; mutation-tested. Headless; in gates:pre.",
|
||||
"check:pins-in-state": "library/packet/pins-in-state.js places whole-India poster pins so no two overlap AND every pin stays inside its own ADM1 state polygon, at the 60x96in sheet scale (2500x4000px, PIN_R 8). A deterministic repulsion relaxation (imitating poster-render.js, read not called) with the map-rect clamp replaced by a per-state multipolygon clamp: a pin pushed off its land is pulled to the nearest point just inside, holes and multi-part states (islands/coasts) honoured. Runs on the real India 855-pin data when present, else a synthetic 60x96 fixture (floor 200 pins, no vacuous pass); asserts 0 pins outside their state and 0 overlaps that are not NAMED in `infeasible` (a too-small state is reported, never silently stacked), plus a hole/island arm and a poison arm. Node only, headless, deterministic.",
|
||||
"check:label-key-coverage": "node internal/check-label-key-coverage.mjs",
|
||||
"check:host-locale-fetch": "node internal/check-host-locale-fetch.mjs",
|
||||
"check:packet-a1-structure": "the prayer packet is built to its specified structure, read page by page from each sheet's CONTENT: full detail = map, triangle, life calendar, % evangelical, profiles, bounded set, centered set, wheel, points; lightweight = map, triangle, profiles, wheel, points. Page 1 places a map-only vertical sheet on the packet's own margin and says it is one of the UPG 100 prayer lists only when a count is supplied; page 2 is one inverted triangle whose packets tier and \"- N\" steps appear only where true; the wheel carries the Metacamp Module 1 PDF's colours and opens at nine o'clock; all 28 legend zones resolve, Deaf included.",
|
||||
|
|
@ -698,7 +699,8 @@
|
|||
"check:poster-section": "the reusable poster section (<dxm-poster-section>): the type registry has 'country'; DX Life's /regions slugs (and every other spelling of a region) each show their countries, every country once; a withheld whole-country poster stays withheld through the type; the element's attributes map to its config; PosterSection.vue injects every name its template uses.",
|
||||
"check:poster-section:self-test": "a registry without 'country', a region key without \"&\" → \"and\", and a section that uses a name it does not inject must each make check:poster-section fail.",
|
||||
"check:side-lane-photo-pixels": "BROWSER gate (browser seat; elsewhere 75 NOT MEASURED): the 60x96 side-lane sheet rasterised by poster-raster.js, measured in pixels at every photo slot. A data: photo draws; every photo on its own host stays flat, never the broken-image glyph an external <image> rasterises as.",
|
||||
"check:side-lane-photo-pixels:self-test": "the same raster WITHOUT stripExternalImages must leave the external photo slots NOT flat (the glyph), else the gate proves nothing."
|
||||
"check:side-lane-photo-pixels:self-test": "the same raster WITHOUT stripExternalImages must leave the external photo slots NOT flat (the glyph), else the gate proves nothing.",
|
||||
"check:poster-type-registry": "the poster type registry is ONE per page: every bundle inlines its own copy of posterTypes.js and <dxm-poster-section> is defined by whichever bundle loads first, so with two independent copies loaded side by side a type registered through one is found through the other; the built-in country is listed once; a name registered twice keeps the first; every registration is announced on window (dxm-poster-type-registered) and PosterSectionView re-resolves on it. Run the `check:poster-type-registry:self-test` script for the NEGATIVE test (a per-bundle registry fails)."
|
||||
},
|
||||
"devDependencies": {
|
||||
"@capacitor/android": "^7.6.9",
|
||||
|
|
|
|||
Loading…
Reference in a new issue