Add Manchester, Edinburgh, Bude and Stavanger with North Sea cables (1.14.0)
New UK and Norway POPs with local eyeball networks, and nine cables: NO-UK-Way, Celtic Norsemen, Havhingsten Hoofbeat, Shefa Sheep Line, Oil Rig Wi-Fi, Pas de Câble, Apollo 13, Yellow Brick Road and Glo-in-the-Dark.
This commit is contained in:
parent
8260ce4dde
commit
7e20a1a2f0
6 changed files with 72 additions and 12 deletions
11
CHANGELOG.md
11
CHANGELOG.md
|
|
@ -6,6 +6,17 @@ All notable changes to this project are documented here. The project follows
|
|||
|
||||
## [Unreleased]
|
||||
|
||||
## [1.14.0] — 2026-10-24
|
||||
|
||||
- More of Britain and Norway: Manchester, Edinburgh, the cable town of Bude
|
||||
in Cornwall, and Stavanger, with British and Norwegian eyeball networks
|
||||
(Bee-Tee, Sky-High Broadband, Virgin Mediocre, Tele-Nor-Way).
|
||||
- Nine new cables: NO-UK-Way across the North Sea (with dark fiber for
|
||||
sale), Celtic Norsemen from Ireland to Norway, Havhingsten Hoofbeat from
|
||||
Blackpool to Denmark, the Shefa Sheep Line to Iceland via the Faroes, Oil
|
||||
Rig Wi-Fi from Stavanger to the Netherlands, Pas de Câble under the
|
||||
Channel, and Apollo 13, Yellow Brick Road and Glo-in-the-Dark into Bude.
|
||||
|
||||
## [1.13.2] — 2026-10-24
|
||||
|
||||
- On phones, the "new version is out" notice is a small card above the tab
|
||||
|
|
|
|||
4
package-lock.json
generated
4
package-lock.json
generated
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "seriesoftubes",
|
||||
"version": "1.13.2",
|
||||
"version": "1.14.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "seriesoftubes",
|
||||
"version": "1.13.2",
|
||||
"version": "1.14.0",
|
||||
"devDependencies": {
|
||||
"jsdom": "24.1.3"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "seriesoftubes",
|
||||
"version": "1.13.2",
|
||||
"version": "1.14.0",
|
||||
"description": "A cartoon browser game about building the internet.",
|
||||
"private": true,
|
||||
"homepage": "https://seriesoftub.es/",
|
||||
|
|
|
|||
|
|
@ -1954,4 +1954,21 @@
|
|||
"Add to your home screen":"Aggiungi alla schermata Home",
|
||||
"On iPhone and iPad: tap the Share button in Safari, then “Add to Home Screen”. Series of Tubes then opens full screen, like an app, and keeps working offline.":"Su iPhone e iPad: tocca il pulsante Condividi in Safari, poi “Aggiungi alla schermata Home”. Series of Tubes si aprirà a schermo intero, come un’app, e funzionerà anche offline.",
|
||||
"Speed":"Velocità",
|
||||
"The North’s hub, with its own exchange and very damp air-conditioning intakes. Cables to Ireland and Denmark come ashore up the coast.":"Lo snodo del Nord, con il suo exchange e prese d’aria dei condizionatori molto umide. I cavi per l’Irlanda e la Danimarca arrivano sulla costa poco più su.",
|
||||
"Scotland’s capital. North Sea cables to Norway and the Faroes land up the coast.":"La capitale della Scozia. I cavi del Mare del Nord verso la Norvegia e le Fær Øer approdano lungo la costa.",
|
||||
"A tiny surfing town in Cornwall where a remarkable share of the transatlantic internet comes ashore. The cliffs are full of fiber.":"Una cittadina di surfisti in Cornovaglia dove approda una fetta notevole dell’internet transatlantica. Le scogliere sono piene di fibra.",
|
||||
"Norway’s oil capital, now full of data centers inside mountains, run on hydro and cooled by the fjord. North Sea cables land here.":"La capitale norvegese del petrolio, ora piena di data center dentro le montagne, alimentati a idroelettrico e raffreddati dal fiordo. Qui approdano i cavi del Mare del Nord.",
|
||||
"Norway to the UK across the North Sea. Fiber pairs for sale, because the oil money wanted a hobby.":"Dalla Norvegia al Regno Unito attraverso il Mare del Nord. Coppie di fibra in vendita, perché i soldi del petrolio volevano un hobby.",
|
||||
"Ireland to Norway, the long way round the top of Scotland. Vikings, but in reverse.":"Dall’Irlanda alla Norvegia, girando lungo la punta della Scozia. Vichinghi, ma al contrario.",
|
||||
"The Sea Stallion: Blackpool to Denmark, galloping round the north of Scotland.":"Lo Stallone del Mare: da Blackpool alla Danimarca, al galoppo attorno al nord della Scozia.",
|
||||
"Scotland to Iceland via Shetland and the Faroes. More sheep than packets.":"Dalla Scozia all’Islanda passando per le Shetland e le Fær Øer. Più pecore che pacchetti.",
|
||||
"New York to the cliffs of Bude. It made it home in the end.":"Da New York alle scogliere di Bude. Alla fine è tornato a casa.",
|
||||
"Long Island to Cornwall. Follow it all the way to the wizard in the cable hut.":"Da Long Island alla Cornovaglia. Seguilo fino al mago nella capanna dei cavi.",
|
||||
"Cornwall to Lagos down the West African coast. Glows faintly when it is working.":"Dalla Cornovaglia a Lagos lungo la costa dell’Africa occidentale. Brilla un po’ quando funziona.",
|
||||
"Another hop across the Channel, with dark fiber for sale. There is always room for one more.":"Un altro salto attraverso la Manica, con dark fiber in vendita. C’è sempre posto per uno in più.",
|
||||
"Stavanger to the Netherlands via every oil platform in the North Sea. The roughnecks stream a lot of football.":"Da Stavanger ai Paesi Bassi passando per ogni piattaforma petrolifera del Mare del Nord. Gli operai delle piattaforme guardano un sacco di calcio in streaming.",
|
||||
"The UK’s incumbent. Buzzes politely, stings on price.":"L’incumbent britannico. Ronza educatamente, punge sul prezzo.",
|
||||
"Football, films and a router that looks like a spaceship.":"Calcio, film e un router che sembra un’astronave.",
|
||||
"Cable broadband for half of Britain. Fast on a good day.":"Banda larga via cavo per mezza Gran Bretagna. Veloce nelle giornate buone.",
|
||||
"Norway’s incumbent. Neither yes nor no, until you send enough traffic.":"L’incumbent norvegese. Né sì né no, finché non mandi abbastanza traffico.",
|
||||
};
|
||||
|
|
|
|||
|
|
@ -686,7 +686,7 @@ const LANDS_LL=[{id:'am',ll:[[-166,68],[-157,71.2],[-141,69.8],[-128,70],[-115,6
|
|||
LANDS_LL.push({id:'lk',ll:[[79.9, 9.8], [80.6, 9.6], [81.4, 8.5], [81.9, 7.4], [81.6, 6.4], [80.6, 5.9], [80.0, 6.2], [79.75, 7.2], [79.75, 8.3]]},{id:'sa',hide:true,ll:[[-77.5, 8.6], [-75, 10.8], [-71.5, 12.3], [-68, 10.6], [-62, 10.5], [-60, 8], [-57, 6], [-52, 5], [-50, 1.5], [-48, -1], [-44, -2.5], [-39, -3.5], [-35, -5.5], [-35, -9], [-37.5, -12.5], [-39, -15], [-39.7, -19], [-41, -22], [-44, -23], [-48, -26], [-48.6, -28.5], [-51, -31], [-53, -34], [-58, -34.5], [-57, -37], [-62, -39], [-65, -41], [-64, -43], [-67.5, -46], [-66, -48], [-69, -51], [-68.5, -53], [-70, -55], [-73, -53], [-75, -48], [-73.5, -43], [-73.5, -37], [-71.5, -32], [-71.3, -27], [-70.5, -20], [-71.5, -17], [-76, -14], [-78, -10], [-81, -6], [-80.5, -3], [-80, 0], [-79, 1.5], [-77.5, 4], [-77.4, 7.5]]},{id:'tw',ll:[[121.5, 25.35], [122.05, 25.0], [121.85, 24.3], [121.4, 23.0], [120.85, 21.9], [120.6, 22.3], [120.15, 22.9], [120.1, 23.6], [120.55, 24.5], [121.0, 25.1]]});
|
||||
const LANDS=LANDS_LL.map(l=>({id:l.id,hide:!!l.hide,pts:l.ll.map(q=>proj(q[0],q[1]))}));
|
||||
const DECOR=[[[-73,78],[-60,81.5],[-35,82.5],[-20,81.5],[-18,77],[-20,72],[-23,70],[-30,68],[-38,65.5],[-43,60],[-48,61],[-52,64.5],[-54,68],[-55,71],[-60,76],[-68,77]],[[-80,73.5],[-72,71.5],[-67,69.5],[-62,66.5],[-64,63],[-71,62.5],[-78,64],[-83,66],[-88,70],[-85,73]],[[-110,76],[-95,77],[-80,79],[-70,82],[-90,82.3],[-105,79]],[[-118,73],[-105,72],[-100,69.5],[-110,68.8],[-118,70]],[[140,41.5],[141.6,42.4],[143.3,42],[145.6,43.3],[144.5,44],[141.9,45.5],[141.4,43.4],[140,42.6]],[[120.1,23],[121,25.2],[121.9,25],[121.5,22.5],[120.8,21.9]],[[122,11],[125.5,11.5],[126.5,9.5],[126.2,6.5],[124,6.5],[122,7]],[[95.3,5.6],[98,4],[100.3,2],[103.8,-1],[106,-3],[106,-5.9],[104.5,-5.9],[102.3,-4],[100.3,-1],[97.5,2.4],[95.2,4]],[[109.6,2],[111,1.6],[113,3.2],[115.5,5.2],[117.2,6.9],[119,5],[118,2],[117.5,0.6],[116.2,-2.5],[116,-4],[114.5,-3.4],[111.7,-3],[110,-1.6],[109,0.5]],[[119,-5.5],[120.5,-1],[121.5,1],[125,1.5],[123,-1],[121.5,-4.5]],[[131,-1.2],[134,-0.8],[138,-1.6],[141,-2.6],[145,-4.3],[147.5,-6],[147.5,-8],[146,-8],[143.4,-9.1],[141,-9.1],[139,-8],[138,-8.5],[137.7,-5.6],[134,-4],[132,-2.8]],[[172.6,-40.5],[174.3,-41.7],[173,-43.5],[171.2,-44.5],[170.6,-45.9],[169.2,-46.6],[166.5,-46],[167,-45],[168.4,-44],[170.8,-42.6],[171.5,-41.7]],[[144.6,-40.7],[148.3,-40.9],[148,-43.2],[146,-43.5]],[[49.3,-12],[50.5,-15.5],[49.5,-17.5],[47.1,-24.9],[45,-25.5],[43.8,-23.6],[43.3,-21],[44.4,-16.2],[46.5,-15.7],[48,-13.5]],[[79.8,9.8],[81.9,7.5],[81.2,6.2],[80,6],[79.7,8.2]],[[-85,21.9],[-82,23.2],[-77.5,22.3],[-74.2,20.2],[-77.7,19.9],[-80.5,21.8]],[[-74.5,18.5],[-72,19.9],[-68.4,18.6],[-70,18.2]],[[12.4,38.1],[15.6,38.3],[15.1,36.7]],[[8.2,41],[9.8,41.1],[9.6,39.1],[8.4,39]],[[11,78],[17,80],[27,80],[20,77]],[[52,71],[56,74],[64,76.5],[68,77],[58,74],[54,71]],[[142,46],[143.5,49],[143,54],[142,53],[141.8,48]],[[108.7,19],[111,19.7],[110,18.2]]].map(poly=>poly.map(q=>proj(q[0],q[1])));
|
||||
const CITY_LL={"bcn":[2.17,41.39],"mil":[9.19,45.46],"rom":[12.5,41.9],"pmo":[13.36,38.12],"lis":[-9.14,38.72],"ath":[23.73,37.98],"atn":[-84.39,33.75],"den":[-104.99,39.74],"phx":[-112.07,33.45],"bos":[-71.06,42.36],"hou":[-95.37,29.76],"slc":[-111.89,40.76],"jed":[39.25,21.55],"ruh":[46.72,24.71],"doh":[51.45,25.28],"kyv":[30.52,50.45],"mel":[144.96, -37.81],"bne":[153.03, -27.47],"drw":[131.05,-12.46],"osa":[135.5, 34.69],"kul":[101.69, 3.14],"bkk":[100.5, 13.76],"sgn":[106.66, 10.76],"khi":[67.14,25.0],"dac":[90.41, 23.81],"cbo":[80.0, 6.95],"waw":[21.01, 52.23],"prg":[14.42, 50.08],"vie":[16.37, 48.21],"bud":[19.04, 47.5],"buh":[26.1, 44.43],"tll":[24.45,58.9],"ist":[28.98, 41.01],"for":[-38.54, -3.73],"rio":[-43.11,-22.57],"bue":[-58.38, -34.6],"scl":[-70.67, -33.45],"lim":[-76.85,-12.05],"bog":[-74.07, 4.71],"pan":[-79.52, 8.98],"del":[77.21, 28.61],"maa":[80.18,13.25],"blr":[77.59, 12.97],"hyd":[78.49, 17.39],"tpe":[121.56, 25.03],"auh":[54.37, 24.45],"fuj":[56.15,25.07],"cpt":[18.42, -33.92],"stg":[9.18,48.78],"ber":[13.4,52.52],"zrh":[8.54,47.37],"nbo":[36.82,-1.29],"cai":[31.24,30.04],"sea":[-122.33,47.61],"sjc":[-121.89,37.34],"lax":[-118.24,34.05],"dal":[-96.8,32.78],"chi":[-87.63,41.88],"ash":[-77.49,39.04],"nyc":[-74.0,40.71],"mia":[-80.19,25.76],"tor":[-79.38,43.65],"mtl":[-73.57,45.5],"mex":[-99.13,19.43],"sao":[-46.63,-23.55],"lon":[-0.13,51.51],"dub":[-6.26,53.35],"rek":[-21.94,64.15],"ams":[4.9,52.37],"fra":[8.68,50.11],"par":[2.35,48.86],"mrs":[5.37,43.3],"mad":[-3.7,40.42],"sto":[18.07,59.33],"osl":[10.75,59.91],"cph":[12.57,55.68],"hel":[24.94,60.17],"beg":[20.46,44.79],"sof":[23.32,42.7],"mos":[37.62,55.76],"lag":[3.38,6.52],"jnb":[28.05,-26.2],"dxb":[55.27,25.2],"bom":[72.88,19.08],"sin":[103.82,1.35],"jkt":[106.85,-6.2],"mnl":[120.98,14.6],"hkg":[114.17,22.32],"sha":[121.47,31.23],"pek":[116.4,39.9],"icn":[126.98,37.57],"tok":[139.69,35.69],"syd":[151.21,-33.87],"per":[115.86,-31.95],"akl":[174.76,-36.85]};
|
||||
const CITY_LL={"man":[-2.24,53.48],"edi":[-3.19,55.95],"bde":[-4.54,50.83],"svg":[5.73,58.97],"bcn":[2.17,41.39],"mil":[9.19,45.46],"rom":[12.5,41.9],"pmo":[13.36,38.12],"lis":[-9.14,38.72],"ath":[23.73,37.98],"atn":[-84.39,33.75],"den":[-104.99,39.74],"phx":[-112.07,33.45],"bos":[-71.06,42.36],"hou":[-95.37,29.76],"slc":[-111.89,40.76],"jed":[39.25,21.55],"ruh":[46.72,24.71],"doh":[51.45,25.28],"kyv":[30.52,50.45],"mel":[144.96, -37.81],"bne":[153.03, -27.47],"drw":[131.05,-12.46],"osa":[135.5, 34.69],"kul":[101.69, 3.14],"bkk":[100.5, 13.76],"sgn":[106.66, 10.76],"khi":[67.14,25.0],"dac":[90.41, 23.81],"cbo":[80.0, 6.95],"waw":[21.01, 52.23],"prg":[14.42, 50.08],"vie":[16.37, 48.21],"bud":[19.04, 47.5],"buh":[26.1, 44.43],"tll":[24.45,58.9],"ist":[28.98, 41.01],"for":[-38.54, -3.73],"rio":[-43.11,-22.57],"bue":[-58.38, -34.6],"scl":[-70.67, -33.45],"lim":[-76.85,-12.05],"bog":[-74.07, 4.71],"pan":[-79.52, 8.98],"del":[77.21, 28.61],"maa":[80.18,13.25],"blr":[77.59, 12.97],"hyd":[78.49, 17.39],"tpe":[121.56, 25.03],"auh":[54.37, 24.45],"fuj":[56.15,25.07],"cpt":[18.42, -33.92],"stg":[9.18,48.78],"ber":[13.4,52.52],"zrh":[8.54,47.37],"nbo":[36.82,-1.29],"cai":[31.24,30.04],"sea":[-122.33,47.61],"sjc":[-121.89,37.34],"lax":[-118.24,34.05],"dal":[-96.8,32.78],"chi":[-87.63,41.88],"ash":[-77.49,39.04],"nyc":[-74.0,40.71],"mia":[-80.19,25.76],"tor":[-79.38,43.65],"mtl":[-73.57,45.5],"mex":[-99.13,19.43],"sao":[-46.63,-23.55],"lon":[-0.13,51.51],"dub":[-6.26,53.35],"rek":[-21.94,64.15],"ams":[4.9,52.37],"fra":[8.68,50.11],"par":[2.35,48.86],"mrs":[5.37,43.3],"mad":[-3.7,40.42],"sto":[18.07,59.33],"osl":[10.75,59.91],"cph":[12.57,55.68],"hel":[24.94,60.17],"beg":[20.46,44.79],"sof":[23.32,42.7],"mos":[37.62,55.76],"lag":[3.38,6.52],"jnb":[28.05,-26.2],"dxb":[55.27,25.2],"bom":[72.88,19.08],"sin":[103.82,1.35],"jkt":[106.85,-6.2],"mnl":[120.98,14.6],"hkg":[114.17,22.32],"sha":[121.47,31.23],"pek":[116.4,39.9],"icn":[126.98,37.57],"tok":[139.69,35.69],"syd":[151.21,-33.87],"per":[115.86,-31.95],"akl":[174.76,-36.85]};
|
||||
const CITIES=[
|
||||
{id:'sea',name:'Seattle',x:205,y:245,land:'am',reg:'AM',P:300,ix:'Sea-IX',dc:'Westerly Carrier Hotel'},
|
||||
{id:'sjc',name:'San Jose',x:240,y:345,land:'am',reg:'AM',P:500,ix:'Silly-Con Valley IX',dc:'Equinox SV'},
|
||||
|
|
@ -783,6 +783,10 @@ const CITIES=[
|
|||
{id:'bos',name:'Boston',x:0,y:0,land:'am',reg:'AM',P:350,ix:'Chowder-IX',dc:'One Summer Street',note:tr('Universities, biotech and a carrier hotel that has outlived most of its carriers.')},
|
||||
{id:'hou',name:'Houston',x:0,y:0,land:'am',reg:'AM',P:450,ix:'Rodeo-IX',dc:'Hurricane-hardened DC',note:tr('Oil, gas and hurricanes. The generators here are sized for a week, and they have needed it.')},
|
||||
{id:'slc',name:'Salt Lake City',x:0,y:0,land:'am',reg:'AM',P:150,ix:'Fry-Sauce-IX',dc:'Great Salt Lake DC',note:tr('Cheap power, dry air and a surprising number of very quiet data centers.')},
|
||||
{id:'man',name:'Manchester',x:0,y:0,land:'uk',reg:'EU',P:350,ix:'Rainy-City-IX',dc:'Old Cotton Mill Colo',note:tr('The North’s hub, with its own exchange and very damp air-conditioning intakes. Cables to Ireland and Denmark come ashore up the coast.')},
|
||||
{id:'edi',name:'Edinburgh',x:0,y:0,land:'uk',reg:'EU',P:200,ix:'Haggis-IX',dc:'Castle Rock Colo',note:tr('Scotland’s capital. North Sea cables to Norway and the Faroes land up the coast.')},
|
||||
{id:'bde',name:'Bude',x:0,y:0,land:'uk',reg:'EU',P:3,ix:'',dc:'Clifftop Landing Station',note:tr('A tiny surfing town in Cornwall where a remarkable share of the transatlantic internet comes ashore. The cliffs are full of fiber.')},
|
||||
{id:'svg',name:'Stavanger',x:0,y:0,land:'eu',reg:'EU',P:60,ix:'Brunost-IX',dc:'Inside-a-Mountain DC',note:tr('Norway’s oil capital, now full of data centers inside mountains, run on hydro and cooled by the fjord. North Sea cables land here.')},
|
||||
];
|
||||
// Display-only nudges for cities that sit on top of each other at map scale; distances still use real lon/lat.
|
||||
const CITY_NUDGE={bcn:[-6,-4],stg:[30,6],fra:[-8,-8],auh:[-5,6],dxb:[9,-7],fuj:[8,15],rio:[14,-16],tll:[-4,22],osa:[-10,6],khi:[-2,-6],hou:[0,6],dal:[0,-4]};
|
||||
|
|
@ -857,6 +861,15 @@ const CABLES=[
|
|||
{"id":"jedx","name":"Jeddah-i Express","price":0.95,"age":"new","blurb":tr("New cables increasingly land in Jeddah instead of Egypt. This one heads for India and Singapore."),"pairs":[["jed","bom",[[38.6,22.5],[41.5,15.5],[43.4,12.4],[48,12.6],[60,15],[68,17.5]]],["jed","sin",[[38.6,22.5],[41.5,15.5],[43.4,12.4],[52,11],[70,6],[80,5.2],[92,5.5],[97,6],[100,3.6],[102.6,2.1],[103.7,1.3]]]]},
|
||||
{"id":"rsea","name":"Red Sea Shortcut","price":0.9,"age":"mid","blurb":tr("A quick hop across the Red Sea between Egypt and Saudi Arabia."),"pairs":[["cai","jed",[[32.6,29.9],[34.6,27],[37.2,23.6]]]]},
|
||||
{"id":"qgulf","name":"Doha Detour","price":1.0,"age":"mid","blurb":tr("Connects Doha to the rest of the Gulf, by sea, which is handy when the land border is closed."),"pairs":[["doh","fuj",[[52.5,26.2],[55,26.4],[56.6,26],[56.9,25.3]]],["doh","bom",[[52.5,26.2],[55,26.4],[57,25.5],[60,23],[66,21],[71,19]]]]},
|
||||
{"id":"nouk","name":"NO-UK-Way","price":0.6,"age":"new","df":true,"blurb":tr("Norway to the UK across the North Sea. Fiber pairs for sale, because the oil money wanted a hobby."),"pairs":[["svg","edi",[[5.3,58.8],[2,57.5],[-1.5,56.2]]]]},
|
||||
{"id":"celtn","name":"Celtic Norsemen","price":0.85,"age":"new","blurb":tr("Ireland to Norway, the long way round the top of Scotland. Vikings, but in reverse."),"pairs":[["dub","svg",[[-6,54],[-6.8,56.5],[-5.5,59.3],[-1.5,60.2],[3,59.5],[5.2,59]]]]},
|
||||
{"id":"havh","name":"Havhingsten Hoofbeat","price":0.8,"age":"new","blurb":tr("The Sea Stallion: Blackpool to Denmark, galloping round the north of Scotland."),"pairs":[["man","cph",[[-3.4,53.9],[-5,54.5],[-6.5,56.5],[-5,59],[-2,59.4],[2,58.5],[7,57.8],[8.2,57.2],[10.5,57.6],[11.5,56.5]]]]},
|
||||
{"id":"shefa","name":"Shefa Sheep Line","price":1.1,"age":"mid","blurb":tr("Scotland to Iceland via Shetland and the Faroes. More sheep than packets."),"pairs":[["edi","rek",[[-2.5,56.2],[-1,58],[-1.3,60.2],[-6.8,62],[-14,63.4],[-20,63.6]]]]},
|
||||
{"id":"apollo","name":"Apollo 13 (Houston, We Have Latency)","price":0.95,"age":"mid","blurb":tr("New York to the cliffs of Bude. It made it home in the end."),"pairs":[["nyc","bde",[[-70,40],[-50,43],[-25,48.5],[-8,50.2],[-5,50.8]]]]},
|
||||
{"id":"yellow","name":"Yellow Brick Road","price":0.9,"age":"mid","blurb":tr("Long Island to Cornwall. Follow it all the way to the wizard in the cable hut."),"pairs":[["nyc","bde",[[-71,40.5],[-50,44.5],[-25,49.3],[-8,50.6],[-5,50.9]]]]},
|
||||
{"id":"glo1","name":"Glo-in-the-Dark","price":1.05,"age":"mid","blurb":tr("Cornwall to Lagos down the West African coast. Glows faintly when it is working."),"pairs":[["bde","lag",[[-5.2,50.6],[-11,45],[-15,30],[-19,15],[-12,4],[2,4.5],[3.4,6]]]]},
|
||||
{"id":"pasdc","name":"Pas de Câble","price":0.6,"age":"new","df":true,"blurb":tr("Another hop across the Channel, with dark fiber for sale. There is always room for one more."),"pairs":[["lon","par",[[1.3,51.0],[1.7,50.7]]]]},
|
||||
{"id":"tampn","name":"Oil Rig Wi-Fi","price":0.9,"age":"mid","blurb":tr("Stavanger to the Netherlands via every oil platform in the North Sea. The roughnecks stream a lot of football."),"pairs":[["svg","ams",[[5.3,58.6],[4.5,56],[4.2,53.5],[4.6,52.6]]]]},
|
||||
{"id":"medusa","name":"Medusa Stare","price":0.85,"age":"new","blurb":tr("Lisbon to Barcelona and Marseille along the coast. Look straight at the latency graph and it turns to stone."),"pairs":[["lis","bcn",[[-9.6,37.9],[-8.9,36.6],[-5.6,35.9],[-2,36.4],[0.5,38.5],[2.6,41.1]]],["bcn","mrs",[[2.8,41.3],[3.8,42.4],[5,43]]]]},
|
||||
{"id":"nuvem","name":"Nuvem-ber Rain","price":0.85,"age":"new","blurb":tr("Portugal to the US Southeast via Bermuda. Means cloud in Portuguese, and is owned by one."),"pairs":[["lis","atn",[[-9.6,37.9],[-30,35],[-64.8,32.3],[-78.9,33.7]]]]},
|
||||
{"id":"blue","name":"Feeling Blue","price":0.85,"age":"new","blurb":tr("Genoa to Sicily and on to Athens, laid by a search giant that got tired of renting."),"pairs":[["mil","pmo",[[8.9,44.2],[9.4,42.5],[11.2,39.5],[12.9,38.4]]],["pmo","ath",[[13.6,38.3],[15.4,37.2],[19,36.8],[22.6,36.2],[23.6,37.6]]]]},
|
||||
|
|
@ -875,20 +888,20 @@ function cablePair(cid,a,b){const c=CABLE_PAIRS.find(x=>x.cid===cid&&((x.a===a&&
|
|||
const ALLC=CITIES.filter(c=>!c.cn&&!c.ru&&!c.ixOnly).map(c=>c.id);
|
||||
const ruCity=c=>!!CITY[c].ru;
|
||||
const cnCity=c=>!!CITY[c].cn;
|
||||
const BIGC=['bcn','mil','rom','lis','ath','atn','den','phx','bos','hou','ruh','jed','doh','kyv','mel','bne','osa','kul','bkk','sgn','khi','dac','waw','prg','vie','bud','buh','ist','rio','bue','scl','bog','lim','del','maa','blr','hyd','tpe','cpt','auh','ber','zrh','nbo','cai','jkt','mnl','per','akl','dub','lax','tor','mex','dxb','cph','icn','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mrs','mad','sto','bom','sin','hkg','tok','syd','jnb','lag'];
|
||||
const MIDC=['bcn','mil','lis','atn','den','phx','bos','hou','mel','osa','kul','bkk','waw','vie','ist','rio','bue','scl','bog','del','maa','blr','tpe','auh','ber','zrh','jkt','mnl','dub','lax','tor','dxb','icn','sjc','ash','nyc','chi','dal','mia','lon','ams','fra','par','mad','sin','hkg','tok','syd','bom','sao'];
|
||||
const BIGC=['man','edi','bcn','mil','rom','lis','ath','atn','den','phx','bos','hou','ruh','jed','doh','kyv','mel','bne','osa','kul','bkk','sgn','khi','dac','waw','prg','vie','bud','buh','ist','rio','bue','scl','bog','lim','del','maa','blr','hyd','tpe','cpt','auh','ber','zrh','nbo','cai','jkt','mnl','per','akl','dub','lax','tor','mex','dxb','cph','icn','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mrs','mad','sto','bom','sin','hkg','tok','syd','jnb','lag'];
|
||||
const MIDC=['man','bcn','mil','lis','atn','den','phx','bos','hou','mel','osa','kul','bkk','waw','vie','ist','rio','bue','scl','bog','del','maa','blr','tpe','auh','ber','zrh','jkt','mnl','dub','lax','tor','dxb','icn','sjc','ash','nyc','chi','dal','mia','lon','ams','fra','par','mad','sin','hkg','tok','syd','bom','sao'];
|
||||
|
||||
/* ================= NETWORKS ================= */
|
||||
const NETS=[
|
||||
{id:'lvl',name:'Level Tree',asn:3535,type:'t1',pol:'restrictive',share:.07,price:9,col:'#7B61FF',pops:['mil','rom','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','dub','cph','osl','tor','lax','mex','mtl','sea','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mad','rio','bue','scl','bog','lim','pan','waw','prg','vie','bud','buh','ist'],ix:[],blurb:tr('Grew from a seedling into a global backbone. Leaves no route behind.')},
|
||||
{id:'ntt',name:'Not That Telecom',asn:2941,type:'t1',pol:'restrictive',share:.06,price:8,col:'#4B3FC4',pops:['mil','atn','den','bos','hou','phx','jkt','mnl','per','lax','dxb','icn','sea','sjc','dal','ash','nyc','lon','ams','fra','sin','hkg','tok','syd','tpe','del','maa','blr','hyd','osa','kul','bkk','sgn'],ix:[],blurb:tr('Huge in Asia. "Which telecom?" "Not that one."')},
|
||||
{id:'tly',name:'Tell-Ya Carrier',asn:1229,type:'t1',pol:'restrictive',share:.05,price:8,col:'#9D4EDD',pops:['mil','rom','pmo','ath','ber','osl','cph','hel','beg','sof','chi','ash','nyc','mia','lon','ams','fra','par','sto','mad','mrs','hkg','sin','tpe','tll','waw','vie','bud','buh','prg','kyv'],ix:[],blurb:tr('Nordic backbone that tells you exactly where your packets went.')},
|
||||
{id:'cog',name:'Cogentle',asn:714,type:'t1',pol:'restrictive',share:.04,price:3,col:'#B35CF0',pops:['bcn','mil','rom','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','dub','hel','sof','beg','tor','lax','mex','cph','icn','sea','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mad','mrs','sto','sin','hkg','tok','rio','bue','scl','bog','lim','osa','waw','prg','vie','bud','buh','ist','kyv'],ix:[],blurb:tr('Cheapest transit on the map. Famously gentle, except during peering spats.')},
|
||||
{id:'lvl',name:'Level Tree',asn:3535,type:'t1',pol:'restrictive',share:.07,price:9,col:'#7B61FF',pops:['bde','man','edi','svg','mil','rom','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','dub','cph','osl','tor','lax','mex','mtl','sea','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mad','rio','bue','scl','bog','lim','pan','waw','prg','vie','bud','buh','ist'],ix:[],blurb:tr('Grew from a seedling into a global backbone. Leaves no route behind.')},
|
||||
{id:'ntt',name:'Not That Telecom',asn:2941,type:'t1',pol:'restrictive',share:.06,price:8,col:'#4B3FC4',pops:['man','mil','atn','den','bos','hou','phx','jkt','mnl','per','lax','dxb','icn','sea','sjc','dal','ash','nyc','lon','ams','fra','sin','hkg','tok','syd','tpe','del','maa','blr','hyd','osa','kul','bkk','sgn'],ix:[],blurb:tr('Huge in Asia. "Which telecom?" "Not that one."')},
|
||||
{id:'tly',name:'Tell-Ya Carrier',asn:1229,type:'t1',pol:'restrictive',share:.05,price:8,col:'#9D4EDD',pops:['svg','edi','man','mil','rom','pmo','ath','ber','osl','cph','hel','beg','sof','chi','ash','nyc','mia','lon','ams','fra','par','sto','mad','mrs','hkg','sin','tpe','tll','waw','vie','bud','buh','prg','kyv'],ix:[],blurb:tr('Nordic backbone that tells you exactly where your packets went.')},
|
||||
{id:'cog',name:'Cogentle',asn:714,type:'t1',pol:'restrictive',share:.04,price:3,col:'#B35CF0',pops:['bde','man','edi','bcn','mil','rom','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','dub','hel','sof','beg','tor','lax','mex','cph','icn','sea','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mad','mrs','sto','sin','hkg','tok','rio','bue','scl','bog','lim','osa','waw','prg','vie','bud','buh','ist','kyv'],ix:[],blurb:tr('Cheapest transit on the map. Famously gentle, except during peering spats.')},
|
||||
{id:'tat',name:'Ta-Ta Comms',asn:6543,type:'t1',pol:'restrictive',share:.04,price:9,col:'#6A4C93',pops:['mil','pmo','lis','nbo','cai','jkt','dxb','nyc','ash','lon','fra','mrs','lag','jnb','bom','sin','hkg','tok','del','maa','blr','hyd','cpt','fuj','auh','tpe','khi','dac','cbo','kul','bkk','jed','ruh','doh'],ix:[],blurb:tr('Waves goodbye to latency across the Indian Ocean.')},
|
||||
{id:'drz',name:'Drizzle Electric',asn:9369,type:'t2',pol:'open',share:.04,price:4,col:'#1E90FF',pops:['bcn','mil','rom','pmo','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','nbo','akl','per','jkt','mnl','dub','rek','tor','mtl','lax','mex','sof','osl','icn','sea','sjc','dal','chi','ash','nyc','mia','lon','ams','fra','par','sto','mad','hkg','sin','tok','syd','jnb','for','rio','bue','scl','lim','bog','pan','del','maa','blr','hyd','tpe','auh','cpt','mel','bne','osa','kul','bkk','sgn','khi','dac','cbo','waw','prg','vie','bud','buh','tll','ist','kyv','jed','ruh','doh'],ix:'ALL',blurb:tr('Will peer with anyone, anywhere. Rumored to mail out IPv6 cakes.')},
|
||||
{id:'drz',name:'Drizzle Electric',asn:9369,type:'t2',pol:'open',share:.04,price:4,col:'#1E90FF',pops:['man','edi','svg','bde','bcn','mil','rom','pmo','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','nbo','akl','per','jkt','mnl','dub','rek','tor','mtl','lax','mex','sof','osl','icn','sea','sjc','dal','chi','ash','nyc','mia','lon','ams','fra','par','sto','mad','hkg','sin','tok','syd','jnb','for','rio','bue','scl','lim','bog','pan','del','maa','blr','hyd','tpe','auh','cpt','mel','bne','osa','kul','bkk','sgn','khi','dac','cbo','waw','prg','vie','bud','buh','tll','ist','kyv','jed','ruh','doh'],ix:'ALL',blurb:tr('Will peer with anyone, anywhere. Rumored to mail out IPv6 cakes.')},
|
||||
{id:'tng',name:'Tangerine Telecom',asn:5115,type:'t2',pol:'selective',minIx:15,minPni:40,share:.03,price:6,col:'#FF8C42',pops:['bcn','cai','nbo','dxb','par','mrs','mad','lon','ams','lag','jnb','waw','buh'],ix:['bcn','par','mrs','mad','lon','ams','lag','jnb','waw'],blurb:tr('Juicy reach into Europe and Africa.')},
|
||||
{id:'sgt',name:'SingTell',asn:7474,type:'t2',pol:'selective',minIx:15,minPni:40,share:.03,price:7,col:'#00A6A6',pops:['jkt','mnl','per','akl','icn','sin','hkg','tok','syd','bom','tpe','maa','kul','bkk','sgn','mel'],ix:['sin','hkg','tok','syd','bom','tpe','maa','kul','bkk'],blurb:tr('Sings your packets across Asia-Pacific.')},
|
||||
{id:'vdp',name:'Voda-Phony',asn:1373,type:'t2',pol:'paid',paidFee:8000,share:.03,price:6,col:'#E63946',pops:['mil','rom','lis','ath','nbo','cai','ber','dub','dxb','lon','fra','ams','mad','mrs','jnb','bom','lag','cpt','del','maa','ist','prg','bud','buh','doh'],ix:[],blurb:tr('Ended free peering across Europe and handed it to Inter.Clink, its “interconnection partner”, who will happily sell you a direct connection. Paid peering only, over a PNI. Ring ring, it’s the invoice.')},
|
||||
{id:'vdp',name:'Voda-Phony',asn:1373,type:'t2',pol:'paid',paidFee:8000,share:.03,price:6,col:'#E63946',pops:['man','edi','mil','rom','lis','ath','nbo','cai','ber','dub','dxb','lon','fra','ams','mad','mrs','jnb','bom','lag','cpt','del','maa','ist','prg','bud','buh','doh'],ix:[],blurb:tr('Ended free peering across Europe and handed it to Inter.Clink, its “interconnection partner”, who will happily sell you a direct connection. Paid peering only, over a PNI. Ring ring, it’s the invoice.')},
|
||||
{id:'ctc',name:'China Telecomet',asn:4314,type:'t2',pol:'restrictive',share:.02,price:22,premium:2.5,cn:true,col:'#0B5CAD',pops:['pek','sha','hkg','sin','tok','lon','fra','nyc','sjc'],ix:[],blurb:tr('The biggest network in China. Its CN-Too premium route skips the congested border, for a price.')},
|
||||
{id:'cun',name:'China Unicorn',asn:4837,type:'t2',pol:'restrictive',share:.015,price:16,cn:true,col:'#D7000F',pops:['pek','sha','hkg','fra','sjc','lon'],ix:[],blurb:tr('Number two in China, with a horn for every backbone.')},
|
||||
{id:'cmb',name:'China Moble',asn:9880,type:'eye',pol:'paid',paidFee:12000,share:.01,cn:true,col:'#0085CA',pops:['pek','sha','hkg'],ix:[],blurb:tr('The largest mobile network on Earth. Paid peering only.')},
|
||||
|
|
@ -1056,6 +1069,11 @@ NETS.push(
|
|||
{id:'ktt',name:'Kay-Tea',asn:4766,type:'eye',pol:'paid',paidFee:5000,perG:90,kr:true,share:.012,col:'#E4002B',pops:['icn','hkg','tok','lax'],ix:[],blurb:tr('Korea’s incumbent. Sender pays: every gigabit you hand it is billed, on top of the port.')},
|
||||
{id:'skb',name:'SK Broadbandit',asn:9318,type:'eye',pol:'paid',paidFee:4000,perG:110,kr:true,share:.01,col:'#EA002C',pops:['icn','hkg','sjc'],ix:[],blurb:tr('Took a streaming giant to court over who pays for the traffic its own customers asked for. Paid peering, per gigabit.')},
|
||||
{id:'lgu',name:'LG You-Pay-Plus',asn:3786,type:'eye',pol:'paid',paidFee:3000,perG:80,kr:true,share:.008,col:'#E6007E',pops:['icn','tok'],ix:[],blurb:tr('The plus is a usage fee. Paid peering, per gigabit.')});
|
||||
NETS.push(
|
||||
{id:'btt',name:'Bee-Tee',asn:2856,type:'eye',pol:'selective',minIx:10,minPni:30,share:.012,col:'#5514B4',pops:['lon','man','edi','bde'],ix:['lon','man'],blurb:tr('The UK’s incumbent. Buzzes politely, stings on price.')},
|
||||
{id:'sky',name:'Sky-High Broadband',asn:5607,type:'eye',pol:'selective',minIx:6,minPni:25,share:.008,col:'#0072C9',pops:['lon','man','edi','dub'],ix:['lon','man','edi'],blurb:tr('Football, films and a router that looks like a spaceship.')},
|
||||
{id:'vmo',name:'Virgin Mediocre',asn:5089,type:'eye',pol:'selective',minIx:6,minPni:25,share:.007,col:'#E10A0A',pops:['lon','man','edi'],ix:['lon','man'],blurb:tr('Cable broadband for half of Britain. Fast on a good day.')},
|
||||
{id:'tnr',name:'Tele-Nor-Way',asn:2119,type:'eye',pol:'selective',minIx:5,minPni:20,share:.006,col:'#00A9E0',pops:['osl','svg','sto','cph'],ix:['osl','svg'],blurb:tr('Norway’s incumbent. Neither yes nor no, until you send enough traffic.')});
|
||||
const NET=Object.fromEntries(NETS.map(n=>[n.id,n]));
|
||||
for(const X of XIX){X.members=NETS.filter(n=>Array.isArray(n.ix)&&n.ix.includes(X.id)||!n.tail&&(X.core?X.core.includes(n.id):(n.ix==='ALL'||Array.isArray(n.ix)&&n.ix.includes(X.c))&&hstr(n.id+'|'+X.id)%100<(n.ix==='ALL'?72:X.take*100))).map(n=>n.id);}
|
||||
const NSH={}; {const t=NETS.reduce((a,n)=>a+n.share,0); NETS.forEach(n=>NSH[n.id]=n.share/t);}
|
||||
|
|
|
|||
|
|
@ -363,3 +363,17 @@ test('Sparkly Seabone is a Tier 1 now, but old saves keep the five they played f
|
|||
assert.equal(ev("t1Need().length"), 5, 'older saves keep five');
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test('more UK and Norway: Manchester, Edinburgh, Bude and Stavanger with North Sea and Atlantic cables', () => {
|
||||
const { ev, errors } = load();
|
||||
for (const c of ['man', 'edi', 'bde', 'svg']) {
|
||||
assert.ok(ev(`!!CITY.${c}`), c);
|
||||
assert.ok(ev(`NETS.filter(n=>n.price&&n.pops.includes('${c}')).length`) >= 2, `${c} has transit sellers`);
|
||||
}
|
||||
for (const [a, b] of [['svg', 'edi'], ['dub', 'svg'], ['man', 'cph'], ['edi', 'rek'], ['nyc', 'bde'], ['bde', 'lag'], ['svg', 'ams']])
|
||||
assert.ok(ev(`cablesFor('${a}','${b}').length`) > 0, `${a}-${b} cable`);
|
||||
assert.ok(ev("subDfCable('svg','edi')"), 'NO-UK sells dark fiber pairs');
|
||||
assert.equal(ev("cablesFor('lon','par').length"), 2, 'two ways under the Channel');
|
||||
assert.ok(ev("['btt','sky','vmo'].every(n=>NET[n].pops.includes('man'))"));
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue