Eight Pacific pairs added in 1.35.0 had waypoints that jumped from +180 to -180 longitude, so the renderer drew them across the whole map. Waypoint longitudes are now continuous, as the hand-drawn routes always were. A scan of all 475 cable pairs found 147 that cut across land with sea on both sides (the Horn of Africa, Arabia, India, Brazil, Newfoundland, ...). Those now follow the game's own sea router, simplified only as far as the line stays off land; inland endpoints route between the coastal ends and keep their overland leg. 27 more pairs into inland cities now come ashore at the nearest coast. Hibernia Express is traced by hand south of Ireland to Brean so it stays the straightest Atlantic crossing. Left alone on purpose: the Suez Canal and Dardanelles crossings, Quintillion's overland Alaska leg and Celtix's Welsh landing. Tests: no pair jumps the seam and none crosses more than 160 km of land mid-route. EIG is now 8,613 km, so overland is 9.97x subsea instead of 10x+; Lisbon-Lagos fits 1.6T directly at 5,914 km. Thanks to mindolo for the report and the analysis in #183.
61 lines
5 KiB
JavaScript
61 lines
5 KiB
JavaScript
// More real cables: the North Sea and the Baltic, the Indian Ocean and Asia-Pacific.
|
|
const test = require('node:test');
|
|
const assert = require('node:assert');
|
|
const { load } = require('./harness');
|
|
|
|
function start(ev) { ev("ACT.start({});S.cash=1e9;S.lvl=6;for(const g of GOALS)S.done[g.id]=0"); }
|
|
const lands = (ev, cid, a, b) => ev(`CABLE_PAIRS.some(p=>p.cid==='${cid}'&&[p.a,p.b].sort().join()==='${[a, b].sort().join()}')`);
|
|
|
|
test('the North Sea and the Baltic: new landings, real cables, and anchors on the Baltic ones', () => {
|
|
const { ev, errors } = load();
|
|
start(ev);
|
|
for (const c of ['krs', 'ebj', 'rix']) {
|
|
assert.ok(ev(`CABLE_PAIRS.some(p=>p.a==='${c}'||p.b==='${c}')`), `${c} has a cable`);
|
|
assert.ok(ev(`NETS.some(n=>n.price&&n.pops.includes('${c}'))`), `${c} has a transit seller`);
|
|
}
|
|
assert.ok(ev("CITY.rix.ix.length>0&&ixMembers('rix').includes('tet')"), 'Riga has its exchange');
|
|
assert.ok(lands(ev, 'havf', 'ebj', 'krs') && lands(ev, 'havf', 'nyc', 'ebj') && lands(ev, 'havsil', 'krs', 'ebj') && lands(ev, 'norfest', 'svg', 'krs'));
|
|
assert.ok(lands(ev, 'havh', 'dub', 'man') && lands(ev, 'clion', 'hel', 'ham') && lands(ev, 'e4', 'ber', 'cph') && lands(ev, 'lvse', 'rix', 'sto'));
|
|
// Tampnet: NorSea Com from Kårstø past the Draupner and Ekofisk platforms to Lowestoft, and Norfest down the coast
|
|
assert.ok(lands(ev, 'tampn', 'svg', 'lon') && lands(ev, 'norfest', 'krs', 'osl'));
|
|
// the Baltic cables are the ones the anchors find
|
|
for (const c of ['clion', 'balt', 'e4', 'elight', 'elisa', 'lvse', 'bcs']) assert.equal(ev(`CAB.${c}.anchor`), true, c);
|
|
assert.equal(ev('CAB.marea.anchor'), undefined);
|
|
// old pairs stay where they were, so saved links keep their cable
|
|
assert.equal(ev("CAB.havf.pairs.slice(0,2).map(p=>p.slice(0,2).join()).join(' ')"), 'nyc,cph dub,cph');
|
|
assert.equal(ev("CAB.clion.pairs[0].slice(0,2).join()"), 'hel,fra');
|
|
assert.deepEqual(errors, []);
|
|
});
|
|
|
|
test('the Indian Ocean and Asia-Pacific: the big real cables, Muscat, the Maldives and Fukuoka', () => {
|
|
const { ev, errors } = load();
|
|
start(ev);
|
|
for (const c of ['mct', 'mle', 'fuk']) {
|
|
assert.ok(ev(`CABLE_PAIRS.some(p=>p.a==='${c}'||p.b==='${c}')`), `${c} has a cable`);
|
|
assert.ok(ev(`NETS.some(n=>n.price&&n.pops.includes('${c}'))`), `${c} has a transit seller`);
|
|
}
|
|
assert.ok(ev("isSub('mle','cbo')&&!isSub('mct','dxb')&&!isSub('fuk','tok')"), 'the Maldives are islands, Muscat and Fukuoka are not');
|
|
for (const [cid, a, b] of [['sjc2', 'tpe', 'osa'], ['adc', 'sin', 'bkk'], ['apcn2', 'tpe', 'sha'], ['flag', 'bde', 'pmo'], ['smw5', 'khi', 'cbo'], ['unity', 'tok', 'lax'],
|
|
['tpe2', 'sea', 'sha'], ['mist', 'maa', 'kul'], ['iax', 'bom', 'mle'], ['kjcn', 'icn', 'fuk'], ['smw6', 'bom', 'mle'], ['twoaf', 'mct', 'khi'], ['ohman', 'per', 'mct'], ['bifrost', 'jkt', 'gum'], ['indigo', 'per', 'syd']]) {
|
|
assert.ok(lands(ev, cid, a, b), `${cid} ${a}-${b}`);
|
|
}
|
|
// every cable pair has a drawn route and a sane length
|
|
assert.equal(ev("CABLE_PAIRS.filter(p=>!(p.km>0&&p.km<25000)||p.pts.some(q=>!isFinite(q[0])||!isFinite(q[1]))).length"), 0);
|
|
// no route jumps across the whole map at the ±180° seam: waypoints keep continuous longitudes (#183)
|
|
assert.deepEqual(JSON.parse(ev("JSON.stringify(CABLE_PAIRS.filter(p=>p.pts.some((q,i)=>i&&Math.abs(q[0]-p.pts[i-1][0])>W/3)).map(p=>p.cid+':'+p.a+'-'+p.b))")), []);
|
|
assert.ok(ev("cablePair('fast','sea','osa').km") < 9500, 'FASTEST to Osaka crosses the Pacific, not the world');
|
|
// subsea cables stay at sea: a stretch over land with sea on both sides is the line cutting across a coast.
|
|
// Allowed: the Suez Canal and the Dardanelles (not water in the coastline), and Quintillion's overland Alaska leg.
|
|
const cross = JSON.parse(ev(`JSON.stringify((()=>{const big=COAST.filter(p=>ringArea(p)>=40).map(p=>{let a=1e9,b=-1e9,c=1e9,d=-1e9;for(const [x,y] of p){a=Math.min(a,x);b=Math.max(b,x);c=Math.min(c,y);d=Math.max(d,y);}return {p,a,b,c,d};});
|
|
const on=(x,y)=>{x=((x%W)+W)%W;return big.some(q=>x>=q.a&&x<=q.b&&y>=q.c&&y<=q.d&&inPoly(x,y,q.p));};const out=[];
|
|
for(const p of CABLE_PAIRS){if(p.cid==='qtl'&&[p.a,p.b].sort().join()==='anc,brw')continue;const s=[];
|
|
for(let i=1;i<p.pts.length;i++){const [x0,y0]=p.pts[i-1],[x1,y1]=p.pts[i];const n=Math.max(1,Math.ceil(Math.hypot(x1-x0,y1-y0)/1.5));for(let k=(i===1?0:1);k<=n;k++)s.push([x0+(x1-x0)*k/n,y0+(y1-y0)*k/n]);}
|
|
const L=s.map(q=>on(q[0],q[1]));let i=0;while(i<L.length){if(!L[i]){i++;continue;}let j=i;while(j+1<L.length&&L[j+1])j++;const km=(j-i+1)*p.km/s.length;if(i>0&&j<L.length-1&&km>160)out.push(p.cid+':'+p.a+'-'+p.b+' '+Math.round(km)+' km');i=j+1;}}
|
|
return out;})())`));
|
|
assert.deepEqual(cross, [], 'cables cutting across land');
|
|
// a hop on one of the new cables carries traffic
|
|
ev("for(const c of ['sin','hkg']){ACT.buildPop({city:c});S.pops[c].rgen=3;}UI.via='sjc2';UI.route='same';openLinkModal('sin','hkg');ACT.buildLink({tier:2});closeModal();compute()");
|
|
assert.ok(ev("S.links.some(l=>l.cable==='sjc2')"), 'a wave on SJC2');
|
|
ev('cam.z=0.5;draw(0);cam.z=4;cam.x=CITY.mle.x;cam.y=CITY.mle.y;draw(0)');
|
|
assert.deepEqual(errors, []);
|
|
});
|