From f6cdf09974048a54985f6d69d86a9d2f4d908c63 Mon Sep 17 00:00:00 2001 From: Araozu Date: Mon, 9 Sep 2024 09:39:58 -0500 Subject: [PATCH] Rework route rendering to separate departure and return --- public/n/routes_1.json | 2 +- src/pages/Editor.tsx | 2 +- src/pages/Index2.tsx | 130 +++++++++++++++++++++++++++-------------- 3 files changed, 87 insertions(+), 47 deletions(-) diff --git a/public/n/routes_1.json b/public/n/routes_1.json index 3d48e3a..eb009ad 100644 --- a/public/n/routes_1.json +++ b/public/n/routes_1.json @@ -1,3 +1,3 @@ [ - {"name":"","departure":[[-16.436073789050543,-71.56459271907808],[-16.436634803462546,-71.5646141767502],[-16.437236991440884,-71.564759016037],[-16.43771050546292,-71.56510770320894],[-16.4391104532101,-71.56549930572511],[-16.43978468914921,-71.56598746776582],[-16.44035598647145,-71.56604111194612],[-16.440989043703073,-71.56557977199556],[-16.441302998149865,-71.56555294990541],[-16.441652979557702,-71.56569242477418],[-16.442270592267896,-71.56570315361024],[-16.442517636801803,-71.56576216220857],[-16.443016871671276,-71.56606256961824],[-16.444365314077018,-71.56608402729036],[-16.44463294275347,-71.5658748149872],[-16.444885130976296,-71.56535446643831],[-16.445075558600905,-71.56514525413515],[-16.445157905623983,-71.56499505043031],[-16.446110040540923,-71.56433522701265],[-16.446475453241817,-71.56395971775056],[-16.446955916299906,-71.562956571579],[-16.447753643887435,-71.5618944168091],[-16.448772671778055,-71.56081080436708],[-16.448802817768104,-71.56040847301485],[-16.449199104885604,-71.55983448028566],[-16.44971890883882,-71.55914783477785],[-16.45064528866979,-71.55951261520387],[-16.451690033950474,-71.5589761734009],[-16.45225614973289,-71.55810713768007],[-16.45242083765037,-71.55786573886873],[-16.45378465409445,-71.55658364295961],[-16.452950925935525,-71.55578434467317],[-16.452384812180345,-71.55534446239473],[-16.451674594406025,-71.55489385128023],[-16.449476670484906,-71.55279099941255],[-16.448051064437347,-71.55414819717409],[-16.447927545730835,-71.55414283275606],[-16.446383555266852,-71.55549466609956],[-16.44637326195588,-71.55583798885347],[-16.44679014061372,-71.555934548378],[-16.44506600702521,-71.55772089958192],[-16.443187455981075,-71.5556985139847],[-16.440091611356817,-71.55887424945833],[-16.43972103980777,-71.55923902988435],[-16.438074046589133,-71.56108975410463],[-16.43644762707824,-71.56204998493196],[-16.43626233791531,-71.56212508678438],[-16.435073394913626,-71.56213581562044],[-16.434635903232838,-71.56210899353029],[-16.434496935080915,-71.56199634075166],[-16.433055778014655,-71.55986666679384],[-16.432885926656073,-71.55979692935945],[-16.43240725384663,-71.5599149465561],[-16.4322425489513,-71.56009197235109],[-16.432071176629677,-71.56079471111299],[-16.431978529982942,-71.56099319458009],[-16.431551325429275,-71.56159400939943],[-16.4305738539,-71.56075716018678],[-16.42885472345518,-71.55943214893342],[-16.427342352944493,-71.55809640884401],[-16.423806221876152,-71.55514597892763],[-16.420722992506974,-71.55254960060121],[-16.418594687946023,-71.550709605217],[-16.418363055185868,-71.5502053499222],[-16.418213780594265,-71.54937386512758],[-16.418285844204522,-71.54913783073427],[-16.418543487859125,-71.54884278774263],[-16.42222898628675,-71.5448033809662],[-16.42251723461452,-71.54425084590913],[-16.42287239714489,-71.54378950595857],[-16.42297534268454,-71.54344081878664],[-16.42307314089671,-71.54265761375429],[-16.4231760863301,-71.54171884059907],[-16.42321726448818,-71.54156863689424],[-16.424241568362994,-71.53888642787935],[-16.424812911395264,-71.53768479824068],[-16.42492100313136,-71.53746485710145],[-16.42547175532945,-71.5354210138321],[-16.4256313187588,-71.53458416461946],[-16.42604824193979,-71.5341228246689],[-16.426233540844226,-71.53380095958711],[-16.426717376039566,-71.533961892128],[-16.42696444035557,-71.53380095958711],[-16.426959293185536,-71.53297483921052],[-16.42575999884836,-71.53299629688264],[-16.425409988805505,-71.53288900852205],[-16.425188658600145,-71.53303921222688],[-16.424751144661922,-71.53305530548097],[-16.42357242573948,-71.53208971023561],[-16.422681947752764,-71.53146207332613],[-16.42220324980815,-71.5312957763672],[-16.42166278297004,-71.5312045812607],[-16.420581844786142,-71.53131186962129],[-16.41881115210876,-71.53188049793245],[-16.417889767854493,-71.53228282928468],[-16.41714339193377,-71.53261542320253],[-16.41666468035254,-71.53294801712038],[-16.41631980138627,-71.53328597545625],[-16.41573299099325,-71.53373122215272],[-16.41537266794468,-71.53390288352968],[-16.413359994066372,-71.53484702110292],[-16.41253326363852,-71.53508841991426],[-16.412373689459923,-71.53504014015199],[-16.411719948716385,-71.53440713882448],[-16.411164009977597,-71.53379559516908],[-16.410536003194935,-71.53262615203859],[-16.40982048479972,-71.53132796287538],[-16.409619727367147,-71.53080224990846],[-16.409321164648432,-71.52995467185976],[-16.409193712029378,-71.52901589870454],[-16.4089466251331,-71.52800202369691],[-16.40881793391701,-71.5276211500168],[-16.408673799653954,-71.52749776840211],[-16.408488484015983,-71.5273153781891],[-16.40798916044626,-71.52579724788667],[-16.40724789422706,-71.5246492624283],[-16.407103758800964,-71.52439177036287],[-16.40678974911014,-71.52347445487977],[-16.406691942709518,-71.52328670024873],[-16.405801387431556,-71.52211725711824],[-16.405534922984064,-71.52163445949556],[-16.405020148583493,-71.52060449123384],[-16.40424798442957,-71.51959061622621],[-16.40356847743992,-71.5184909105301],[-16.402883820270635,-71.51786863803865],[-16.402080760672213,-71.51727318763734],[-16.401309759527816,-71.51662409305574],[-16.40037799663822,-71.51586234569551],[-16.399621257749914,-71.5153205394745],[-16.399796286053622,-71.51173174381258],[-16.39987350437285,-71.51149034500123],[-16.399760250827477,-71.51133477687837],[-16.399487412470314,-71.51142060756685],[-16.399369990850612,-71.51141524314882],[-16.39683720745614,-71.50865256786348],[-16.39671365620388,-71.50825560092927],[-16.396729100114715,-71.50809466838838],[-16.396157674598438,-71.50684475898744],[-16.39586938721513,-71.50614202022554],[-16.395931163118885,-71.5059918165207],[-16.39584364724939,-71.50546073913576],[-16.395725243363376,-71.50521397590639],[-16.395225887051964,-71.50471508502962],[-16.3946338650238,-71.5041893720627],[-16.39455149659899,-71.5040445327759],[-16.394582384762398,-71.50312185287477],[-16.39452060843073,-71.50313794612886]],"departure_arrows":[],"return":[[-16.436073789050543,-71.56459271907808],[-16.436634803462546,-71.5646141767502],[-16.437236991440884,-71.564759016037],[-16.43771050546292,-71.56510770320894],[-16.4391104532101,-71.56549930572511],[-16.43978468914921,-71.56598746776582],[-16.44035598647145,-71.56604111194612],[-16.440989043703073,-71.56557977199556],[-16.441302998149865,-71.56555294990541],[-16.441652979557702,-71.56569242477418],[-16.442270592267896,-71.56570315361024],[-16.442517636801803,-71.56576216220857],[-16.443016871671276,-71.56606256961824],[-16.444365314077018,-71.56608402729036],[-16.44463294275347,-71.5658748149872],[-16.444885130976296,-71.56535446643831],[-16.445075558600905,-71.56514525413515],[-16.445157905623983,-71.56499505043031],[-16.446110040540923,-71.56433522701265],[-16.446475453241817,-71.56395971775056],[-16.446955916299906,-71.562956571579],[-16.447753643887435,-71.5618944168091],[-16.448772671778055,-71.56081080436708],[-16.448802817768104,-71.56040847301485],[-16.449199104885604,-71.55983448028566],[-16.44971890883882,-71.55914783477785],[-16.45064528866979,-71.55951261520387],[-16.451690033950474,-71.5589761734009],[-16.45225614973289,-71.55810713768007],[-16.45242083765037,-71.55786573886873],[-16.45378465409445,-71.55658364295961],[-16.452950925935525,-71.55578434467317],[-16.452384812180345,-71.55534446239473],[-16.451674594406025,-71.55489385128023],[-16.449476670484906,-71.55279099941255],[-16.448051064437347,-71.55414819717409],[-16.447927545730835,-71.55414283275606],[-16.446383555266852,-71.55549466609956],[-16.44637326195588,-71.55583798885347],[-16.44679014061372,-71.555934548378],[-16.44506600702521,-71.55772089958192],[-16.443187455981075,-71.5556985139847],[-16.440091611356817,-71.55887424945833],[-16.43972103980777,-71.55923902988435],[-16.438074046589133,-71.56108975410463],[-16.43644762707824,-71.56204998493196],[-16.43626233791531,-71.56212508678438],[-16.435073394913626,-71.56213581562044],[-16.434635903232838,-71.56210899353029],[-16.434496935080915,-71.56199634075166],[-16.433055778014655,-71.55986666679384],[-16.432885926656073,-71.55979692935945],[-16.43240725384663,-71.5599149465561],[-16.4322425489513,-71.56009197235109],[-16.432071176629677,-71.56079471111299],[-16.431978529982942,-71.56099319458009],[-16.431551325429275,-71.56159400939943],[-16.4305738539,-71.56075716018678],[-16.42885472345518,-71.55943214893342],[-16.427342352944493,-71.55809640884401],[-16.423806221876152,-71.55514597892763],[-16.420722992506974,-71.55254960060121],[-16.418594687946023,-71.550709605217],[-16.418363055185868,-71.5502053499222],[-16.418213780594265,-71.54937386512758],[-16.418285844204522,-71.54913783073427],[-16.418543487859125,-71.54884278774263],[-16.42222898628675,-71.5448033809662],[-16.42251723461452,-71.54425084590913],[-16.42287239714489,-71.54378950595857],[-16.42297534268454,-71.54344081878664],[-16.42307314089671,-71.54265761375429],[-16.4231760863301,-71.54171884059907],[-16.42321726448818,-71.54156863689424],[-16.424241568362994,-71.53888642787935],[-16.424812911395264,-71.53768479824068],[-16.42492100313136,-71.53746485710145],[-16.42547175532945,-71.5354210138321],[-16.4256313187588,-71.53458416461946],[-16.42604824193979,-71.5341228246689],[-16.426233540844226,-71.53380095958711],[-16.426717376039566,-71.533961892128],[-16.42696444035557,-71.53380095958711],[-16.426959293185536,-71.53297483921052],[-16.42575999884836,-71.53299629688264],[-16.425409988805505,-71.53288900852205],[-16.425188658600145,-71.53303921222688],[-16.424751144661922,-71.53305530548097],[-16.42357242573948,-71.53208971023561],[-16.422681947752764,-71.53146207332613],[-16.42220324980815,-71.5312957763672],[-16.42166278297004,-71.5312045812607],[-16.420581844786142,-71.53131186962129],[-16.41881115210876,-71.53188049793245],[-16.417889767854493,-71.53228282928468],[-16.41714339193377,-71.53261542320253],[-16.41666468035254,-71.53294801712038],[-16.41631980138627,-71.53328597545625],[-16.41573299099325,-71.53373122215272],[-16.41537266794468,-71.53390288352968],[-16.413359994066372,-71.53484702110292],[-16.41253326363852,-71.53508841991426],[-16.412373689459923,-71.53504014015199],[-16.411719948716385,-71.53440713882448],[-16.411164009977597,-71.53379559516908],[-16.410536003194935,-71.53262615203859],[-16.40982048479972,-71.53132796287538],[-16.409619727367147,-71.53080224990846],[-16.409321164648432,-71.52995467185976],[-16.409193712029378,-71.52901589870454],[-16.4089466251331,-71.52800202369691],[-16.40881793391701,-71.5276211500168],[-16.408673799653954,-71.52749776840211],[-16.408488484015983,-71.5273153781891],[-16.40798916044626,-71.52579724788667],[-16.40724789422706,-71.5246492624283],[-16.407103758800964,-71.52439177036287],[-16.40678974911014,-71.52347445487977],[-16.406691942709518,-71.52328670024873],[-16.405801387431556,-71.52211725711824],[-16.405534922984064,-71.52163445949556],[-16.405020148583493,-71.52060449123384],[-16.40424798442957,-71.51959061622621],[-16.40356847743992,-71.5184909105301],[-16.402883820270635,-71.51786863803865],[-16.402080760672213,-71.51727318763734],[-16.401309759527816,-71.51662409305574],[-16.40037799663822,-71.51586234569551],[-16.399621257749914,-71.5153205394745],[-16.399796286053622,-71.51173174381258],[-16.39987350437285,-71.51149034500123],[-16.399760250827477,-71.51133477687837],[-16.399487412470314,-71.51142060756685],[-16.399369990850612,-71.51141524314882],[-16.39683720745614,-71.50865256786348],[-16.39671365620388,-71.50825560092927],[-16.396729100114715,-71.50809466838838],[-16.396157674598438,-71.50684475898744],[-16.39586938721513,-71.50614202022554],[-16.395931163118885,-71.5059918165207],[-16.39584364724939,-71.50546073913576],[-16.395725243363376,-71.50521397590639],[-16.395225887051964,-71.50471508502962],[-16.3946338650238,-71.5041893720627],[-16.39455149659899,-71.5040445327759],[-16.394582384762398,-71.50312185287477],[-16.39452060843073,-71.50313794612886]],"return_arrows":[]} + {"name":"D","departure":[[-16.436120114846965,-71.56459808349611],[-16.436593631592103,-71.56463027000429],[-16.43701053124901,-71.56468927860261],[-16.437278170063237,-71.56478583812715],[-16.43768477447903,-71.56508088111879],[-16.439105309805967,-71.56549930572511],[-16.43930603678599,-71.56560659408571],[-16.439784692593307,-71.56600356101991],[-16.44030452175721,-71.56603574752809],[-16.440608183694202,-71.56591773033144],[-16.44097875355014,-71.56560122966768],[-16.441256680477956,-71.56554758548738],[-16.441714744361196,-71.56569778919221],[-16.442100752412475,-71.56564950942995],[-16.442373530972628,-71.56570851802827],[-16.44296540766238,-71.56605720520021],[-16.444313850425566,-71.56611084938051],[-16.444530012134827,-71.56600892543794],[-16.44488513442029,-71.56534910202028],[-16.445044681902264,-71.56513988971712],[-16.44517334913092,-71.56498432159425],[-16.446130630634222,-71.5643084049225],[-16.446465163379685,-71.56393289566041],[-16.446974681376453,-71.56295120716096],[-16.44718054685432,-71.56265616416933],[-16.44780843521315,-71.56180858612062],[-16.448683358227377,-71.56084835529329],[-16.448755410535092,-71.56080007553102],[-16.44877599690382,-71.56042456626894],[-16.449218603303176,-71.55979692935945],[-16.449692088101184,-71.55914247035982],[-16.45062935139735,-71.55952870845796],[-16.451555726881764,-71.55902981758119],[-16.45169957621148,-71.55896544456483],[-16.451915729694505,-71.5586167573929],[-16.452409793894365,-71.55786573886873],[-16.453783903334543,-71.55658900737764],[-16.45307369068177,-71.555934548378],[-16.452934735728178,-71.55576288700105],[-16.45237376842233,-71.5553390979767],[-16.45160693893074,-71.55482411384584],[-16.449465976120173,-71.55276954174043],[-16.448030076770973,-71.55413210392],[-16.447896264820915,-71.55413746833803],[-16.446383154042678,-71.55549466609956],[-16.446357420764183,-71.55583262443544],[-16.446774299456028,-71.55594527721406],[-16.445052130533306,-71.55771017074586],[-16.443189019575613,-71.5556824207306],[-16.44161527827157,-71.55732929706575],[-16.44008667806854,-71.55884206295015],[-16.43977852114281,-71.55909955501558],[-16.439742493326236,-71.55924975872041],[-16.4380543252847,-71.5610843896866],[-16.436309526429614,-71.56210899353029],[-16.43508970199089,-71.5621304512024],[-16.434484110035353,-71.56203389167787],[-16.433022364836972,-71.55984520912172],[-16.432826778377528,-71.55978620052339],[-16.432276047025837,-71.56000077724458],[-16.432059871676067,-71.5607786178589],[-16.431941489834973,-71.56106829643251],[-16.431540020445425,-71.56158328056337],[-16.430985474754436,-71.56110584735872],[-16.429102148426455,-71.55961453914644],[-16.427398446436968,-71.55816078186037],[-16.424500574605805,-71.55572533607484],[-16.420920120477803,-71.55274808406831],[-16.418567776419508,-71.5506935119629],[-16.41833771258862,-71.55011951923372],[-16.418203880183995,-71.54938459396364],[-16.418296533396987,-71.54910027980806],[-16.41854360841585,-71.54885888099672],[-16.422269554984616,-71.5447497367859],[-16.422511477666568,-71.54425621032716],[-16.422856345650167,-71.54377877712251],[-16.42295929119836,-71.5434515476227],[-16.423124003962013,-71.54201388359071],[-16.423221802099437,-71.54156327247621],[-16.424266694917147,-71.53884351253511],[-16.42480715451534,-71.5376901626587],[-16.424910099030306,-71.53742730617525],[-16.425265257188457,-71.53618812561037],[-16.425543206598647,-71.53508841991426],[-16.425625561903125,-71.53457880020143],[-16.42603219070736,-71.53412818908693],[-16.4262432255742,-71.53380095958711],[-16.426742502273616,-71.53398334980012],[-16.426932947686993,-71.53375804424287],[-16.426963830709433,-71.53298020362855],[-16.425723358781827,-71.53299629688264],[-16.425383643096946,-71.53289437294008],[-16.425141723989658,-71.53303384780885],[-16.424745387780167,-71.53303921222688],[-16.424559011090935,-71.5329158306122],[-16.423462729889625,-71.53200387954713],[-16.42278329002386,-71.53154253959657],[-16.42237150713126,-71.53133332729341],[-16.421846482678095,-71.5311884880066],[-16.421645737659496,-71.53117775917055],[-16.420575094059465,-71.53130650520326],[-16.418913855241534,-71.53184831142427],[-16.417930702573543,-71.53223454952241],[-16.417415960974168,-71.53245449066164],[-16.417143147374052,-71.53259396553041],[-16.416700467887814,-71.53292655944826],[-16.416299983149813,-71.53329133987428],[-16.415661698011416,-71.53376877307893],[-16.414529768163717,-71.53431594371797],[-16.41333554468302,-71.5348255634308],[-16.41248620024577,-71.53507232666017],[-16.41237398224984,-71.53504550457002],[-16.411709946359885,-71.53439640998842],[-16.411462862659405,-71.53418719768526],[-16.411123476853575,-71.53369903564455],[-16.41052635557341,-71.53264760971071],[-16.40987775624417,-71.53137624263765],[-16.409615227329525,-71.53079688549043],[-16.40931666460386,-71.52986884117128],[-16.409002658484326,-71.52815759181978],[-16.40885337670874,-71.52759432792665],[-16.408482745598363,-71.5273153781891],[-16.40805034174393,-71.52599573135377],[-16.407839287132642,-71.52553439140321],[-16.40725759884836,-71.52465462684633],[-16.40696932790375,-71.5239840745926],[-16.40681489686489,-71.52352273464204],[-16.406615634770876,-71.52319550514223],[-16.405755965534272,-71.52203142642976],[-16.405148532286944,-71.52083516120912],[-16.404680086708108,-71.52013242244722],[-16.404252822175003,-71.51960134506227],[-16.4039285123248,-71.51910781860353],[-16.40358875856883,-71.51851773262025],[-16.403418881468443,-71.518292427063],[-16.40297102294758,-71.51791155338289],[-16.40206500715665,-71.5172839164734],[-16.401632589042457,-71.51684939861299],[-16.401066325773634,-71.51640951633455],[-16.399636933954916,-71.51531517505647],[-16.3997759270213,-71.51179611682893],[-16.39985314534864,-71.51147425174715],[-16.39980166646718,-71.51137232780458],[-16.399595750805084,-71.5113401412964],[-16.399497940789317,-71.51143133640291],[-16.399389834925234,-71.5113937854767],[-16.396851903822157,-71.50863111019136],[-16.396697464756254,-71.50822877883913],[-16.39672835257923,-71.50808930397035],[-16.396158556486217,-71.50687694549562],[-16.395859973118334,-71.5061527490616],[-16.395921749025106,-71.50601863861085],[-16.395854825125223,-71.50546073913576],[-16.39574671723833,-71.50521934032442],[-16.395448133238997,-71.50491356849672],[-16.394732559377236,-71.5042966604233],[-16.394583266657275,-71.50410354137422],[-16.39456267454898,-71.50396943092348],[-16.394578118630424,-71.50318622589113],[-16.39452663835428,-71.50319159030916]],"departure_arrows":[],"return":[[-16.39452663835428,-71.50319159030916],[-16.39448545412355,-71.50398552417757],[-16.39459356271062,-71.50425374507905],[-16.395401801198066,-71.5049833059311],[-16.395612869295274,-71.50495648384096],[-16.396029856814824,-71.5050905942917],[-16.39624607221414,-71.50506377220155],[-16.39650861916202,-71.50490283966066],[-16.39658069081126,-71.50489747524263],[-16.39654980296486,-71.50551438331605],[-16.396992528295232,-71.50553584098817],[-16.39707489568751,-71.50544464588167],[-16.3970903395697,-71.50487065315248],[-16.397105783450616,-71.50475263595582],[-16.397296257881578,-71.50524616241456],[-16.397430104667528,-71.50535345077516],[-16.397553655465188,-71.50524079799654],[-16.397605134941056,-71.50502085685731],[-16.397646318511995,-71.5048921108246],[-16.398464840176768,-71.50393187999727],[-16.39943779541516,-71.50564312934877],[-16.40057547764851,-71.50489747524263],[-16.4043024986646,-71.51107728481294],[-16.40536808409523,-71.51041209697725],[-16.406083618863633,-71.51162981987001],[-16.406552061063906,-71.51096463203432],[-16.410300272447788,-71.50512814521791],[-16.410686342899098,-71.50569140911104],[-16.41094372277436,-71.50631368160249],[-16.411813664231968,-71.50627613067628],[-16.411566580663226,-71.51232719421388],[-16.411669532188355,-71.51256322860719],[-16.411844549655964,-71.51271879673006],[-16.41204530479261,-71.51270270347597],[-16.41243651933538,-71.51255786418916],[-16.41260124101278,-71.51295483112337],[-16.412385043782614,-71.51343226432802],[-16.415813285839164,-71.51541173458101],[-16.416091248762847,-71.5154814720154],[-16.418196547636022,-71.51600182056428],[-16.420301823715068,-71.51666700839998],[-16.420620958930474,-71.51666700839998],[-16.42125408046856,-71.5165275335312],[-16.422262952805237,-71.51645243167879],[-16.42257693751519,-71.51638805866243],[-16.42294239448972,-71.51620566844942],[-16.424342448653764,-71.51569068431856],[-16.42562386728177,-71.51887178421022],[-16.425129734927243,-71.51900053024293],[-16.425351065199713,-71.51955842971803],[-16.426071673642927,-71.51942968368532],[-16.426107703994912,-71.51947259902956],[-16.42522753205548,-71.52119457721712],[-16.425001054420434,-71.52214944362642],[-16.42509885161339,-71.52441322803499],[-16.42514002936413,-71.52758896350862],[-16.425222384839405,-71.53115630149843],[-16.425222384839405,-71.53288900852205],[-16.425284151423003,-71.53419256210329],[-16.425273856993773,-71.53467535972597],[-16.42522753205548,-71.5350776910782],[-16.424635601316435,-71.53736293315889],[-16.424059110516122,-71.53876304626466],[-16.423055394774916,-71.5412735939026],[-16.422942154724915,-71.54157400131227],[-16.422870092840565,-71.5419763326645],[-16.422813472769835,-71.54294192790987],[-16.4227362635559,-71.54352664947511],[-16.422422279103298,-71.544046998024],[-16.421959022427433,-71.54431521892549],[-16.418100618669566,-71.54855847358705],[-16.418054292021903,-71.54885888099672],[-16.41671596188006,-71.55028045177461],[-16.416459435271353,-71.55017852783205],[-16.416268979597405,-71.54991567134859],[-16.41680946142888,-71.54927194118501],[-16.417442595378052,-71.54980301856996],[-16.418255886369288,-71.55067205429079],[-16.424975201200464,-71.55636906623842],[-16.428912786647285,-71.55969500541688],[-16.43142456417753,-71.5616261959076],[-16.43163044614174,-71.56166374683382],[-16.43206794459127,-71.56106293201448],[-16.43217088525975,-71.56081080436708],[-16.432340737243464,-71.56010270118715],[-16.432505442055554,-71.55999004840852],[-16.432834851260836,-71.5599149465561],[-16.432984114623107,-71.5599685907364],[-16.434373802490953,-71.56202316284181],[-16.434564240424198,-71.56216800212862],[-16.435094377471295,-71.56224846839906],[-16.436262732651073,-71.56230747699739],[-16.437734747232945,-71.56146526336671],[-16.438213406913324,-71.56117022037508],[-16.439937601358974,-71.55935168266298],[-16.440205236139054,-71.5589761734009],[-16.441641193371296,-71.55751168727876],[-16.441713248293105,-71.5573561191559],[-16.44308228672621,-71.55593991279603],[-16.443180074816315,-71.55596673488618],[-16.444518222679054,-71.55742049217226],[-16.446093107962128,-71.55585944652559],[-16.446304121032597,-71.55574142932893],[-16.446947452148578,-71.55589163303377],[-16.44726139695898,-71.55519962310792],[-16.447472408759264,-71.55491530895235],[-16.448038536846127,-71.55435740947725],[-16.448110589393245,-71.55419647693635],[-16.448964924698764,-71.55342400074007],[-16.44948987585229,-71.55389606952669],[-16.449989092788766,-71.553413271904],[-16.451337486754518,-71.5547275543213],[-16.452063145277595,-71.55528008937837],[-16.452881437803136,-71.55585408210756],[-16.453663701644842,-71.55657291412355],[-16.452335909836243,-71.55784428119661],[-16.451641131431252,-71.5589064359665],[-16.45068563791012,-71.55941605567934],[-16.449651180359233,-71.55902445316316],[-16.44874087269105,-71.56027972698213],[-16.448679113567138,-71.56040847301485],[-16.44866367378308,-71.56074106693269],[-16.44774243111182,-71.56179785728456],[-16.44688809042474,-71.56291902065279],[-16.446409452131135,-71.5639114379883],[-16.446038892641543,-71.56430304050447],[-16.44512793088912,-71.56491458415987],[-16.44491691654003,-71.56519889831544],[-16.444788249141382,-71.56530618667604],[-16.444515473974246,-71.56585872173311],[-16.444381659601156,-71.56598210334779],[-16.444263285271155,-71.56600356101991],[-16.443110418456346,-71.56599819660188],[-16.442863374676712,-71.56590700149538],[-16.442384726459103,-71.56559586524965],[-16.442024452828747,-71.56555831432344],[-16.441705352769258,-71.56555294990541],[-16.44128846319172,-71.56545102596284],[-16.44093848112677,-71.56549930572511],[-16.440542177144607,-71.5658211708069],[-16.440284836463245,-71.5659284591675],[-16.439847356522243,-71.56589090824129],[-16.43931027782808,-71.56547248363496],[-16.43911984454852,-71.56537592411043],[-16.437843422070284,-71.56502723693849],[-16.437581623196024,-71.5648663043976],[-16.437293397215775,-71.56466245651247],[-16.436984583190824,-71.56458735466005],[-16.43658827113939,-71.5645068883896],[-16.43611990130867,-71.56448543071748]],"return_arrows":[]} ] diff --git a/src/pages/Editor.tsx b/src/pages/Editor.tsx index 88199a3..fc19c2a 100644 --- a/src/pages/Editor.tsx +++ b/src/pages/Editor.tsx @@ -34,7 +34,7 @@ export function Editor() { name: route_name(), departure: departure_points().map(({lat,lng}) => [lat,lng]), departure_arrows: [], - return: departure_points().map(({lat,lng}) => [lat,lng]), + return: return_points().map(({lat,lng}) => [lat,lng]), return_arrows: [], }; diff --git a/src/pages/Index2.tsx b/src/pages/Index2.tsx index f9aae66..d8571ae 100644 --- a/src/pages/Index2.tsx +++ b/src/pages/Index2.tsx @@ -1,5 +1,5 @@ import L from "leaflet"; -import { createResource, createSignal, For, onMount, Suspense } from "solid-js"; +import { createEffect, createResource, createSignal, For, onMount, Suspense } from "solid-js"; import { LineSegmentsIcon } from "../icons/LineSegmentsIcon"; import { Line, Lines, Route, Routes } from "../new_types"; @@ -23,7 +23,7 @@ export function Index2() { L.tileLayer("/tiles/{z}/{x}/{y}.jpg", { maxZoom: 17, minZoom: 12, - attribution: "© Map data OpenStreetMap", + attribution: "Map data © OpenStreetMap", }).addTo(global_map); }); @@ -98,67 +98,107 @@ function LineEl(props: { line: Line }) { } function RouteEl(props: { line_name: string, route: Route, color: string }) { - const [active, setActive] = createSignal(false); + const [departure_active, set_departure_active] = createSignal(false); + const [return_active, set_return_active] = createSignal(false); + const [departure_count, set_departure_count] = createSignal(0); + const [return_count, set_return_count] = createSignal(0); - // Render the dots into the map - const coords = props.route.points.map(([lat, lng]) => ({ lat, lng })); - const line = L.polyline(coords, { color: props.color, opacity: LINE_OPACITY }); - line.addTo(global_map!); + // Create departure and return polylines + const departure_polyline = L.polyline(props.route.departure, {color: props.color}); + const return_polyline = L.polyline(props.route.return, {color: props.color}); - // Store the route in the global map - // Create line map if neccesary - const line_name = props.line_name; - if (!lines_store.has(line_name)) { - lines_store.set(line_name, new Map()); - } - // Create the arrows, if any - const arrows = []; - if (props.route.arrows) { - for (const a of props.route.arrows) { - const arrow = L.polygon(a, {color: props.color}); - arrows.push(arrow); + // Rended the lines into the map + createEffect(() => { + if (departure_count() > 0) { + departure_polyline.addTo(global_map!); + } else { + departure_polyline.removeFrom(global_map!); } - } + }); + createEffect(() => { + if (return_count() > 0) { + return_polyline.addTo(global_map!); + } else { + return_polyline.removeFrom(global_map!); + } + }); - // store - lines_store.get(line_name)!.set(props.route.name, [line, arrows, 0]); - - const set_highlighted = () => { - const is_active = active(); - const arr = lines_store.get(props.line_name)?.get(props.route.name); - - if (is_active && arr !== undefined) { - arr[2] -= 1; - setActive(false); - } else if (!is_active && arr !== undefined) { - arr[2] += 1; - setActive(true); + const toggle_departure = () => { + const currently_active = departure_active(); + if (currently_active) { + set_departure_count((c) => c - 1); + set_departure_active(false); + } else { + set_departure_count((c) => c + 1); + set_departure_active(true); + } + }; + const toggle_return = () => { + const currently_active = return_active(); + if (currently_active) { + set_return_count((c) => c - 1); + set_return_active(false); + } else { + set_return_count((c) => c + 1); + set_return_active(true); } }; - const active_classes = () => { - if (active()) return "underline bg-[var(--hover-bg)] text-[var(--hover-on-bg)] border-[var(--hover-bg)]"; - else return "border-transparent"; + const departure_classes = () => { + if (departure_count() > 0) { + return "bg-r-hover-bg text-r-hover-on-bg"; + } else { + return ""; + } + }; + const return_classes = () => { + if (return_count() > 0) { + return "bg-r-hover-bg text-r-hover-on-bg"; + } else { + return ""; + } }; - return (