Own subsea cables land on the city's dot, nudged cities too (#305)

An own cable's map line came straight from its surveyed lon/lat path, so it
ended at the city's exact coordinates, while the city itself is drawn with its
display nudge (CITY_NUDGE). Fujairah's [1,2] left every own cable there 2 px
above the dot; Dubai, Karachi, Barcelona and Osaka are off by more. The ends of
the map line now sit on the drawn city, as commercial cables already do; the
saved path and its length are unchanged.
This commit is contained in:
Frederic Jung 2026-11-06 01:50:40 +00:00
parent dd6e4f4f8a
commit 7f3b742451
No known key found for this signature in database
5 changed files with 35 additions and 3 deletions

View file

@ -0,0 +1,28 @@
// #305, #308: your own subsea cable lands on the city's dot, also where the map nudges a city off its exact spot.
const test = require('node:test');
const assert = require('node:assert/strict');
const { load } = require('./harness');
test('#305 an own subsea cable ends on both cities, nudged or not', () => {
const { ev, dom, errors } = load();
try {
ev("ACT.start({});S.cash=1e12;S.lvl=13;S.won=true;for(const g of GOALS)S.done[g.id]=0");
// Fujairah, Karachi, Dubai, Barcelona and Osaka are all drawn a few pixels away from their exact lon/lat.
for (const [a, b] of [['fuj', 'bom'], ['khi', 'bom'], ['dxb', 'bom'], ['bcn', 'mrs'], ['osa', 'tpe']]) {
ev(`for(const city of ['${a}','${b}'])if(!S.pops[city])ACT.buildPop({city});UI.lmode='df';UI.dfSrc='cable';UI.pending={a:'${a}',b:'${b}'};UI.seaDesign='standard';ACT.orderCable()`);
const l = JSON.parse(ev('JSON.stringify(S.links.at(-1))'));
assert.deepEqual([l.a, l.b, l.own, l.sub, Array.isArray(l.seaPath)], [a, b, true, true, true], `${a}–${b} cable ordered`);
ev('GEO.clear()');
const g = JSON.parse(ev('JSON.stringify(linkGeom(S.links.at(-1)).pts)'));
const A = JSON.parse(ev(`JSON.stringify([CITY.${a}.x,CITY.${a}.y])`)), B = JSON.parse(ev(`JSON.stringify([CITY.${b}.x,CITY.${b}.y])`));
const W = ev('W'), at = (p, c) => Math.abs(p[1] - c[1]) < 1e-9 && Math.abs(((p[0] - c[0]) % W + W + W / 2) % W - W / 2) < 1e-9;
assert.ok(at(g[0], A), `${a}–${b} starts on ${a}: ${g[0]} vs ${A}`);
assert.ok(at(g[g.length - 1], B), `${a}–${b} ends on ${b}: ${g[g.length - 1]} vs ${B}`);
// The map line keeps the surveyed route in between, and the saved path stays the real one.
assert.equal(g.length, l.seaPath.length);
const ll = JSON.parse(ev(`JSON.stringify([CITY.${a}.lon,CITY.${a}.lat])`));
assert.ok(Math.abs(l.seaPath[0][0] - ll[0]) < 1e-9 && Math.abs(l.seaPath[0][1] - ll[1]) < 1e-9, 'saved path starts at the real landing');
}
assert.deepEqual(errors, []);
} finally { dom.window.close(); }
});

View file

@ -93,7 +93,7 @@ test('orders, previews, saved paths and map geometry agree; legacy cables retain
ev('S=migrate(JSON.parse(JSON.stringify(S)));GEO.clear()');
assert.deepEqual(JSON.parse(ev('JSON.stringify(S.links.at(-1).seaPath)')), q.pts);
assert.deepEqual(JSON.parse(ev('JSON.stringify(linkGeom(S.links.at(-1)).pts)')),
JSON.parse(ev('JSON.stringify(seaMapPoints(S.links.at(-1).seaPath))')));
JSON.parse(ev('JSON.stringify(seaMapPoints(S.links.at(-1).seaPath,"lag","bde"))')));
ev("UI.dfSrc='cable';openLinkModal('lag','bde')");
}
ev("S.links.push({id:'legacy',a:'lag',b:'bde',kind:'df',own:true,sub:true,seaDesign:'optimized',sys:'roadm',km:7515,ch:[],ready:0,mo:1,cut:0});S=migrate(JSON.parse(JSON.stringify(S)))");