Merge #214-#217: Manila, Cebu and Davao (fmcglinn)
Adapted to main: Globe is main's Globe-Trotter Telecom (now a Philippine carrier in Cebu and Davao) instead of a second AS4775, the new Philippine networks buy transit from NTT and Tata like main's other island networks, cities and networks carry their country, and Philippine transit sits in the new pricing. Cable names no longer pile up where short cables crowd.
This commit is contained in:
commit
a8fa75411c
22 changed files with 333 additions and 17 deletions
|
|
@ -79,4 +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 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
|
|
@ -44,6 +44,7 @@ const CITY_LL={
|
|||
"cbo":[80.0, 6.95],
|
||||
"cbr":[149.13,-35.28],
|
||||
"ccs":[-66.9,10.49],
|
||||
"ceb":[123.89,10.32],
|
||||
"cgb":[-56.1,-15.6],
|
||||
"cgr":[-54.65,-20.47],
|
||||
"chc":[172.55,-43.53],
|
||||
|
|
@ -70,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],
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ const CITIES=[
|
|||
{id:'akl',name:'Auckland',x:1964,y:826,land:'nz',reg:'OC',cc:'NZ',P:250,ix:'Kiwi-IX',dc:'Sheep-cooled Shed',note:tr('cities.far_from_everything_every_packet')},
|
||||
{id:'per',name:'Perth',x:1712,y:785,land:'oc',reg:'OC',cc:'AU',au:true,arpu:AU_ARPU,P:200,ix:'Beard-IX',dc:'Very Remote DC',dc2:'Next-Door-DC P#',dc2N:2,note:tr('cities.the_most_isolated_big_city_on')},
|
||||
{id:'jkt',name:'Jakarta',x:1614,y:624,land:'idn',reg:'AS',cc:'ID',P:900,ix:'Nasi-IX',dc:'Monsoon-proof DC',note:tr('cities.270_million_people_on_17_000')},
|
||||
{id:'mnl',name:'Manila',x:1714,y:494,land:'ph',reg:'AS',cc:'PH',P:600,ix:'',dc:'Typhoon-rated DC',note:tr('cities.typhoons_earthquakes_and_a_lot_of')},
|
||||
{id:'mnl',name:'Manila',x:1714,y:494,land:'ph',reg:'AS',cc:'PH',ph:true,arpu:PH_ARPU,P:1000,ix:'GotchaFIX Manila',ixCheap:1.8,dc:'Typhoon-rated DC',note:tr('cities.typhoons_earthquakes_and_a_lot_of')},
|
||||
{id:'ber',name:'Berlin',x:0,y:0,land:'eu',reg:'EU',cc:'DE',P:450,ix:'Currywurst-IX',dc:'Former Brewery DC',note:tr('cities.startups_techno_and_a_surprising')},
|
||||
{id:'ham',name:'Hamburg',x:0,y:0,land:'eu',reg:'EU',cc:'DE',P:250,ix:'Moin-IX',dc:'Speicherstadt Colo',note:tr('cities.germany_s_port_city_everyone_says')},
|
||||
{id:'dus',name:'Düsseldorf',x:0,y:0,land:'eu',reg:'EU',cc:'DE',P:300,ix:'Altbier-IX',dc:'Königsallee Cage',note:tr('cities.the_rhine_ruhr_hub_more_carrier')},
|
||||
|
|
@ -240,6 +240,9 @@ const CITIES=[
|
|||
{id:'mct',name:'Muscat',x:0,y:0,land:'eu',reg:'AS',cc:'OM',P:50,ix:'Halwa-IX',dc:'Frankincense Colo',note:tr('cities.oman_s_capital_just_outside_the')},
|
||||
{id:'mle',name:'Malé',x:0,y:0,land:'mv',reg:'AS',cc:'MV',P:4,ix:'',dc:'One-Metre-Up DC',note:tr('cities.the_maldives_capital_a_stop_on')},
|
||||
{id:'fuk',name:'Fukuoka',x:0,y:0,land:'jp',reg:'AS',cc:'JP',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',cc:'PH',ph:true,arpu:PH_ARPU,P:125,ix:'GotchaFIX Cebu',ixCheap:1.8,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',cc:'PH',ph:true,arpu:PH_ARPU,P:135,ix:'GotchaFIX Davao',ixCheap:1.8,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,6 +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]]],["ceb","dvo",[[124.05,10.2],[124.1,9.6],[124.5,8.9],[124.62,8.55]]],["mnl","dvo",[[121.6,13.85],[122.1,13.2],[122.9,12.45],[123.75,11.7],[124.3,11.1],[124.25,10.3],[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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue