feat(world): add Bilbao and land the Biscay cables there
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
5b24282224
commit
e23a0e2c90
15 changed files with 91 additions and 15 deletions
|
|
@ -6,6 +6,7 @@ All notable changes to this project are documented here. The project follows
|
|||
|
||||
## [Unreleased]
|
||||
|
||||
- Bilbao joins the map, where the transatlantic cables really come ashore: Marea Carey, Grace Hopscotch, Sol Survivor and Columbus III-and-a-half now land there instead of Madrid. It has no exchange of its own, so traffic heads inland to Madrid, and Drizzle Electric, Tangerine Telecom and the big carriers sell transit there. A link you already run on the old Madrid landings keeps working as a plain subsea link, and the Mid-Atlantic Accent scenario now goes Azores, Bilbao, Madrid, and Marea Carey now leaves the American coast at Virginia Beach instead of crossing the northeast to New Jersey.
|
||||
## [2.9.1] — 2026-11-04
|
||||
|
||||
- Jokes in the game now poke fun at networks, cables and routers, never at people, countries or beliefs. A few networks have new names (Atlas Hold-the-Line Telecom, Star-Blink, Telekom Malay-tency, Oh Yas Sénégal, Afghan Tele-Pass, Island-Hop Micronesia, Tel-One-derful, Tango Two-Step), so do three of the names for your own cables, and about forty descriptions of networks, cities, cables and events were rewritten.
|
||||
|
|
|
|||
|
|
@ -908,6 +908,7 @@
|
|||
"cities.the_seychelles_capital_on_mah":"Die Hauptstadt der Seychellen auf Mahé: 115 Inseln, Riesenschildkröten und zwei Kabel zum Festland.",
|
||||
"cities.the_solomon_islands_capital_on":"Die Hauptstadt der Salomonen, auf Guadalcanal. Das Kabel nach Sydney kam erst vor ein paar Jahren; davor lief alles über Satellit. Der Strom ist unzuverlässiger als das Kabel.",
|
||||
"cities.the_southeast_s_carrier_hotel":"Das Carrier-Hotel des Südostens. Geschäftigster Flughafen, geschäftigstes Peering südlich von Ashburn.",
|
||||
"cities.the_transatlantic_cables_come_ashore_here":"Hier kommen die Transatlantikkabel an der baskischen Küste an Land. Der Exchange sitzt in Madrid, also eilt der meiste Traffic landeinwärts.",
|
||||
"cities.the_venice_of_brazil_all_bridges":"Das Venedig Brasiliens, lauter Brücken und Flüsse, mit einem der größten Technologieparks des Landes im alten Hafen.",
|
||||
"cities.the_whole_country_is_one_network":"Das ganze Land ist ein einziges Netz, das eine Handvoll Routen ankündigt, und normale Haushalte hängen nicht dran.",
|
||||
"cities.the_whole_country_on_one_cable":"Das ganze Land an einem Kabel: ein Abzweig von ACE, 2011 angelandet und von allen Betreibern geteilt.",
|
||||
|
|
|
|||
|
|
@ -906,6 +906,7 @@
|
|||
"cities.the_seychelles_capital_on_mah":"La capital de las Seychelles, en Mahé: 115 islas, tortugas gigantes y dos cables al continente.",
|
||||
"cities.the_solomon_islands_capital_on":"La capital de las Islas Salomón, en Guadalcanal. El cable a Sídney llegó hace pocos años; antes todo era satélite. La electricidad es menos fiable que el cable.",
|
||||
"cities.the_southeast_s_carrier_hotel":"El carrier hotel del Sureste. El aeropuerto más concurrido, el peering más concurrido al sur de Ashburn.",
|
||||
"cities.the_transatlantic_cables_come_ashore_here":"Aquí llegan a tierra los cables transatlánticos, en la costa vasca. El punto de intercambio está en Madrid, así que casi todo el tráfico se va tierra adentro.",
|
||||
"cities.the_venice_of_brazil_all_bridges":"La Venecia de Brasil, toda puentes y ríos, con uno de los mayores parques tecnológicos del país en su viejo puerto.",
|
||||
"cities.the_whole_country_is_one_network":"Todo el país es una sola red que anuncia un puñado de rutas, y los hogares normales no están conectados.",
|
||||
"cities.the_whole_country_on_one_cable":"Todo el país en un cable: un ramal de ACE, que llegó en 2011 y que comparten todos los operadores.",
|
||||
|
|
|
|||
|
|
@ -906,6 +906,7 @@
|
|||
"cities.the_seychelles_capital_on_mah":"La capitale des Seychelles, sur Mahé : 115 îles, des tortues géantes et deux câbles vers le continent.",
|
||||
"cities.the_solomon_islands_capital_on":"La capitale des Îles Salomon, sur Guadalcanal. Le câble vers Sydney n’est arrivé qu’il y a quelques années ; avant, tout passait par satellite. Le courant est moins fiable que le câble.",
|
||||
"cities.the_southeast_s_carrier_hotel":"Le carrier hotel du Sud-Est. L’aéroport le plus fréquenté, le peering le plus fréquenté au sud d’Ashburn.",
|
||||
"cities.the_transatlantic_cables_come_ashore_here":"C'est ici, sur la côte basque, qu'arrivent les câbles transatlantiques. L'exchange est à Madrid, donc presque tout le trafic file vers l'intérieur des terres.",
|
||||
"cities.the_venice_of_brazil_all_bridges":"La Venise du Brésil, toute en ponts et en rivières, avec l’un des plus grands parcs technologiques du pays dans son vieux port.",
|
||||
"cities.the_whole_country_is_one_network":"Tout le pays est un seul réseau qui annonce une poignée de routes, et les foyers ordinaires n’y sont pas raccordés.",
|
||||
"cities.the_whole_country_on_one_cable":"Tout le pays sur un seul câble : une branche d’ACE, atterrie en 2011 et partagée par tous les opérateurs.",
|
||||
|
|
|
|||
|
|
@ -906,6 +906,7 @@
|
|||
"cities.the_seychelles_capital_on_mah":"La capitale delle Seychelles, su Mahé: 115 isole, tartarughe giganti e due cavi verso il continente.",
|
||||
"cities.the_solomon_islands_capital_on":"La capitale delle Isole Salomone, su Guadalcanal. Il cavo per Sydney è arrivato solo pochi anni fa; prima era tutto satellite. La corrente è meno affidabile del cavo.",
|
||||
"cities.the_southeast_s_carrier_hotel":"Il carrier hotel del Sud-Est. L’aeroporto più trafficato, il peering più trafficato a sud di Ashburn.",
|
||||
"cities.the_transatlantic_cables_come_ashore_here":"Qui, sulla costa basca, approdano i cavi transatlantici. L'exchange è a Madrid, quindi quasi tutto il traffico corre verso l'interno.",
|
||||
"cities.the_venice_of_brazil_all_bridges":"La Venezia del Brasile, tutta ponti e fiumi, con uno dei più grandi parchi tecnologici del paese nel suo vecchio porto.",
|
||||
"cities.the_whole_country_is_one_network":"L’intero paese è un’unica rete che annuncia una manciata di rotte, e le case normali non ci sono collegate.",
|
||||
"cities.the_whole_country_on_one_cable":"Tutto il paese su un cavo: una diramazione di ACE, approdata nel 2011 e condivisa da tutti gli operatori.",
|
||||
|
|
|
|||
|
|
@ -906,6 +906,7 @@
|
|||
"cities.the_seychelles_capital_on_mah":"A capital das Seychelles, em Mahé: 115 ilhas, tartarugas gigantes e dois cabos para o continente.",
|
||||
"cities.the_solomon_islands_capital_on":"A capital das Ilhas Salomão, em Guadalcanal. O cabo para Sydney só chegou há poucos anos; antes era tudo satélite. A energia é menos confiável que o cabo.",
|
||||
"cities.the_southeast_s_carrier_hotel":"O carrier hotel do Sudeste. Aeroporto mais movimentado, peering mais movimentado ao sul de Ashburn.",
|
||||
"cities.the_transatlantic_cables_come_ashore_here":"É aqui, na costa basca, que chegam os cabos transatlânticos. O exchange fica em Madrid, então quase todo o tráfego segue para o interior.",
|
||||
"cities.the_venice_of_brazil_all_bridges":"A Veneza brasileira, toda pontes e rios, com um dos maiores parques tecnológicos do país no porto antigo.",
|
||||
"cities.the_whole_country_is_one_network":"O país inteiro é uma só rede anunciando um punhado de rotas, e as casas comuns não estão nela.",
|
||||
"cities.the_whole_country_on_one_cable":"O país inteiro em um cabo: um ramal do ACE, que chegou em 2011 e é compartilhado por todas as operadoras.",
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ const CITY_LL={
|
|||
"bgi":[-59.58,13.12],
|
||||
"bgw":[44.37,33.31],
|
||||
"bhz":[-43.94,-19.92],
|
||||
"bio":[-2.93,43.26],
|
||||
"bis":[-100.78,46.81],
|
||||
"bjl":[-16.5,13.51],
|
||||
"bkk":[100.5, 13.76],
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ const CITIES=[
|
|||
{id:'sto',name:'Stockholm',x:1110,y:160,land:'eu',reg:'EU',cc:'SE',P:300,ix:'NodNod',dc:'Nuclear Bunker DC'},
|
||||
{id:'bcn',name:'Barcelona',x:0,y:0,land:'eu',reg:'EU',cc:'ES',P:300,ix:'Catnip-IX',dc:'Poblenou DC',note:tr('cities.catalonia_s_own_exchange_small_and')},
|
||||
{id:'mad',name:'Madrid',x:935,y:392,land:'eu',reg:'EU',cc:'ES',P:600,ix:'Siesta-IX',dc:'Interaction MAD'},
|
||||
{id:'bio',name:'Bilbao',x:0,y:0,land:'eu',reg:'EU',cc:'ES',P:150,ix:'',dc:'Guggen-Rack',note:tr('cities.the_transatlantic_cables_come_ashore_here')},
|
||||
{id:'lag',name:'Lagos',x:1010,y:565,land:'af',reg:'AF',cc:'NG',P:500,ix:'Jollof-IX',dc:'Rack-n-Roll Centre'},
|
||||
{id:'jnb',name:'Johannesburg',x:1130,y:730,land:'af',reg:'AF',cc:'ZA',P:400,za:true,ix:'Braai-IX',dc:'Tera-Cotta Campus'},
|
||||
{id:'bom',name:'Mumbai',x:1385,y:488,land:'eu',reg:'AS',cc:'IN',P:1100,india:true,ix:'Mumb-IX',dc:'Goregaon Tech Park'},
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ const CITY_PDB={
|
|||
bgi:[1,5,20], // est.
|
||||
bgw:[3,2,222],
|
||||
bhz:[13,40,9693],
|
||||
bio:[1,8,1341], // pulled 2026-11-01: PeeringDB lists Telxius Derio DC alone (8 networks); ASNs are Spain's
|
||||
bis:[0,0,33300], // est.
|
||||
bjl:[1,1,12],
|
||||
bkk:[32,397,675],
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,12 +1,12 @@
|
|||
/* ================= NETWORKS ================= */
|
||||
const NETS=[
|
||||
{id:'lvl',name:'Level Tree',asn:3535,type:'t1',pol:'restrictive',share:.07,price:9,col:'#7B61FF',pops:['syd','hfx','bda','hnl','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','kcy','cal','van','ott','bru','bet','ham','muc','cpq','gdl','mty','qro','was','mgm','lit','sac','hfd','dov','tlh','boi','spi','ind','dsm','top','fft','btr','aug','anp','lan','stp','jan','jef','hln','lnk','csn','con','ttn','saf','alb','rdu','bis','cmh','okc','sle','har','pvd','cae','pir','bna','aus','mpv','ric','olm','crw','msn','cys'],ix:[],blurb:tr('networks.grew_from_a_seedling_into_a')},
|
||||
{id:'lvl',name:'Level Tree',asn:3535,type:'t1',pol:'restrictive',share:.07,price:9,col:'#7B61FF',pops:['syd','hfx','bda','hnl','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','bio','rio','bue','scl','bog','lim','pan','waw','prg','vie','bud','buh','ist','kcy','cal','van','ott','bru','bet','ham','muc','cpq','gdl','mty','qro','was','mgm','lit','sac','hfd','dov','tlh','boi','spi','ind','dsm','top','fft','btr','aug','anp','lan','stp','jan','jef','hln','lnk','csn','con','ttn','saf','alb','rdu','bis','cmh','okc','sle','har','pvd','cae','pir','bna','aus','mpv','ric','olm','crw','msn','cys'],ix:[],blurb:tr('networks.grew_from_a_seedling_into_a')},
|
||||
{id:'ntt',name:'Not That Telecom',asn:2941,type:'t1',pol:'restrictive',share:.06,price:8,col:'#4B3FC4',pops:['hnl','gum','man','mil','atn','den','bos','hou','phx','jkt','mnl','lax','dxb','icn','sea','sjc','dal','ash','nyc','lon','ams','fra','sin','hkg','tok','syd','tpe','del','maa','blr','hyd','osa','kul','bkk','sgn','kcy','dus','fuk'],ix:[],blurb:tr('networks.huge_in_asia_which_telecom_not')},
|
||||
{id:'tly',name:'Tell-Ya Carrier',asn:1229,type:'t1',pol:'restrictive',share:.05,price:8,col:'#9D4EDD',pops:['pdl','tci','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','van','bru','ham','muc','dus','krs','ebj','rix','zag','bts'],ix:[],blurb:tr('networks.nordic_backbone_that_tells_you')},
|
||||
{id:'cog',name:'Cogentle',asn:714,type:'t1',pol:'restrictive',share:.04,price:3,col:'#B35CF0',pops:['hfx','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','kcy','van','ott','bru','oos','bet','ham','muc','dus','syd','per','was','sac','ind','stp','cmh','aus','bna','rdu','ric','okc','alb','pvd','hfd','har','msn','zag','vno','bts','lju','brn','pry'],ix:[],blurb:tr('networks.cheapest_transit_on_the_map_famously')},
|
||||
{id:'cog',name:'Cogentle',asn:714,type:'t1',pol:'restrictive',share:.04,price:3,col:'#B35CF0',pops:['hfx','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','bio','mrs','sto','sin','hkg','tok','rio','bue','scl','bog','lim','osa','waw','prg','vie','bud','buh','ist','kyv','kcy','van','ott','bru','oos','bet','ham','muc','dus','syd','per','was','sac','ind','stp','cmh','aus','bna','rdu','ric','okc','alb','pvd','hfd','har','msn','zag','vno','bts','lju','brn','pry'],ix:[],blurb:tr('networks.cheapest_transit_on_the_map_famously')},
|
||||
{id:'tat',name:'Ta-Ta Comms',asn:6543,type:'t1',pol:'restrictive',share:.04,price:9,col:'#6A4C93',pops:['tci','gum','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','jib','dar','mba','dkr'],ix:[],blurb:tr('networks.waves_goodbye_to_latency_across_the')},
|
||||
{id:'drz',name:'Drizzle Electric',asn:9369,type:'t2',pol:'open',share:.04,price:4,col:'#1E90FF',auIx:['syd','mel','bne','per'],pops:['man','chc','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','kcy','cal','van','ott','bru','oos','bet','ham','muc','ccs','lpb','alg','tun','cas','dkr','dus','was','sac','ind','stp','cmh','aus','bna','rdu','ric','okc','alb','dsm','msn','boi','yeg','ywg','yxe','yqb','tia','zag','vno','skp','bts','lju','pnh','wlg'],ix:'ALL',blurb:tr('networks.will_peer_with_anyone_anywhere')},
|
||||
{id:'tng',name:'Tangerine Telecom',asn:5115,type:'t1',cc:['CD','CI','CM','EG','ES','FR','MA','MG','MQ','PL','RE','RO','SN','TN','MD','SK','JO','BF','CF','GN','GW','LR','ML','SL'],pol:'selective',minIx:15,minPni:40,share:.03,price:6,col:'#FF8C42',pops:['tci','bcn','cai','nbo','dxb','fra','par','mrs','mad','lon','ams','lag','jnb','waw','buh','dkr','abj','cas','tun','dla','fih','fdf','run','tnr','kiv','bts','amm','oua','cky','oxb','rob','bko','fna','bgf','ask','nsi','rba'],ix:['bcn','par','mrs','mad','lon','ams','lag','jnb','waw','dkr','abj','cas','tun','dla','fih'],blurb:tr('networks.juicy_reach_into_europe_and_africa')},
|
||||
{id:'drz',name:'Drizzle Electric',asn:9369,type:'t2',pol:'open',share:.04,price:4,col:'#1E90FF',auIx:['syd','mel','bne','per'],pops:['man','chc','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','bio','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','kcy','cal','van','ott','bru','oos','bet','ham','muc','ccs','lpb','alg','tun','cas','dkr','dus','was','sac','ind','stp','cmh','aus','bna','rdu','ric','okc','alb','dsm','msn','boi','yeg','ywg','yxe','yqb','tia','zag','vno','skp','bts','lju','pnh','wlg'],ix:'ALL',blurb:tr('networks.will_peer_with_anyone_anywhere')},
|
||||
{id:'tng',name:'Tangerine Telecom',asn:5115,type:'t1',cc:['CD','CI','CM','EG','ES','FR','MA','MG','MQ','PL','RE','RO','SN','TN','MD','SK','JO','BF','CF','GN','GW','LR','ML','SL'],pol:'selective',minIx:15,minPni:40,share:.03,price:6,col:'#FF8C42',pops:['tci','bcn','cai','nbo','dxb','fra','par','mrs','mad','bio','lon','ams','lag','jnb','waw','buh','dkr','abj','cas','tun','dla','fih','fdf','run','tnr','kiv','bts','amm','oua','cky','oxb','rob','bko','fna','bgf','ask','nsi','rba'],ix:['bcn','par','mrs','mad','lon','ams','lag','jnb','waw','dkr','abj','cas','tun','dla','fih'],blurb:tr('networks.juicy_reach_into_europe_and_africa')},
|
||||
{id:'sgt',name:'SingTell',asn:7474,type:'t2',cc:'SG',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','bne'],ix:['sin','hkg','tok','bom','tpe','maa','kul','bkk'],blurb:tr('networks.sings_your_packets_across_asia')},
|
||||
{id:'vdp',name:'Voda-Phony',asn:1373,type:'t2',cc:['CD','CZ','DE','EG','ES','GB','GR','IE','MZ','NL','PT','QA','RO','TR','TZ','ZA','AL','LS'],pol:'paid',freeLv:7,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','acc','dar','fih','mpm','dus','tia','msu','pry','dod'],ix:[],blurb:tr('networks.ended_free_peering_across_europe_and')},
|
||||
{id:'ctc',name:'China Telecomet',asn:4314,type:'t2',cc:'CN',pol:'restrictive',share:.02,price:22,premium:2.5,premAt:['hkg','mos'],premOnly:['mos'],cn:true,col:'#0B5CAD',pops:['pek','sha','hkg','sin','tok','lon','fra','nyc','sjc'],ix:[],blurb:tr('networks.the_biggest_network_in_china_its')},
|
||||
|
|
@ -105,7 +105,7 @@ NETS.push({id:'stc',name:'Sticky Telecom',asn:39368,type:'t2',cc:['SA','BH','KW'
|
|||
{id:'ord',name:'Ooh-redoo',asn:8871,type:'eye',cc:['QA','OM','ID','IQ','KW'],pol:'paid',freeLv:11,paidFee:5000,share:.004,up:['tat','tly'],col:'#ED1C24',pops:['doh','dxb','jkt','mct','bgw','kwi'],ix:[],blurb:tr('networks.qatar_s_big_operator_paid_peering')});
|
||||
NETS.push(
|
||||
{id:'tim',name:'TIM-Tam Italia',asn:3269,type:'eye',cc:['IT','SM'],pol:'selective',minIx:8,minPni:25,share:.008,up:['skl'],col:'#004691',pops:['mil','rom','pmo','smr'],ix:['mil','rom'],blurb:tr('networks.italy_s_incumbent_sweet_on_the')},
|
||||
{id:'skl',name:'Sparkly Seabone',asn:6762,type:'t1',pol:'restrictive',share:.04,price:6,col:'#5B2C83',pops:['pmo','mil','rom','ath','mrs','bcn','mad','lis','par','lon','ams','fra','zrh','vie','bud','prg','waw','buh','sof','ist','ber','sto','nyc','ash','mia','atn','dal','chi','lax','sjc','tor','mex','pan','bog','lim','scl','bue','sao','rio','for','cai','jed','dxb','bom','sin','hkg','tok','hav'],ix:[],blurb:tr('networks.the_tier_1_that_grew_up')},
|
||||
{id:'skl',name:'Sparkly Seabone',asn:6762,type:'t1',pol:'restrictive',share:.04,price:6,col:'#5B2C83',pops:['pmo','mil','rom','ath','mrs','bcn','mad','bio','lis','par','lon','ams','fra','zrh','vie','bud','prg','waw','buh','sof','ist','ber','sto','nyc','ash','mia','atn','dal','chi','lax','sjc','tor','mex','pan','bog','lim','scl','bue','sao','rio','for','cai','jed','dxb','bom','sin','hkg','tok','hav'],ix:[],blurb:tr('networks.the_tier_1_that_grew_up')},
|
||||
{id:'fwb',name:'Fast-Webby',asn:12874,type:'eye',cc:'IT',pol:'open',share:.004,col:'#FDC300',pops:['mil','rom'],ix:['mil','rom'],blurb:tr('networks.fiber_to_the_italian_home_with')},
|
||||
{id:'meo',name:'MEO-w Portugal',asn:3243,type:'eye',cc:'PT',pol:'selective',minIx:5,minPni:20,share:.004,col:'#00A3E0',pops:['pdl','lis','mad'],ix:['lis'],blurb:tr('networks.portugal_s_incumbent_purrs_when_you')},
|
||||
{id:'nos',name:'NOS-y Neighbour',asn:2860,type:'eye',cc:'PT',pol:'open',share:.003,col:'#111111',pops:['lis'],ix:['lis'],blurb:tr('networks.peers_with_anyone_and_wants_to')},
|
||||
|
|
|
|||
|
|
@ -907,6 +907,7 @@
|
|||
"cities.the_seychelles_capital_on_mah":"The Seychelles’ capital on Mahé: 115 islands, giant tortoises and two cables to the mainland.",
|
||||
"cities.the_solomon_islands_capital_on":"The Solomon Islands’ capital, on Guadalcanal. The cable to Sydney only arrived a few years ago; before that it was all satellite. The power is less reliable than the cable.",
|
||||
"cities.the_southeast_s_carrier_hotel":"The Southeast’s carrier hotel. Busiest airport, busiest peering south of Ashburn.",
|
||||
"cities.the_transatlantic_cables_come_ashore_here":"The transatlantic cables come ashore here, on the Basque coast. The exchange is in Madrid, so most traffic hurries inland.",
|
||||
"cities.the_venice_of_brazil_all_bridges":"The Venice of Brazil, all bridges and rivers, with one of the country’s biggest tech parks in its old harbour.",
|
||||
"cities.the_whole_country_is_one_network":"The whole country is one network announcing a handful of routes, and ordinary homes are not on it.",
|
||||
"cities.the_whole_country_on_one_cable":"The whole country on one cable: a branch of ACE, landed in 2011 and shared by every operator.",
|
||||
|
|
|
|||
66
tests/bilbao-landing.test.js
Normal file
66
tests/bilbao-landing.test.js
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
const test = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
const { load } = require('./harness');
|
||||
|
||||
const start = "ACT.start({});S.cash=1e9;S.nextFail=1e9;S.nextEvent=1e9;for(const g of GOALS)S.done[g.id]=0";
|
||||
|
||||
test('Bilbao is on the map, on land and ready to take a POP; it has no exchange of its own', () => {
|
||||
const { ev, errors } = load();
|
||||
ev(start);
|
||||
assert.equal(ev("CITY.bio.name"), 'Bilbao');
|
||||
assert.equal(ev("CITY.bio.cc"), 'ES');
|
||||
assert.equal(ev("CITY.bio.land"), 'eu');
|
||||
assert.equal(ev("onLand(CITY.bio.x,CITY.bio.y)"), true);
|
||||
assert.equal(ev("!!CITY.bio.ix"), false, 'the exchange is in Madrid');
|
||||
assert.ok(ev("kmBetween('bio','mad')") > 250 && ev("kmBetween('bio','mad')") < 450);
|
||||
assert.equal(ev("isSub('bio','mad')"), false, 'reached overland from Madrid');
|
||||
assert.equal(ev("typeof CITY.sdr"), 'undefined', 'no Santander');
|
||||
ev("ACT.buildPop({city:'mad'});ACT.buildPop({city:'bio'})");
|
||||
assert.equal(ev("!!S.pops.bio"), true);
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test('every transatlantic cable that came ashore on the Biscay coast lands at Bilbao', () => {
|
||||
const { ev, errors } = load();
|
||||
ev("ACT.start({})");
|
||||
const lands = id => JSON.parse(ev(`JSON.stringify(CABLES.find(c=>c.id==='${id}').pairs.map(p=>p.slice(0,2)))`));
|
||||
assert.deepEqual(lands('marea'), [['ash', 'bio']]);
|
||||
assert.deepEqual(lands('grace'), [['nyc', 'lon'], ['nyc', 'bio']]);
|
||||
assert.ok(lands('sol').some(p => p.join() === 'pdl,bio'));
|
||||
assert.ok(lands('col3').some(p => p.join() === 'mia,bio'));
|
||||
for (const [id, a, b] of [['marea', 'ash', 'bio'], ['grace', 'nyc', 'bio'], ['sol', 'pdl', 'bio'], ['col3', 'mia', 'bio']]) {
|
||||
assert.equal(ev(`cablesFor('${a}','${b}').map(c=>c.cid).includes('${id}')`), true, `${id} lands at Bilbao`);
|
||||
}
|
||||
for (const id of ['marea', 'grace', 'sol', 'col3']) {
|
||||
assert.equal(ev(`CABLE_PAIRS.some(p=>p.cid==='${id}'&&(p.a==='mad'||p.b==='mad'))`), false, `${id} no longer ends at Madrid`);
|
||||
}
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test('transit and peers in Bilbao: the big carriers, Drizzle Electric and Tangerine Telecom; old saves still load', () => {
|
||||
const { ev, errors } = load();
|
||||
ev(start);
|
||||
for (const n of ['lvl', 'cog', 'skl', 'drz', 'tng']) assert.equal(ev(`NET.${n}.pops.includes('bio')`), true, `${n} is in Bilbao`);
|
||||
assert.equal(ev("CITY_PDB.bio.join()"), '1,8,1341', 'PeeringDB: one facility, eight networks');
|
||||
ev("ACT.buildPop({city:'bio'})");
|
||||
for (const n of ['drz', 'tng']) {
|
||||
ev(`ACT.buyTransit({city:'bio',net:'${n}',tier:1})`);
|
||||
assert.equal(ev(`S.transit.some(t=>t.city==='bio'&&t.net==='${n}')`), true, `${n} sells transit in Bilbao`);
|
||||
}
|
||||
// A save from before: a Marea link between Ashburn and Madrid.
|
||||
ev("ACT.buildPop({city:'ash'});ACT.buildPop({city:'mad'})");
|
||||
const save = JSON.parse(ev("JSON.stringify(Object.assign(JSON.parse(JSON.stringify(S)),{links:[{id:'old1',a:'ash',b:'mad',kind:'wave',tier:2,km:6500,mo:100,cut:0,sub:true,cable:'marea',ready:0}]}))"));
|
||||
const out = JSON.parse(ev(`JSON.stringify(sanitize(JSON.parse(${JSON.stringify(JSON.stringify(save))})).links.map(l=>[l.a,l.b,l.cable]))`));
|
||||
assert.deepEqual(out, [['ash', 'mad', null]], 'the link survives as a plain subsea link');
|
||||
for (const z of [0.35, 1.4, 6]) ev(`cam.z=${z};draw(performance.now())`);
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test('Marea leaves the American coast at Virginia Beach, not New Jersey, so its line does not cross the northeast', () => {
|
||||
const { ev, errors } = load();
|
||||
ev(start);
|
||||
const pts = JSON.parse(ev("JSON.stringify(CABLES.find(c=>c.id==='marea').pairs[0][2])"));
|
||||
assert.deepEqual(pts[0], [-75.7, 36.85], 'the first waypoint is off Virginia Beach');
|
||||
assert.ok(pts.every(([lo, la]) => ev(`(()=>{const p=proj(${lo},${la});return !onLand(p[0],p[1])})()`)), 'every waypoint is at sea');
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
|
@ -795,8 +795,8 @@ test('Atlantic islands and Halifax: real landings, real exchanges only, and isla
|
|||
assert.equal(ev(`NETS.filter(n=>n.type!=='t1'&&n.pops.some(c=>${JSON.stringify(isl)}.includes(c))&&!(n.up||[]).some(u=>NET[u].type==='t1')&&!n.pops.some(c=>!${JSON.stringify(isl)}.includes(c))).map(n=>n.id).join()`), '');
|
||||
const hop = (path) => ev(`Math.min(...${JSON.stringify(path)}.slice(1).map((c,i)=>Math.max(...cablesFor(${JSON.stringify(path)}[i],c).map(p=>subCarrier(p.km)))))`);
|
||||
const direct = (a, b) => ev(`Math.max(...cablesFor('${a}','${b}').map(p=>subCarrier(p.km)))`);
|
||||
assert.equal(direct('mia', 'mad'), 1200);
|
||||
assert.equal(hop(['mia', 'bda', 'pdl', 'mad']), 1600, 'Florida to Spain via Bermuda and the Azores');
|
||||
assert.equal(direct('mia', 'bio'), 1200);
|
||||
assert.equal(hop(['mia', 'bda', 'pdl', 'bio']), 1600, 'Florida to Spain via Bermuda and the Azores');
|
||||
assert.equal(hop(['mia', 'pdl', 'lis']), 1600, 'Florida to Lisbon via the Azores');
|
||||
assert.equal(direct('atn', 'lis'), 1200);
|
||||
assert.equal(hop(['atn', 'bda', 'lis']), 1600);
|
||||
|
|
@ -819,9 +819,9 @@ test('Atlantic islands and Halifax: real landings, real exchanges only, and isla
|
|||
assert.ok(ev('!!S.pops.pdl') && ev('S.lvl') >= 4);
|
||||
assert.equal(ev('scnProg().items.length'), 3);
|
||||
assert.equal(ev("fastPath('mia','mad',1600)"), false);
|
||||
ev("S.cash=1e9;for(const c of ['mia','bda','mad','lis','tci','lag']){ACT.buildPop({city:c});S.pops[c].rgen=3;}S.pops.pdl.rgen=3;");
|
||||
ev("S.cash=1e9;for(const c of ['mia','bda','mad','bio','lis','tci','lag']){ACT.buildPop({city:c});S.pops[c].rgen=3;}S.pops.pdl.rgen=3;");
|
||||
const wave = (a, b, via) => ev(`UI.via='${via}';UI.route='same';openLinkModal('${a}','${b}');ACT.buildLink({tier:4});closeModal();S.links.length`);
|
||||
wave('mia', 'bda', 'sol'); wave('bda', 'pdl', 'sol'); wave('pdl', 'mad', 'sol'); wave('lis', 'tci', 'ace'); wave('tci', 'lag', 'twoaf');
|
||||
wave('mia', 'bda', 'sol'); wave('bda', 'pdl', 'sol'); wave('pdl', 'bio', 'sol'); wave('bio', 'mad', null); wave('lis', 'tci', 'ace'); wave('tci', 'lag', 'twoaf');
|
||||
ev('compute()');
|
||||
assert.equal(ev("fastPath('mia','mad',1600)"), true);
|
||||
assert.equal(ev("fastPath('lis','lag',1600)"), true);
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ const PLAY = {
|
|||
// When the 150 Gbps arrive swings with the world's customers (day 66, then 33, as Africa's capitals joined), so the floor sits below it.
|
||||
win: [25, 120], cheese: [...home('hnl'), ...home('lax'), ...home('syd'), ['link', 'lax', 'tok', 1, 'jup'], ['link', 'lax', 'syd', 3, 'hwk'], ['loans']], by: null },
|
||||
// The win day swings with the seed (34 to 58 over five seeds in 2.5.0), so the floor sits below that spread.
|
||||
atl: { ref: [['bb', 'pdl'], ['tr', 'pdl', 1], ...home('mia'), ...home('mad'), ...home('lis'), HIRE, ['link', 'mia', 'bda', 4, 'sol'], ['link', 'bda', 'pdl', 4, 'sol'], ['link', 'pdl', 'mad', 4, 'sol'], ['served', 90], ['link', 'lis', 'tci', 4, 'ace'], ['link', 'tci', 'lag', 4, 'twoaf'], ['bb', 'lag']],
|
||||
win: [30, 120], cheese: [['bb', 'pdl'], ['tr', 'pdl', 1], ...home('mia'), ...home('mad'), ...home('lis'), ['link', 'mia', 'mad', 3, 'col3'], ['link', 'lis', 'lag', 3, 'equi'], ['loans']], by: null },
|
||||
atl: { ref: [['bb', 'pdl'], ['tr', 'pdl', 1], ...home('mia'), ...home('mad'), ...home('lis'), HIRE, ['link', 'mia', 'bda', 4, 'sol'], ['link', 'bda', 'pdl', 4, 'sol'], ['pop', 'bio'], ['link', 'pdl', 'bio', 4, 'sol'], ['link', 'bio', 'mad', 4], ['served', 90], ['link', 'lis', 'tci', 4, 'ace'], ['link', 'tci', 'lag', 4, 'twoaf'], ['bb', 'lag']],
|
||||
win: [30, 120], cheese: [['bb', 'pdl'], ['tr', 'pdl', 1], ...home('mia'), ...home('mad'), ...home('lis'), ['pop', 'bio'], ['link', 'mia', 'bio', 3, 'col3'], ['link', 'lis', 'lag', 3, 'equi'], ['loans']], by: null },
|
||||
};
|
||||
|
||||
test('C1 played: every scenario has a reference strategy and a shortcut that fails', () => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue