Davao: Mindanao, GotchaFIX Davao, and the trans-Pacific landings moved from Manila
Davao joins the map on Mindanao, with GotchaFIX Davao and Heimdall's Hut. Mindanao's coastline is now Natural Earth 1:50m (the old simplified ring left Davao in the sea). Bi-Frosted's Philippine branch and SEA-US land at Davao, as the real cables do (Converge's Davao station and Globe's Talomo station), instead of Manila. sanitize() drops the cable tag from saved links on a pair that no longer exists, so those links keep working as plain subsea links. The Pan de Sal Cable Network, the Philippines Long Distance Relationship and the new Diverge VisMin Express reach Mindanao's north coast from Cebu and run overland to Davao. PLDTea Time, Snow Globe and Diverge reach Davao.
This commit is contained in:
parent
d0d97e068e
commit
becbd3de8f
15 changed files with 71 additions and 15 deletions
|
|
@ -8,6 +8,7 @@ All notable changes to this project are documented here. The project follows
|
|||
|
||||
- Manila gets real exchanges: GotchaFIX Manila, the free community Bayanihan-IX and In-Vitro-IX, run by PLDTea Time. Snow Globe, Diverge, Smarty Pants, Ditto and RISE & Shine join as Philippine networks, and PLDTea Time and Snow Globe now sell transit.
|
||||
- Cebu joins the map on its own island, with GotchaFIX Cebu and two domestic cables from Manila: the Pan de Sal Cable Network and the Philippines Long Distance Relationship. PLDTea Time, Snow Globe and Diverge reach Cebu, and typhoons can hit it too.
|
||||
- Davao joins the map on Mindanao, with GotchaFIX Davao. Bi-Frosted and SEA-US Later now land in Davao, as the real cables do, instead of Manila; a link you already run on their old Manila landings keeps working as a plain subsea link. Three domestic cables reach Davao from Cebu: the Pan de Sal Cable Network, the Philippines Long Distance Relationship and the new Diverge VisMin Express.
|
||||
|
||||
## [1.37.0] — 2026-10-28
|
||||
|
||||
|
|
|
|||
|
|
@ -431,6 +431,7 @@
|
|||
"cables.the_sequel_singapore_to_hong_kong":"Die Fortsetzung: Singapur nach Hongkong, Taiwan, Japan und Korea, 2025 in Betrieb genommen.",
|
||||
"cables.the_seychelles_first_cable_to_tanzania":"Das erste Kabel der Seychellen, nach Tansania, nach Jahren mit Satellit.",
|
||||
"cables.the_straightest_line_across_the":"Die geradeste Linie über den Atlantik. Trader zahlen das Doppelte, um ein paar Millisekunden zu sparen.",
|
||||
"cables.the_upstart_s_own_cable_from":"Das eigene Kabel des Emporkömmlings von Cebu an die Nordküste Mindanaos, dann über Land nach Davao. Verlegt mitten in der Pandemie.",
|
||||
"cables.tokyo_to_los_angeles_built_by":"Tokio nach Los Angeles, gebaut von einer Suchmaschine und fünf Telcos, die Händchen halten.",
|
||||
"cables.up_the_west_coast_of_africa":"Die Westküste Afrikas hinauf. Irgendwas daran ist immer down.",
|
||||
"cables.west_africa_s_first_big_cable":"Westafrikas erstes großes Kabel, von Portugal nach Kapstadt. Alt und wackelig, hält aber immer noch einiges zusammen.",
|
||||
|
|
@ -563,6 +564,7 @@
|
|||
"cities.mexico_s_data_center_boom_town":"Mexikos Boomtown für Rechenzentren, hoch und trocken mitten im Land. Jede Cloud will hier eine Region.",
|
||||
"cities.mexico_s_industrial_capital_a_few":"Mexikos Industriehauptstadt, ein paar Stunden von Texas. Fabriken, Stahl und gegrillte Ziege am Wochenende.",
|
||||
"cities.mexico_s_silicon_valley_home_of":"Mexikos Silicon Valley, Heimat von Mariachi und Tequila. Tagsüber Chipdesign, nachts Musik.",
|
||||
"cities.mindanao_s_big_city_and_the":"Mindanaos große Stadt und das Pazifiktor der Philippinen: Hier landen die Transpazifikkabel, südlich des Taifungürtels.",
|
||||
"cities.morocco_s_business_capital_on_the":"Marokkos Wirtschaftshauptstadt am Atlantik, das Tor zwischen Europa und Westafrika.",
|
||||
"cities.most_uae_cables_land_on_this":"Die meisten Kabel der VAE landen an dieser Küste an, außerhalb der Straße von Hormus. Von hier nach Dubai heißt: beim Duopol mieten.",
|
||||
"cities.mountains_mines_and_more_bars_per":"Berge, Minen und mehr Kneipen pro Kopf als irgendwo sonst in Brasilien. Peering-Deals werden bei Käsebrötchen unterschrieben.",
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@
|
|||
"cables.a_friendly_cable_with_french_manners":"Un cable simpático con modales franceses.",
|
||||
"cables.a_gateway_from_europe_to_india":"Una puerta de Europa a la India, por el Mar Rojo. Se pronuncia como un cable muy sorprendido.",
|
||||
"cables.a_quick_hop_across_the_red":"Un salto rápido por el Mar Rojo entre Egipto y Arabia Saudí.",
|
||||
"cables.a_rainbow_bridge_from_singapore_to":"Un puente arcoíris de Singapur a California, vía Yakarta y Manila.",
|
||||
"cables.a_rainbow_bridge_from_singapore_to":"Un puente arcoíris de Singapur a California, vía Yakarta, Davao y Guam.",
|
||||
"cables.a_ring_around_the_caribbean_from":"Un anillo alrededor del Caribe, de Florida a Centroamérica, más viejo que la mayoría de sus clientes.",
|
||||
"cables.a_ring_round_east_asia_from":"Un anillo alrededor de Asia oriental desde 2001: Singapur, Hong Kong, Manila, Taipé, Shanghái, Seúl y Tokio.",
|
||||
"cables.a_short_cable_across_a_very":"Un cable corto por un estrecho muy tenso.",
|
||||
|
|
@ -429,6 +429,7 @@
|
|||
"cables.the_sequel_singapore_to_hong_kong":"La secuela: de Singapur a Hong Kong, Taiwán, Japón y Corea, encendido en 2025.",
|
||||
"cables.the_seychelles_first_cable_to_tanzania":"El primer cable de las Seychelles, hasta Tanzania, tras años de satélite.",
|
||||
"cables.the_straightest_line_across_the":"La línea más recta a través del Atlántico. Los traders pagan el doble por ahorrar unos milisegundos.",
|
||||
"cables.the_upstart_s_own_cable_from":"El cable propio del recién llegado, de Cebú a la costa norte de Mindanao y luego por tierra hasta Davao. Tendido en plena pandemia.",
|
||||
"cables.tokyo_to_los_angeles_built_by":"De Tokio a Los Ángeles, construido por un buscador y cinco telcos cogidas de la mano.",
|
||||
"cables.up_the_west_coast_of_africa":"Costa oeste de África arriba. Siempre hay algo caído.",
|
||||
"cables.west_africa_s_first_big_cable":"El primer gran cable de África Occidental, de Portugal a Ciudad del Cabo. Viejo y tambaleante, pero sigue sosteniendo cosas.",
|
||||
|
|
@ -561,6 +562,7 @@
|
|||
"cities.mexico_s_data_center_boom_town":"La ciudad boom de centros de datos de México, alta y seca en medio del país. Todas las nubes quieren una región aquí.",
|
||||
"cities.mexico_s_industrial_capital_a_few":"La capital industrial de México, a pocas horas de Texas. Fábricas, acero y cabrito asado los fines de semana.",
|
||||
"cities.mexico_s_silicon_valley_home_of":"El Silicon Valley de México, cuna del mariachi y el tequila. Diseño de chips de día, música de noche.",
|
||||
"cities.mindanao_s_big_city_and_the":"La gran ciudad de Mindanao y la puerta de Filipinas al Pacífico: los cables transpacíficos llegan aquí, al sur del cinturón de tifones.",
|
||||
"cities.morocco_s_business_capital_on_the":"La capital de negocios de Marruecos en el Atlántico, puerta entre Europa y África Occidental.",
|
||||
"cities.most_uae_cables_land_on_this":"La mayoría de los cables de los EAU llegan a tierra en esta costa, fuera del Estrecho de Ormuz. Ir de aquí a Dubái significa alquilar al duopolio.",
|
||||
"cities.mountains_mines_and_more_bars_per":"Montañas, minas y más bares por habitante que en cualquier otro lugar de Brasil. Los acuerdos de peering se firman con pan de queso.",
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@
|
|||
"cables.a_friendly_cable_with_french_manners":"Un câble sympathique aux manières bien françaises.",
|
||||
"cables.a_gateway_from_europe_to_india":"Une passerelle de l’Europe vers l’Inde, par la mer Rouge. Se prononce comme un câble très surpris.",
|
||||
"cables.a_quick_hop_across_the_red":"Un saut rapide à travers la mer Rouge entre l’Égypte et l’Arabie saoudite.",
|
||||
"cables.a_rainbow_bridge_from_singapore_to":"Un pont arc-en-ciel de Singapore à la Californie, via Jakarta et Manila.",
|
||||
"cables.a_rainbow_bridge_from_singapore_to":"Un pont arc-en-ciel de Singapour à la Californie, via Jakarta, Davao et Guam.",
|
||||
"cables.a_ring_around_the_caribbean_from":"Un anneau autour des Caraïbes, de la Floride à l’Amérique centrale, plus vieux que la plupart de ses clients.",
|
||||
"cables.a_ring_round_east_asia_from":"Un anneau autour de l’Asie de l’Est depuis 2001 : Singapour, Hong Kong, Manila, Taipei, Shanghai, Séoul et Tokyo.",
|
||||
"cables.a_short_cable_across_a_very":"Un câble court à travers un détroit très tendu.",
|
||||
|
|
@ -429,6 +429,7 @@
|
|||
"cables.the_sequel_singapore_to_hong_kong":"La suite : de Singapour à Hong Kong, Taïwan, au Japon et en Corée, allumé en 2025.",
|
||||
"cables.the_seychelles_first_cable_to_tanzania":"Le premier câble des Seychelles, vers la Tanzanie, après des années de satellite.",
|
||||
"cables.the_straightest_line_across_the":"La ligne la plus droite à travers l’Atlantique. Les traders paient le double pour gagner quelques millisecondes.",
|
||||
"cables.the_upstart_s_own_cable_from":"Le câble maison du nouveau venu, de Cebu à la côte nord de Mindanao, puis par la terre jusqu'à Davao. Posé en pleine pandémie.",
|
||||
"cables.tokyo_to_los_angeles_built_by":"De Tokyo à Los Angeles, construit par un moteur de recherche et cinq opérateurs qui se tiennent la main.",
|
||||
"cables.up_the_west_coast_of_africa":"Remonte la côte ouest de l’Afrique. Tu répares un bout, un autre tombe.",
|
||||
"cables.west_africa_s_first_big_cable":"Le premier grand câble d’Afrique de l’Ouest, du Portugal au Cap. Vieux et bancal, mais il tient encore tout debout.",
|
||||
|
|
@ -561,6 +562,7 @@
|
|||
"cities.mexico_s_data_center_boom_town":"La ville du boom des datacenters au Mexique, haute et sèche au centre du pays. Chaque cloud y veut sa région.",
|
||||
"cities.mexico_s_industrial_capital_a_few":"La capitale industrielle du Mexique, à quelques heures du Texas. Usines, acier et chevreau grillé le week-end.",
|
||||
"cities.mexico_s_silicon_valley_home_of":"La Silicon Valley du Mexique, berceau du mariachi et de la tequila. Conception de puces le jour, musique la nuit.",
|
||||
"cities.mindanao_s_big_city_and_the":"La grande ville de Mindanao et la porte des Philippines sur le Pacifique : les câbles transpacifiques atterrissent ici, au sud de la ceinture des typhons.",
|
||||
"cities.morocco_s_business_capital_on_the":"La capitale économique du Maroc sur l’Atlantique, la porte entre l’Europe et l’Afrique de l’Ouest.",
|
||||
"cities.most_uae_cables_land_on_this":"La plupart des câbles des Émirats atterrissent sur cette côte, hors du détroit d’Ormuz. Aller d’ici à Dubai, c’est louer au duopole.",
|
||||
"cities.mountains_mines_and_more_bars_per":"Des montagnes, des mines et plus de bars par habitant que partout ailleurs au Brésil. Les accords de peering se signent autour d’un pão de queijo.",
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@
|
|||
"cables.a_friendly_cable_with_french_manners":"Un cavo amichevole con le buone maniere francesi.",
|
||||
"cables.a_gateway_from_europe_to_india":"Un gateway dall’Europa all’India, attraverso il Mar Rosso. Si pronuncia come un cavo molto sorpreso.",
|
||||
"cables.a_quick_hop_across_the_red":"Un salto veloce attraverso il Mar Rosso tra Egitto e Arabia Saudita.",
|
||||
"cables.a_rainbow_bridge_from_singapore_to":"Un ponte arcobaleno da Singapore alla California, via Jakarta e Manila.",
|
||||
"cables.a_rainbow_bridge_from_singapore_to":"Un ponte arcobaleno da Singapore alla California, via Jakarta, Davao e Guam.",
|
||||
"cables.a_ring_around_the_caribbean_from":"Un anello intorno ai Caraibi dalla Florida all’America Centrale, più vecchio della maggior parte dei suoi clienti.",
|
||||
"cables.a_ring_round_east_asia_from":"Un anello intorno all’Asia orientale dal 2001: Singapore, Hong Kong, Manila, Taipei, Shanghai, Seul e Tokyo.",
|
||||
"cables.a_short_cable_across_a_very":"Un cavo corto attraverso uno stretto molto teso.",
|
||||
|
|
@ -429,6 +429,7 @@
|
|||
"cables.the_sequel_singapore_to_hong_kong":"Il sequel: da Singapore a Hong Kong, Taiwan, Giappone e Corea, acceso nel 2025.",
|
||||
"cables.the_seychelles_first_cable_to_tanzania":"Il primo cavo delle Seychelles, verso la Tanzania, dopo anni di satellite.",
|
||||
"cables.the_straightest_line_across_the":"La linea più dritta attraverso l’Atlantico. I trader pagano il doppio per risparmiare qualche millisecondo.",
|
||||
"cables.the_upstart_s_own_cable_from":"Il cavo tutto suo del nuovo arrivato, da Cebu alla costa nord di Mindanao, poi via terra fino a Davao. Posato durante una pandemia.",
|
||||
"cables.tokyo_to_los_angeles_built_by":"Da Tokyo a Los Angeles, costruito da un motore di ricerca e cinque telco che si tengono per mano.",
|
||||
"cables.up_the_west_coast_of_africa":"Risale la costa ovest dell’Africa. C’è sempre qualcosa giù.",
|
||||
"cables.west_africa_s_first_big_cable":"Il primo grande cavo dell’Africa occidentale, dal Portogallo a Città del Capo. Vecchio e traballante, ma regge ancora tutto.",
|
||||
|
|
@ -561,6 +562,7 @@
|
|||
"cities.mexico_s_data_center_boom_town":"La città del boom dei data center in Messico, alta e asciutta nel centro del paese. Ogni cloud vuole una region qui.",
|
||||
"cities.mexico_s_industrial_capital_a_few":"La capitale industriale del Messico, a poche ore dal Texas. Fabbriche, acciaio e capretto alla griglia nel weekend.",
|
||||
"cities.mexico_s_silicon_valley_home_of":"La Silicon Valley del Messico, patria del mariachi e della tequila. Progettazione di chip di giorno, musica di notte.",
|
||||
"cities.mindanao_s_big_city_and_the":"La grande città di Mindanao e la porta delle Filippine sul Pacifico: i cavi transpacifici approdano qui, a sud della fascia dei tifoni.",
|
||||
"cities.morocco_s_business_capital_on_the":"La capitale economica del Marocco sull’Atlantico, la porta tra l’Europa e l’Africa occidentale.",
|
||||
"cities.most_uae_cables_land_on_this":"Quasi tutti i cavi degli Emirati approdano su questa costa, fuori dallo Stretto di Hormuz. Andare da qui a Dubai vuol dire affittare dal duopolio.",
|
||||
"cities.mountains_mines_and_more_bars_per":"Montagne, miniere e più bar per abitante che in qualsiasi altro posto del Brasile. Gli accordi di peering si firmano davanti al pane al formaggio.",
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@
|
|||
"cables.a_friendly_cable_with_french_manners":"Um cabo simpático com bons modos franceses.",
|
||||
"cables.a_gateway_from_europe_to_india":"Um gateway da Europa à Índia pelo Mar Vermelho. Pronuncia-se como um cabo muito surpreso.",
|
||||
"cables.a_quick_hop_across_the_red":"Um pulinho pelo Mar Vermelho entre o Egito e a Arábia Saudita.",
|
||||
"cables.a_rainbow_bridge_from_singapore_to":"Uma ponte de arco-íris de Singapura à Califórnia, via Jakarta e Manila.",
|
||||
"cables.a_rainbow_bridge_from_singapore_to":"Uma ponte de arco-íris de Singapura à Califórnia, via Jakarta, Davao e Guam.",
|
||||
"cables.a_ring_around_the_caribbean_from":"Um anel ao redor do Caribe, da Flórida à América Central, mais velho que a maioria dos clientes.",
|
||||
"cables.a_ring_round_east_asia_from":"Um anel ao redor do Leste Asiático desde 2001: Singapura, Hong Kong, Manila, Taipei, Xangai, Seul e Tóquio.",
|
||||
"cables.a_short_cable_across_a_very":"Um cabo curto atravessando um estreito bem tenso.",
|
||||
|
|
@ -429,6 +429,7 @@
|
|||
"cables.the_sequel_singapore_to_hong_kong":"A continuação: de Singapura a Hong Kong, Taiwan, Japão e Coreia, aceso em 2025.",
|
||||
"cables.the_seychelles_first_cable_to_tanzania":"O primeiro cabo das Seychelles, até a Tanzânia, depois de anos de satélite.",
|
||||
"cables.the_straightest_line_across_the":"A linha mais reta através do Atlântico. Traders pagam o dobro para economizar alguns milissegundos.",
|
||||
"cables.the_upstart_s_own_cable_from":"O cabo próprio da novata, de Cebu à costa norte de Mindanao e depois por terra até Davao. Lançado numa pandemia.",
|
||||
"cables.tokyo_to_los_angeles_built_by":"De Tóquio a Los Angeles, construído por um buscador e cinco operadoras de mãos dadas.",
|
||||
"cables.up_the_west_coast_of_africa":"Sobe a costa oeste da África. Sempre tem alguma coisa fora do ar.",
|
||||
"cables.west_africa_s_first_big_cable":"O primeiro grande cabo da África Ocidental, de Portugal à Cidade do Cabo. Velho e bambo, mas ainda segurando as pontas.",
|
||||
|
|
@ -561,6 +562,7 @@
|
|||
"cities.mexico_s_data_center_boom_town":"A cidade do boom de data centers no México, alta e seca no meio do país. Toda nuvem quer uma região aqui.",
|
||||
"cities.mexico_s_industrial_capital_a_few":"A capital industrial do México, a poucas horas do Texas. Fábricas, aço e cabrito assado no fim de semana.",
|
||||
"cities.mexico_s_silicon_valley_home_of":"O Vale do Silício do México, terra do mariachi e da tequila. Projeto de chips de dia, música à noite.",
|
||||
"cities.mindanao_s_big_city_and_the":"A grande cidade de Mindanao e a porta das Filipinas para o Pacífico: os cabos transpacíficos chegam aqui, ao sul do cinturão de tufões.",
|
||||
"cities.morocco_s_business_capital_on_the":"A capital dos negócios do Marrocos no Atlântico, a porta entre a Europa e a África Ocidental.",
|
||||
"cities.most_uae_cables_land_on_this":"A maioria dos cabos dos Emirados chega nesta costa, fora do Estreito de Ormuz. Ir daqui até Dubai significa alugar do duopólio.",
|
||||
"cities.mountains_mines_and_more_bars_per":"Montanhas, minas e mais bares por habitante do que em qualquer outro lugar do Brasil. Acordo de peering se fecha com pão de queijo.",
|
||||
|
|
|
|||
|
|
@ -79,8 +79,9 @@ LANDS_LL.push(
|
|||
LANDS_LL.push(
|
||||
{id:'mv',ll:[[73.11,4.48],[73.91,4.48],[73.91,3.88],[73.11,3.88]]},
|
||||
);
|
||||
// The Visayas: Cebu is its own island, reached from Luzon only by domestic cable.
|
||||
// The Visayas and Mindanao: Cebu and Davao are islands of their own, reached from Luzon only by cable.
|
||||
LANDS_LL.push(
|
||||
{id:'ceb',ll:[[123.3,11.3],[124.1,11.3],[124.1,9.4],[123.3,9.4]]},
|
||||
{id:'mdn',ll:[[121.9,7],[123,8.4],[125.4,9.8],[126.6,7.5],[126.2,5.6],[125,5.6],[122,6.6]]},
|
||||
);
|
||||
const LANDS=LANDS_LL.map(l=>({id:l.id,hide:true,pts:l.ll.map(q=>proj(q[0],q[1]))}));
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -71,6 +71,7 @@ const CITY_LL={
|
|||
"dur":[31.03,-29.86],
|
||||
"dus":[6.78,51.22],
|
||||
"dut":[-166.53,53.88],
|
||||
"dvo":[125.6,7.08],
|
||||
"dxb":[55.27,25.2],
|
||||
"dyr":[177.4,64.7],
|
||||
"ebj":[8.52,55.48],
|
||||
|
|
|
|||
|
|
@ -242,6 +242,7 @@ const CITIES=[
|
|||
{id:'fuk',name:'Fukuoka',x:0,y:0,land:'jp',reg:'AS',P:120,ix:'Mentaiko-IX',dc:'Hakata Ramen Racks',note:tr('cities.japan_s_closest_city_to_korea')},
|
||||
// The Philippines beyond Luzon
|
||||
{id:'ceb',name:'Cebu',x:0,y:0,land:'ceb',reg:'AS',P:100,ix:'GotchaFIX Cebu',dc:"Magellan's Last Rack",note:tr('cities.the_philippines_second_city_reached')},
|
||||
{id:'dvo',name:'Davao',x:0,y:0,land:'mdn',reg:'AS',P:80,ix:'GotchaFIX Davao',dc:"Heimdall's Hut",note:tr('cities.mindanao_s_big_city_and_the')},
|
||||
];
|
||||
// Display-only nudges for cities that sit on top of each other at map scale; distances still use real lon/lat.
|
||||
const CITY_NUDGE={
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ const CABLES=[
|
|||
{"id":"cook","name":"Cook Strait Talking","price":1.0,"age":"mid","blurb":tr('cables.down_the_west_coast_and_across'),"pairs":[["akl","chc",[[175.75,-36.25],[178,-37],[179,-38],[178.5,-39.25],[174.25,-43.5]]]]},
|
||||
{"id":"ring","name":"Lord of the Tasman Rings","price":0.9,"age":"new","blurb":tr('cables.one_ring_to_bind_invercargill_to'),"pairs":[["ivc","syd",[[167.6,-46.9],[160,-42],[153,-35]]],["ivc","mel",[[167.6,-46.9],[156,-43.5],[146.2,-39.4]]],["ivc","akl",[[169,-47.25],[170.5,-47.25],[178.5,-39.25],[179,-38],[178,-37],[175.75,-36.25]]]]},
|
||||
{"id":"tasman","name":"Tasman Global Excess","price":0.95,"age":"new","blurb":tr('cables.sydney_to_auckland_with_plenty_to'),"pairs":[["akl","syd",[[170,-36],[158,-34.5]]]]},
|
||||
{"id":"bifrost","name":"Bi-Frosted","price":0.9,"age":"new","blurb":tr('cables.a_rainbow_bridge_from_singapore_to'),"pairs":[["sin","jkt",[[107,-2]]],["jkt","mnl",[[108.5,1.5]]],["mnl","lax",[[123,15],[140,20],[180,25],[210,30],[235,33.5]]],["mnl","gum",[[123,15],[136,14.5],[144.3,13.6]]],["gum","lax",[[145.5,14.2],[180,22],[210,30],[235,33.5]]],["jkt","gum",[[107.25,-5.25],[113,-5.25],[116,-4.25],[121,2],[139.42,11.57],[143.5,13.5]]],["gum","sea",[[149.93,19.74],[155.17,25.45],[160.51,30.59],[165.55,34.81],[170.63,38.48],[176.24,41.9],[181.86,44.75],[188.04,47.3],[190.71,48.15],[198.76,49.45],[205.61,50.09],[211.8,50.31],[218.01,50.21],[224.91,49.69],[234.5,48.25],[235.75,48.5],[236,48.25],[237.25,48.25]]]]},
|
||||
{"id":"bifrost","name":"Bi-Frosted","price":0.9,"age":"new","blurb":tr('cables.a_rainbow_bridge_from_singapore_to'),"pairs":[["sin","jkt",[[107,-2]]],["gum","lax",[[145.5,14.2],[180,22],[210,30],[235,33.5]]],["jkt","gum",[[107.25,-5.25],[113,-5.25],[116,-4.25],[121,2],[139.42,11.57],[143.5,13.5]]],["jkt","dvo",[[107.25,-5.25],[113,-5.25],[116,-4.25],[121,2],[124.5,4.6],[125.5,5.3],[125.75,6.2],[125.7,6.8]]],["dvo","gum",[[125.75,6.4],[126.1,5.6],[127,5.8],[130,8],[139.42,11.57],[143.5,13.5]]],["gum","sea",[[149.93,19.74],[155.17,25.45],[160.51,30.59],[165.55,34.81],[170.63,38.48],[176.24,41.9],[181.86,44.75],[188.04,47.3],[190.71,48.15],[198.76,49.45],[205.61,50.09],[211.8,50.31],[218.01,50.21],[224.91,49.69],[234.5,48.25],[235.75,48.5],[236,48.25],[237.25,48.25]]]]},
|
||||
{"id":"sjcph","name":"Sushi-Jollibee Cable","price":0.9,"age":"mid","blurb":tr('cables.southeast_asia_to_japan_with_snacks'),"pairs":[["hkg","mnl",[[116,21],[119.5,16],[120.3,14.6]]],["mnl","sin",[[119,12],[115,8],[110,5],[105,2]]],["mnl","tok",[[120,14.25],[119.25,15.25],[119.5,18],[128.03,26.23],[139,34.5]]],["sin","hkg",[[104.75,1.75],[109.75,11.5]]],["hkg","tok",[[116.5,22.25],[127,30],[130.75,30.5],[139,34.5]]]]},
|
||||
{"id":"farice","name":"Far-Ice-1","price":1.2,"age":"old","blurb":tr('cables.iceland_s_lifeline_to_scotland'),"pairs":[["rek","lon",[[-23,64],[-22.25,63.25],[-20.25,63],[-7,63],[-1.63,57.93],[2,53],[1.75,51.75]]]]},
|
||||
{"id":"danice","name":"Dance-Ice","price":1.0,"age":"mid","blurb":tr('cables.iceland_to_denmark_choreographed'),"pairs":[["rek","cph",[[-23,64],[-22.25,63.25],[7,57.5],[10.5,57.75],[11,57.5],[10.5,55.25],[12,54.75]]]]},
|
||||
|
|
@ -97,7 +97,7 @@ const CABLES=[
|
|||
{"id":"ouzo","name":"Ouzo Express","price":0.9,"age":"new","blurb":tr('cables.athens_to_alexandria_and_up_the'),"pairs":[["ath","cai",[[24,37.5],[25.2,35.5],[28,33],[29.9,31.4]]],["ath","ist",[[24.3,38.5],[25.6,39.9],[26.5,40.3],[28.2,40.8]]]]},
|
||||
{"id":"tea","name":"Boston Tea Party Line","price":0.9,"age":"mid","blurb":tr('cables.boston_to_dublin_nobody_has_thrown'),"pairs":[["bos","dub",[[-65.25,43],[-26,51],[-8.5,51],[-5.75,52.25],[-5.5,53.25]]]]},
|
||||
{"id":"clementine","name":"Clementine","price":0.6,"age":"new","df":true,"blurb":tr('cables.a_small_sweet_cable_from_broadstairs'),"pairs":[["lon","oos",[[1.44,51.36],[2.92,51.23]]]]},
|
||||
{"id":"seaus","name":"SEA-US Later","price":1.0,"age":"mid","blurb":tr('cables.los_angeles_to_hawaii_guam_and'),"pairs":[["lax","hnl",[[-119,33.5],[-140,27],[-157.6,21.6]]],["hnl","gum",[[-158.3,21.2],[-180,18],[-200,15],[-214.6,13.5]]],["gum","mnl",[[125.76,13.3],[123.5,12.5],[120.75,13.25],[120.5,14.25]]],["gum","ror",[[144.5,13.1],[139,9.5],[134.8,7.5]]]]},
|
||||
{"id":"seaus","name":"SEA-US Later","price":1.0,"age":"mid","blurb":tr('cables.los_angeles_to_hawaii_guam_and'),"pairs":[["lax","hnl",[[-119,33.5],[-140,27],[-157.6,21.6]]],["hnl","gum",[[-158.3,21.2],[-180,18],[-200,15],[-214.6,13.5]]],["gum","dvo",[[144,13.7],[135,10.5],[128,6.8],[126.4,5.7],[125.85,6.2],[125.7,6.75]]],["gum","ror",[[144.5,13.1],[139,9.5],[134.8,7.5]]]]},
|
||||
{"id":"aag","name":"Asia-America Gateaux","price":1.25,"age":"old","blurb":tr('cables.california_to_hong_kong_via_hawaii'),"pairs":[["sjc","hnl",[[-122.8,35],[-140,27.5],[-158.2,21.4]]],["hnl","gum",[[-158.4,21.5],[-180,19],[-200,16],[-214.4,13.7]]],["gum","hkg",[[144.5,14],[130,17.5],[121,20],[115,21.6],[114.3,22.2]]]]},
|
||||
{"id":"echo","name":"Echo-Chamber","price":0.85,"age":"new","blurb":tr('cables.california_to_singapore_via_guam'),"pairs":[["sjc","gum",[[-125,38],[-150,30],[-180,21],[-214.8,14]]],["gum","sin",[[137.45,12.58],[125,10.25],[123.75,9],[122,9],[108,5],[104.25,1.25]]]]},
|
||||
{"id":"hantru","name":"HANTRU-ly Yours","price":1.3,"age":"mid","blurb":tr('cables.guam_to_the_marshall_islands_with'),"pairs":[["gum","maj",[[145,13.3],[158,7],[167,8.5],[171.2,7.2]]]]},
|
||||
|
|
@ -161,8 +161,9 @@ const CABLES=[
|
|||
{"id":"tw1","name":"TW1-light","price":1.1,"age":"mid","blurb":tr('cables.the_emirates_oman_and_pakistan_on'),"pairs":[["fuj","mct",[[58.25,24.25]]],["mct","khi",[[58.75,24]]]]},
|
||||
{"id":"mct1","name":"MCT (Malaysia, Cambodia, Tuk-tuks)","price":0.95,"age":"new","blurb":tr('cables.malaysia_to_thailand_round_the_gulf'),"pairs":[["kul","bkk",[[101.75,2.5],[102.5,1.5],[103.5,0.75],[103.75,0.75],[104.75,1.75],[104.75,2.75],[100.5,12.75]]]]},
|
||||
{"id":"kjcn","name":"KJCN (Kimchi-Japan Cable Network)","price":1,"age":"mid","blurb":tr('cables.busan_to_kyushu_the_shortest_way'),"pairs":[["icn","fuk",[[126,36.75],[126,34],[130,34]]]]},
|
||||
{"id":"pdscn","name":"Pan de Sal Cable Network","price":0.9,"age":"new","blurb":tr('cables.the_philippines_longest_domestic_cable_fresh'),"pairs":[["mnl","ceb",[[120.6,14.4],[120.45,13.95],[120.85,13.6],[121.9,12.9],[122.7,12.3],[123.6,11.6],[124.2,11.2],[124.15,10.5]]]]},
|
||||
{"id":"dfon","name":"Philippines Long Distance Relationship","price":1.1,"age":"mid","blurb":tr('cables.the_incumbent_s_own_line_south'),"pairs":[["mnl","ceb",[[121.6,13.85],[122.1,13.2],[122.9,12.45],[123.75,11.7],[124.3,11.1],[124.2,10.45]]]]},
|
||||
{"id":"pdscn","name":"Pan de Sal Cable Network","price":0.9,"age":"new","blurb":tr('cables.the_philippines_longest_domestic_cable_fresh'),"pairs":[["mnl","ceb",[[120.6,14.4],[120.45,13.95],[120.85,13.6],[121.9,12.9],[122.7,12.3],[123.6,11.6],[124.2,11.2],[124.15,10.5]]],["ceb","dvo",[[124.05,10.2],[124.1,9.6],[124.5,8.9],[124.62,8.55]]]]},
|
||||
{"id":"dfon","name":"Philippines Long Distance Relationship","price":1.1,"age":"mid","blurb":tr('cables.the_incumbent_s_own_line_south'),"pairs":[["mnl","ceb",[[121.6,13.85],[122.1,13.2],[122.9,12.45],[123.75,11.7],[124.3,11.1],[124.2,10.45]]],["ceb","dvo",[[123.95,10.05],[124.4,9.5],[124.75,9.05]]]]},
|
||||
{"id":"vismin","name":"Diverge VisMin Express","price":0.9,"age":"new","blurb":tr('cables.the_upstart_s_own_cable_from'),"pairs":[["ceb","dvo",[[124.15,10.9],[124.25,10.2],[124.4,9.3],[124.65,8.6]]]]},
|
||||
];
|
||||
const CAB=Object.fromEntries(CABLES.map(c=>[c.id,c]));
|
||||
const CABLE_PAIRS=CABLES.flatMap(c=>c.pairs.map(([a,b,mid])=>{const A=CITY[a],B=CITY[b];const near=(x,ref)=>x+W*Math.round((ref-x)/W);
|
||||
|
|
|
|||
|
|
@ -37,9 +37,9 @@ NETS.push(
|
|||
{id:'bcd',name:'Bell Canad-eh',asn:577,type:'eye',pol:'selective',minIx:10,minPni:30,share:.01,col:'#00549A',pops:['hfx','tor','mtl','nyc','chi','ott','cal','van'],ix:['tor','mtl','ott'],blurb:tr('networks.polite_enormous_and_sorry_about_the')});
|
||||
NETS.push(
|
||||
{id:'tsf',name:'Telkom-selfie',asn:7713,type:'eye',pol:'selective',minIx:10,minPni:30,share:.01,col:'#E4002B',pops:['jkt','sin'],ix:['jkt','sin'],blurb:tr('networks.indonesia_s_mobile_giant_every')},
|
||||
{id:'pld',name:'PLDTea Time',asn:9299,type:'t2',pol:'selective',minIx:10,minPni:30,share:.008,price:7,col:'#D62027',pops:['mnl','ceb','hkg','sin'],ix:['hkg','mnl~3'],blurb:tr('networks.philippine_giant_peering_requests')},
|
||||
{id:'glb',name:'Snow Globe',asn:4775,type:'t2',pol:'open',share:.007,price:6,col:'#1A3D8F',pops:['mnl','ceb','hkg','sin'],ix:['mnl','mnl~2','hkg','sin'],blurb:tr('networks.shake_it_and_coverage_falls_gently')},
|
||||
{id:'cvg',name:'Diverge',asn:17639,type:'eye',pol:'open',share:.005,col:'#F26B21',pops:['mnl','ceb','hkg','sin'],ix:['mnl','mnl~2','hkg','sin'],blurb:tr('networks.the_fiber_upstart_from_the_provinces')},
|
||||
{id:'pld',name:'PLDTea Time',asn:9299,type:'t2',pol:'selective',minIx:10,minPni:30,share:.008,price:7,col:'#D62027',pops:['mnl','ceb','dvo','hkg','sin'],ix:['hkg','mnl~3'],blurb:tr('networks.philippine_giant_peering_requests')},
|
||||
{id:'glb',name:'Snow Globe',asn:4775,type:'t2',pol:'open',share:.007,price:6,col:'#1A3D8F',pops:['mnl','ceb','dvo','hkg','sin'],ix:['mnl','mnl~2','hkg','sin'],blurb:tr('networks.shake_it_and_coverage_falls_gently')},
|
||||
{id:'cvg',name:'Diverge',asn:17639,type:'eye',pol:'open',share:.005,col:'#F26B21',pops:['mnl','ceb','dvo','hkg','sin'],ix:['mnl','mnl~2','hkg','sin'],blurb:tr('networks.the_fiber_upstart_from_the_provinces')},
|
||||
{id:'smt',name:'Smarty Pants',asn:10139,type:'eye',pol:'selective',up:['pld'],minIx:10,minPni:30,share:.006,col:'#00A859',pops:['mnl'],ix:[],blurb:tr('networks.pldtea_time_s_mobile_sibling_buy')},
|
||||
{id:'dto',name:'Ditto',asn:139831,type:'eye',pol:'open',share:.002,col:'#B5121B',pops:['mnl'],ix:['mnl','mnl~2'],blurb:tr('networks.the_third_mobile_network_same_towers')},
|
||||
{id:'rsh',name:'RISE & Shine',asn:63927,type:'eye',pol:'open',share:.002,col:'#F5A623',pops:['mnl','sin','hkg','tok','fra','ams','lon','sto','lax'],ix:['mnl','mnl~2','mnl~3','sin','sin~2','hkg','hkg~2','tok','fra','ams','lon','sto','lax'],blurb:tr('networks.up_early_in_cebu_and_already')},
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ function sanitize(s){
|
|||
for(const c of Object.keys(s.pops)){const p=s.pops[c];if(!isCity(c)||!p||typeof p!=='object'){delete s.pops[c];continue;}p.routers=int(p.routers,1,RMAX,1);if(p.rupDay!==undefined)p.rupDay=num(p.rupDay,-1);if(p.rgen!==undefined)p.rgen=int(p.rgen,0,RG.length-1,0);p.down=num(p.down,0);if(p.bb&&typeof p.bb==='object')p.bb.d=num(p.bb.d,0);else p.bb=null;}
|
||||
if(!isCity(s.home))s.home=Object.keys(s.pops)[0]||'fra';
|
||||
const tier=v=>int(v,0,PORT.length-1,0),lag=v=>int(v,1,LAG_MAX,1),sid=v=>String(v==null?uid():v).slice(0,40);
|
||||
s.links=s.links.filter(l=>l&&isCity(l.a)&&isCity(l.b)&&l.a!==l.b).map(l=>{l.id=sid(l.id);l.km=num(l.km,kmBetween(l.a,l.b));l.mo=num(l.mo,0);l.cut=num(l.cut,0);if(l.pairs!==undefined)l.pairs=Math.min(l.sub?SUB_PAIRS_MAX:s.lvl>=PAIRS_LV?PAIRS_BIG:PAIRS_MAX,Math.max(1,Math.floor(+l.pairs)||1));if(l.kind!=='df'&&l.kind!=='vxc')l.kind='wave';if(l.kind==='wave')l.tier=int(l.tier,0,LT.length-1,0);if(l.cable&&!own(CAB,l.cable))l.cable=null;if(l.kind==='vxc'&&!own(VXC,l.vt))l.vt=0;if(l.kind==='df'){if(!own(DF_SYS,l.sys))l.sys='lite';l.ch=Array.isArray(l.ch)?l.ch.filter(o=>own(OPT,o)):[];l.ready=num(l.ready,0);for(const k of Object.keys(SUB_UPGRADES)){const f='sub'+k;if(l[f]!==undefined){if(l.own&&l.sub&&Number.isFinite(l[f])&&l[f]>=0)l[f]=Math.round(l[f]);else delete l[f];}}if(l.seaPath!==undefined){if(l.own&&l.sub&&Array.isArray(l.seaPath)&&l.seaPath.length>=2&&l.seaPath.length<=2048&&l.seaPath.every(p=>Array.isArray(p)&&p.length===2&&p.every(Number.isFinite)&&Math.abs(p[0])<=180&&Math.abs(p[1])<=90))l.seaPath=l.seaPath.map(p=>p.slice());else delete l.seaPath;}if(l.paid!==undefined){if(l.own&&l.sub&&Number.isFinite(l.paid)&&l.paid>=0)l.paid=Math.round(l.paid);else delete l.paid;}if(l.own&&l.sub&&!own(SEA_DESIGNS,l.seaDesign))l.seaDesign='standard';l.regen=int(l.regen,0,REGEN_MAX,0);}const deg=v=>v&&typeof v==='object'?{until:num(v.until,0),f:Math.min(1,Math.max(0,num(v.f,1)))}:null;if(l.loss)l.loss=deg(l.loss);return l;});
|
||||
s.links=s.links.filter(l=>l&&isCity(l.a)&&isCity(l.b)&&l.a!==l.b).map(l=>{l.id=sid(l.id);l.km=num(l.km,kmBetween(l.a,l.b));l.mo=num(l.mo,0);l.cut=num(l.cut,0);if(l.pairs!==undefined)l.pairs=Math.min(l.sub?SUB_PAIRS_MAX:s.lvl>=PAIRS_LV?PAIRS_BIG:PAIRS_MAX,Math.max(1,Math.floor(+l.pairs)||1));if(l.kind!=='df'&&l.kind!=='vxc')l.kind='wave';if(l.kind==='wave')l.tier=int(l.tier,0,LT.length-1,0);if(l.cable&&(!own(CAB,l.cable)||!cablePair(l.cable,l.a,l.b)))l.cable=null;if(l.kind==='vxc'&&!own(VXC,l.vt))l.vt=0;if(l.kind==='df'){if(!own(DF_SYS,l.sys))l.sys='lite';l.ch=Array.isArray(l.ch)?l.ch.filter(o=>own(OPT,o)):[];l.ready=num(l.ready,0);for(const k of Object.keys(SUB_UPGRADES)){const f='sub'+k;if(l[f]!==undefined){if(l.own&&l.sub&&Number.isFinite(l[f])&&l[f]>=0)l[f]=Math.round(l[f]);else delete l[f];}}if(l.seaPath!==undefined){if(l.own&&l.sub&&Array.isArray(l.seaPath)&&l.seaPath.length>=2&&l.seaPath.length<=2048&&l.seaPath.every(p=>Array.isArray(p)&&p.length===2&&p.every(Number.isFinite)&&Math.abs(p[0])<=180&&Math.abs(p[1])<=90))l.seaPath=l.seaPath.map(p=>p.slice());else delete l.seaPath;}if(l.paid!==undefined){if(l.own&&l.sub&&Number.isFinite(l.paid)&&l.paid>=0)l.paid=Math.round(l.paid);else delete l.paid;}if(l.own&&l.sub&&!own(SEA_DESIGNS,l.seaDesign))l.seaDesign='standard';l.regen=int(l.regen,0,REGEN_MAX,0);}const deg=v=>v&&typeof v==='object'?{until:num(v.until,0),f:Math.min(1,Math.max(0,num(v.f,1)))}:null;if(l.loss)l.loss=deg(l.loss);return l;});
|
||||
for(const l of s.links)repairSubUpgradeDates(l,s.day);
|
||||
/* Metrics moved from each link to its city pair (#122). Older saves routed a pair at the lowest metric of its
|
||||
links, with all of them carrying traffic, so the pair keeps that metric and nothing goes on standby. */
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@
|
|||
"cables.a_friendly_cable_with_french_manners":"A friendly cable with French manners.",
|
||||
"cables.a_gateway_from_europe_to_india":"A gateway from Europe to India, through the Red Sea. Pronounced like a very surprised cable.",
|
||||
"cables.a_quick_hop_across_the_red":"A quick hop across the Red Sea between Egypt and Saudi Arabia.",
|
||||
"cables.a_rainbow_bridge_from_singapore_to":"A rainbow bridge from Singapore to California, via Jakarta and Manila.",
|
||||
"cables.a_rainbow_bridge_from_singapore_to":"A rainbow bridge from Singapore to California, via Jakarta, Davao and Guam.",
|
||||
"cables.a_ring_around_the_caribbean_from":"A ring around the Caribbean from Florida to Central America, older than most of its customers.",
|
||||
"cables.a_ring_round_east_asia_from":"A ring round East Asia from 2001: Singapore, Hong Kong, Manila, Taipei, Shanghai, Seoul and Tokyo.",
|
||||
"cables.a_short_cable_across_a_very":"A short cable across a very tense strait.",
|
||||
|
|
@ -430,6 +430,7 @@
|
|||
"cables.the_sequel_singapore_to_hong_kong":"The sequel: Singapore to Hong Kong, Taiwan, Japan and Korea, lit in 2025.",
|
||||
"cables.the_seychelles_first_cable_to_tanzania":"The Seychelles’ first cable, to Tanzania, after years on satellite.",
|
||||
"cables.the_straightest_line_across_the":"The straightest line across the Atlantic. Traders pay double to save a few milliseconds.",
|
||||
"cables.the_upstart_s_own_cable_from":"The upstart's own cable from Cebu to Mindanao's north coast, then overland to Davao. Laid in a pandemic.",
|
||||
"cables.tokyo_to_los_angeles_built_by":"Tokyo to Los Angeles, built by a search engine and five telcos holding hands.",
|
||||
"cables.up_the_west_coast_of_africa":"Up the west coast of Africa. Something on it is always down.",
|
||||
"cables.west_africa_s_first_big_cable":"West Africa’s first big cable, from Portugal to Cape Town. Old and wobbly, but still holding things up.",
|
||||
|
|
@ -562,6 +563,7 @@
|
|||
"cities.mexico_s_data_center_boom_town":"Mexico’s data center boom town, high and dry in the middle of the country. Every cloud wants a region here.",
|
||||
"cities.mexico_s_industrial_capital_a_few":"Mexico’s industrial capital, a few hours from Texas. Factories, steel and grilled goat on weekends.",
|
||||
"cities.mexico_s_silicon_valley_home_of":"Mexico’s Silicon Valley, home of mariachi and tequila. Chip design by day, music by night.",
|
||||
"cities.mindanao_s_big_city_and_the":"Mindanao's big city and the Philippines' Pacific door: the trans-Pacific cables land here, south of the typhoon belt.",
|
||||
"cities.morocco_s_business_capital_on_the":"Morocco’s business capital on the Atlantic, the gateway between Europe and West Africa.",
|
||||
"cities.most_uae_cables_land_on_this":"Most UAE cables land on this coast, outside the Strait of Hormuz. Getting from here to Dubai means renting from the duopoly.",
|
||||
"cities.mountains_mines_and_more_bars_per":"Mountains, mines and more bars per head than anywhere else in Brazil. Peering deals get signed over cheese bread.",
|
||||
|
|
|
|||
|
|
@ -84,3 +84,42 @@ test('Cebu: its own island, GotchaFIX Cebu, reached by two domestic cables, in t
|
|||
ev('cam.z=5;cam.x=CITY.ceb.x;cam.y=CITY.ceb.y;draw(0)');
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test('Davao: Mindanao, GotchaFIX Davao, the trans-Pacific landings moved from Manila, and cables from Cebu', () => {
|
||||
const { ev, errors } = load();
|
||||
start(ev);
|
||||
assert.ok(ev("isSub('dvo','mnl')&&isSub('dvo','ceb')"), 'Davao is on Mindanao');
|
||||
assert.ok(ev('onLand(CITY.dvo.x,CITY.dvo.y)'), 'Davao is drawn on land');
|
||||
assert.equal(ev('CITY.dvo.ix'), 'GotchaFIX Davao');
|
||||
assert.equal(ev('CITY.dvo.dc'), "Heimdall's Hut");
|
||||
// Bi-Frosted's Philippine branch and SEA-US land at Davao, not Manila
|
||||
const at = (cid, c) => ids(ev, `CABLE_PAIRS.filter(p=>p.cid==='${cid}'&&(p.a==='${c}'||p.b==='${c}')).map(p=>p.a==='${c}'?p.b:p.a)`).sort();
|
||||
assert.deepEqual(at('bifrost', 'mnl'), []);
|
||||
assert.deepEqual(at('bifrost', 'dvo'), ['gum', 'jkt']);
|
||||
assert.deepEqual(at('seaus', 'mnl'), []);
|
||||
assert.deepEqual(at('seaus', 'dvo'), ['gum']);
|
||||
assert.ok(ev("cablesFor('jkt','gum').some(p=>p.cid==='bifrost')&&cablesFor('gum','lax').some(p=>p.cid==='bifrost')"), 'the trunk stays');
|
||||
assert.deepEqual(ids(ev, "cablesFor('ceb','dvo').map(p=>p.cid)").sort(), ['dfon', 'pdscn', 'vismin']);
|
||||
for (const n of ['pld', 'glb']) assert.ok(ev(`sellsAt(NET.${n},'dvo')`), `${n} sells transit in Davao`);
|
||||
assert.ok(ev("NET.cvg.pops.includes('dvo')"));
|
||||
ev('cam.z=5;cam.x=CITY.dvo.x;cam.y=CITY.dvo.y;draw(0)');
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test('Davao: a saved link on a Bi-Frosted or SEA-US pair that moved keeps working, without the cable', () => {
|
||||
const { ev, errors } = load();
|
||||
start(ev);
|
||||
for (const c of ['mnl', 'jkt', 'hkg']) ev(`ACT.buildPop({city:'${c}'});S.pops.${c}.rgen=3`);
|
||||
ev("UI.via='sjcph';UI.route='same';openLinkModal('mnl','hkg');ACT.buildLink({tier:2});closeModal()");
|
||||
ev("UI.via='sjcph';UI.route='same';openLinkModal('mnl','hkg');ACT.buildLink({tier:2});closeModal()");
|
||||
assert.equal(ev('S.links.length'), 2);
|
||||
// as an old save had them: Bi-Frosted Jakarta–Manila and an untouched Manila–Hong Kong link
|
||||
ev("const l=S.links[0];l.a='jkt';l.b='mnl';l.km=kmBetween('jkt','mnl');l.cable='bifrost'");
|
||||
ev('const o=JSON.parse(JSON.stringify(S));sanitize(o);window.__o=o');
|
||||
assert.equal(ev('__o.links.length'), 2, 'the link survives');
|
||||
assert.equal(ev("__o.links.find(l=>l.a==='jkt').cable"), null, 'its cable tag is dropped');
|
||||
assert.equal(ev("__o.links.find(l=>l.b==='hkg').cable"), 'sjcph', 'a pair that still exists keeps its cable');
|
||||
ev('S=__o;after();compute()');
|
||||
ev('cam.z=1;draw(0)');
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue