Merge #214-#217: Manila, Cebu and Davao (fmcglinn)
Adapted to main: Globe is main's Globe-Trotter Telecom (now a Philippine carrier in Cebu and Davao) instead of a second AS4775, the new Philippine networks buy transit from NTT and Tata like main's other island networks, cities and networks carry their country, and Philippine transit sits in the new pricing. Cable names no longer pile up where short cables crowd.
This commit is contained in:
commit
a8fa75411c
22 changed files with 333 additions and 17 deletions
29
tests/cable-labels.test.js
Normal file
29
tests/cable-labels.test.js
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
const test = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
const { load } = require('./harness');
|
||||
|
||||
// Zoomed in, cable names sit on their cables. Where short cables crowd (the Philippine islands), a name that would
|
||||
// land on another is left out, unless the cable touches the selected city.
|
||||
const labels = (ev, sel) => JSON.parse(ev(`(()=>{ACT.start({});S.nextFail=1e9;S.nextEvent=1e9;UI.sel=${sel ? `{type:'city',id:'${sel}'}` : 'null'};
|
||||
cam.x=(CITY.mnl.x+CITY.dvo.x)/2;cam.y=(CITY.mnl.y+CITY.dvo.y)/2;cam.z=4.5;const out=[];
|
||||
ctx.fillText=(t,x,y)=>out.push({t,x,y,w:ctx.measureText(t).width});ctx.strokeText=()=>{};drawCables([0]);return JSON.stringify(out);})()`));
|
||||
|
||||
test('cable names never sit on top of each other', () => {
|
||||
const { ev, errors } = load();
|
||||
const L = labels(ev);
|
||||
assert.ok(L.length > 5, 'names are drawn');
|
||||
assert.ok(L.some(l => l.t === 'Pan de Sal Cable Network'), 'the domestic cables are named');
|
||||
const hit = (a, b) => Math.abs(a.x - b.x) < (a.w + b.w) / 2 + 6 && Math.abs(a.y - b.y) < 14;
|
||||
const clash = [];
|
||||
for (let i = 0; i < L.length; i++) for (let j = i + 1; j < L.length; j++) if (hit(L[i], L[j])) clash.push(`${L[i].t} / ${L[j].t}`);
|
||||
assert.deepEqual(clash, []);
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test("a selected city's cables are always named", () => {
|
||||
const { ev, errors } = load();
|
||||
const plain = labels(ev).map(l => l.t), sel = labels(ev, 'ceb').map(l => l.t);
|
||||
for (const n of ['Pan de Sal Cable Network', 'Philippines Long Distance Relationship', 'Diverge VisMin Express']) assert.ok(sel.includes(n), n);
|
||||
assert.ok(sel.length >= plain.length);
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
Loading…
Add table
Add a link
Reference in a new issue