From 7f3b742451073c667cb8564413bcb8fc4c2076bc Mon Sep 17 00:00:00 2001 From: Frederic Jung Date: Fri, 6 Nov 2026 01:50:40 +0000 Subject: [PATCH] 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. --- CHANGELOG.md | 2 ++ src/game/95-modals/80-own-cable.js | 4 +++- src/game/96-map/50-link-geometry.js | 2 +- tests/own-cable-landing.test.js | 28 ++++++++++++++++++++++++++++ tests/sea-routing.test.js | 2 +- 5 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 tests/own-cable-landing.test.js diff --git a/CHANGELOG.md b/CHANGELOG.md index d539784..061b17d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ All notable changes to this project are documented here. The project follows ## [Unreleased] +- Your own subsea cables now land right on the city's dot, also in Fujairah, Dubai, Karachi, Barcelona, Osaka and other cities the map shifts slightly so they do not overlap (#305). + ## [2.10.1] — 2026-11-05 - "Meet halfway" on a renewal now offers the price halfway between what the customer pays and what they ask, and the button shows it before you press (#293). diff --git a/src/game/95-modals/80-own-cable.js b/src/game/95-modals/80-own-cable.js index 31d14b3..e7a2268 100644 --- a/src/game/95-modals/80-own-cable.js +++ b/src/game/95-modals/80-own-cable.js @@ -155,7 +155,9 @@ function seaReady(a,b){seaSync();const key=seaKey(a,b); }catch(e){SEA_SURVEY.failed=true;if(SEA_SURVEY.worker)SEA_SURVEY.worker.terminate();SEA_SURVEY.worker=null;SEA_SURVEY.pending.clear();return true;} } const seaSurveyAttr=(a,b)=>{seaSync();const k=seaKey(a,b);return SEA_SURVEY.pending.has(k)?`data-sea-survey="${k}"`:'';}; -function seaMapPoints(pts){const out=[];for(const p of pts){const q=proj(...p);if(out.length)q[0]+=W*Math.round((out[out.length-1][0]-q[0])/W);out.push(q);}return out;} +// The ends sit on the cities' dots, which the map may nudge off their exact lon/lat (#305). +function seaMapPoints(pts,a,b){const out=[];for(const p of pts){const q=proj(...p);if(out.length)q[0]+=W*Math.round((out[out.length-1][0]-q[0])/W);out.push(q);} + const n=out.length,end=(i,c)=>{if(c)out[i]=[c.x+W*Math.round((out[i][0]-c.x)/W),c.y];};if(n>1){end(0,CITY[a]);end(n-1,CITY[b]);}return out;} // Designs pay for progressively tighter surveys; all use a feasible marine path. const SEA_DESIGNS={standard:{n:N_('common.standard'),cost:1,time:1},optimized:{n:N_('common.optimized'),cost:3,time:1.3},express:{n:N_('common.low_latency'),cost:7,time:1.7}}; diff --git a/src/game/96-map/50-link-geometry.js b/src/game/96-map/50-link-geometry.js index f737267..288553c 100644 --- a/src/game/96-map/50-link-geometry.js +++ b/src/game/96-map/50-link-geometry.js @@ -8,7 +8,7 @@ function linkGroups(){const m=new Map();for(const l of S.links){const key=gKey(l // Mixed sizes are spelled out per size ("2×800G + 400G"): "2 × 1.2T" read like two 1.2T waves (#56). function groupLabel(grp,up){const n=[];for(const x of grp)n[x.tier]=(n[x.tier]||0)+1;let s='';for(let t=n.length-1;t>=0;t--)if(n[t])s+=(s?' + ':'')+(n[t]>1||n[t]===grp.length?n[t]+'×':'')+LT[t].n;return s+(up.lengthp.slice());const same=pairLinks(l.a,l.b).filter(x=>x.cable===l.cable).indexOf(l);if(same>0)for(let j=1;jp.slice());const same=pairLinks(l.a,l.b).filter(x=>x.cable===l.cable).indexOf(l);if(same>0)for(let j=1;jx.kind==='df'&&x.own&&x.sub).indexOf(l),c0=cablesFor(l.a,l.b).slice().sort((x,y)=>x.km-y.km)[0],cp=c0&&cablePair(c0.cid,l.a,l.b); diff --git a/tests/own-cable-landing.test.js b/tests/own-cable-landing.test.js new file mode 100644 index 0000000..ea083b9 --- /dev/null +++ b/tests/own-cable-landing.test.js @@ -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(); } +}); diff --git a/tests/sea-routing.test.js b/tests/sea-routing.test.js index eaac355..286cf09 100644 --- a/tests/sea-routing.test.js +++ b/tests/sea-routing.test.js @@ -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)))");