From c83c5eabb1b4620612b2c2c7900d80333372dacb Mon Sep 17 00:00:00 2001 From: ed Date: Sun, 22 May 2022 06:22:19 +0200 Subject: [PATCH] train added --- proj/map/asset/js/.main.js.swp | Bin 32768 -> 32768 bytes proj/map/asset/js/db.js | 6 + proj/map/asset/js/main.js | 3 + proj/map/asset/js/map.js | 11 +- proj/map/asset/markers/markers.svg | 145 +++++++++++++++++++++++-- proj/map/asset/markers/resto-32x41.png | Bin 2116 -> 2185 bytes proj/map/asset/markers/train-32x27.png | Bin 0 -> 1274 bytes 7 files changed, 156 insertions(+), 9 deletions(-) create mode 100644 proj/map/asset/markers/train-32x27.png diff --git a/proj/map/asset/js/.main.js.swp b/proj/map/asset/js/.main.js.swp index 80b3d06e1244ab325f6b135ab365267d51a87043..5222c1755228d42cd79d9d269ef33b51f90b4b74 100644 GIT binary patch delta 272 zcmZo@U}|V!l1nlO^Ym4)&@*BH0s#hw#_gR+!D%Us-y>NVQd1^wRNLrshM&=Mv!K9d zf8Gyl3=9Sw5QUzT1rt`+Z{=cOSO~<0K%5E0$v_+j!~sBT3&fm2%ml>mIT;x40r6fS zUJ1mVK%5H1`amoQ#0)@u6KL{zAU+PnJAim25YGVOb|B6N;y@tw1Y#>7HUVOwOEz04 zer4NSo8if1o>rt_rJ$6XnpdijmS0+wmszZEc!5GmW=T=1LS|k{W^!UlW}1=?g8~@9 PMJAuEk=cAE%S03afD1kH delta 244 zcmZo@U}|V!l1nlO^Ym4)&@*BH0s#hwi(lH40@G3$zeln#q^3;VsJ7AN3_qjWWnM4G?PsF&7Yj<78mC2E?0y zxCV&hfY=v^)qq$Ah(&;y6^Q=Lx!EGak!ka>EGtm}w?#9m diff --git a/proj/map/asset/js/db.js b/proj/map/asset/js/db.js index b1b02ba..e0db45a 100644 --- a/proj/map/asset/js/db.js +++ b/proj/map/asset/js/db.js @@ -291,6 +291,12 @@ let SanTelmo = { ] }, */ + }, + sections : { + pizza : { + //diavolo, + //reine, + } } }, time : { diff --git a/proj/map/asset/js/main.js b/proj/map/asset/js/main.js index 02af7ff..35da5c2 100644 --- a/proj/map/asset/js/main.js +++ b/proj/map/asset/js/main.js @@ -39,6 +39,9 @@ Vue.component('Menu',{ fr : "(hors boissons)", en : "(excluding drinks)", it : "(bevande escluse)", + }, + indicatif : { + fr : "menu fournis à titre indicatif", } } }, diff --git a/proj/map/asset/js/map.js b/proj/map/asset/js/map.js index d4adf8c..94f1bd0 100644 --- a/proj/map/asset/js/map.js +++ b/proj/map/asset/js/map.js @@ -39,7 +39,7 @@ var markPointerIcon = L.icon({ }); var markRestoIcon = L.icon({ - iconUrl: 'asset/markers/resto-42x56.png', + iconUrl: 'asset/markers/resto-32x41.png', iconSize: [41, 32], iconAnchor: [20.5, 32], popupAnchor: [0, -38], @@ -52,6 +52,12 @@ var markParkingIcon = L.icon({ popupAnchor: [0, -38], }); +var markTrainIcon = L.icon({ + iconUrl: 'asset/markers/train-32x27.png', + iconSize: [27, 32], + iconAnchor: [13.5, 32], + popupAnchor: [0, -38], +}); var marker = L.marker(hotelxy, { icon: markPointerIcon, @@ -92,6 +98,9 @@ function iToZL(i) { return lay } +train = L.marker([-7.71,23.95], { + icon: markTrainIcon, +}).addTo(layzl2) let parking = jdb.data.db.parking.sub Object.entries(parking).forEach(p => { diff --git a/proj/map/asset/markers/markers.svg b/proj/map/asset/markers/markers.svg index dd1b4e2..32fec29 100644 --- a/proj/map/asset/markers/markers.svg +++ b/proj/map/asset/markers/markers.svg @@ -23,13 +23,13 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.30106958" - inkscape:cx="5547.9727" - inkscape:cy="-8955.9688" + inkscape:zoom="0.40799189" + inkscape:cx="7522.7161" + inkscape:cy="-8007.5984" inkscape:document-units="mm" inkscape:current-layer="g5160" inkscape:document-rotation="0" - showgrid="true" + showgrid="false" inkscape:snap-bbox="true" inkscape:snap-intersection-paths="true" inkscape:object-paths="true" @@ -41,7 +41,7 @@ inkscape:snap-midpoints="true" showguides="true" inkscape:guide-bbox="true" - inkscape:snap-global="true" + inkscape:snap-global="false" inkscape:window-width="1280" inkscape:window-height="779" inkscape:window-x="0" @@ -74,6 +74,18 @@ position="-924.36032,2378.9418" orientation="1,0" id="guide5147" /> + + + @@ -401,15 +413,132 @@ d="m 4473.678,-2213.9979 h 38.0558 l 152.2234,-190.2793 h -38.0558 z" id="path7901" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proj/map/asset/markers/resto-32x41.png b/proj/map/asset/markers/resto-32x41.png index b56b0c38951a4e29d76c0bfe12d7113848d7d94e..0034a270874579c4057f05133245e21a675ad1da 100644 GIT binary patch delta 2129 zcmV-X2(I_U5Q!0xEDCr4004La>hfy#kv1oP2o_01K~z|Uy_kDcRM!>8zkLQ6X1L(U zLzx+0@mY(Ay3{PA0;6^n2FA8(X`&`1KCnrX#;CQ4wae5tKI&?!=An70wKb`ltfeqG z5DkpRM>U#65X@2(aX>*4nD@Zo+|xgRfh!}7wkzKs^Vs)%o8R5%oP7^NdBsO~b8|C) z!o$PS@!rzX0(p4&h1oj&B>X@!noYMo?q)Ry2LLD(;XIO*N}W#E%)DMNHg5Pknwy)k zY2#M7Jsxb{wEc%-lW5JF^;o%LEmp2ri`v>d{kH$xz*vA&{)|-HoG0*KxCAF=x7y; zW>YyQQ`qp<+hLZQmOc4q(-zKokAADw1~ArHNxR*Ny?gh=W^>@5d-r!U`KEDalhXb5<($?EVB*RTjV3 z$aXMYNf8VF!oKugG%2*-0q_lj@l`GdI@xem|;@8U- z;oyNo`0iq9H=ihqxK>eriE9;=7&&q{a+YP|(@#D}S=smgF}H8m;mnz@HPfa|c?|)k zopTPG-679Eo*%>Ha=G=-e_7+dC@i@w*)W^=$|we9dwEdzWb7$q>lX)`qy2 zdE_3k>y{;A06`>w!szO1>62tkVgkxaFQd069!Q*XeEUralE#gZ#4Xjgz=?kRP)N?T zOzx43jCEo%27q&sbJAF?c8N)&?gxvd`jG)Ubn|8nw3_~sn9XVj26@bh7^PdxZNH}Oc@aY01bi0TiYNtA%Y-?PG@r`BN0Fl!BHF4CrV3?PEWJAxHyq@ISh4F zk~qsx8k-<7TCFxzUa!LRzuj&P8N z%su%T5piO~{g6Z;z}NN}TQdzml^E{bYrwvL9l&p1UW{Qwhx7`lR>x!c@)u#uEr8{w zw2JBaS&)T=ysy{mTY7|Sdm;bfuf1oA0N|;2?U*!aeC41)10<&M@+;W&@jkq;WFh7+ zoQHUSwY2vEKx}Lb=FT(MdMNJ*L6!j~?6mO|wrD-Ed`)}SDNWhC=gk{E%5`@b7zq??S#kE~si^W28_ z-u;-jcKNr#+uDjR3XAYXVG$xD1@!H!f=tHH*l2^zCOv<4h%tuepPx@do*1~@keacl zH^8v>FMfX*41dzkwgvC;W8#gQu1ym>${N-1F zmSWfb)R70X1%X zBIeF9@R+!mKW3z+Z)nf?Xplq%&Uss(>@wY5l{q8*!+dl8nd}#y**tSrivGlj(=dn4bI;h7BEjl7m)%&(`VB27PB;Ap!UyiI{)m1O(M(mI25xnhT~a zTrh9pGxO)ouBo}DZfdZi$!Z1X94b{Gs8lKp8mw)QFfLTnEYP<5!o%eS2Ay92zb1bab^GZrJRD)IvY52Aw8sAej5uX}@-bi-00000NkvXX Hu0mjfiwhe8 delta 2059 zcmV+m2=w=f5yTLXEDD_f005lGKyNNs8tZJfJ$;gNMbH$?|CS}oLsoLX7&I0?fu{TcfP&9z0W!1(?g$g$FKu` z8jS`+wjpS>Q!!|7WGwFefb)840Oz8#ivW$$NTw z@$f+((o$1!>vj(oEu4=ZIy@wVscmi8T$)#SX1uxV zcDtMso&*4NqJXt6NB`2)WH#>Ke=tT6Y|#_-`PKKRKYH(npTwPLJJn_~AKNuvf3Mdk zcMLmIfsss}K7F2@KX-w7eIn_9xOjzSE?pcIXs9YtIIEwxiSCv@z%YO0MpawVEM8vXkugG zV?Gd0AeYJTWN;Ae=P%;XqtJS(scE3oW=ua+)7-GEEWfZT5~NMAC5=LVMv~EJjJ|XC z?!ONoHj&`A*jNp=Rg~fWy$7hRYlO??lD2C!*pR;-N@Wbb`_2Tn+bwCYK6of9BR%a? z0IMU-KkRU5&1SQlDikr8qE!0)4e}_ts8Oo{0Lq!F-`5;zn8i7lK+cMviCw>~#5cwo zG&Pw+00CggZpV=$CNwvHpTt{x-h^7MlC*m~9(iM9%SuygV^JhXL9h`QTnRKgD|2sQ z@oz>mx_IFNUbdy^u#EBhKi#_X=bJZvlI%~VQi*Nb%kaMx9V zW9K$dD%~-sPM*WSlYzfRgtXegIoDBzFY0fUK2H>(00B85f==&$yz*mwuyNC?dHD95 zT6o-^aRL3Z*@kfL>;2%`*C zEa|w^DcMLdF)@gXn~MJa#}fwhtF!YOmS!#viC@0_qnF5{3&MG<7QqL~byVR{FiHY5 zNeQEj4Lcl}f>nrr2{bKQG#{5bewZ|%U)|lkNJ&YO#O~jJ2nrrb4?qxx2;I7toz7@cWIC!A)GUAz zgn)>Yv0X zum+o)PA3$KF|X?}rB`1!44G@yua~20_nVHHGp0w;ii!#`@HK-{0wNMIR-^7xsisKI znX6ZCASWk(>xCf~EPN?sPbVbK;spG5a9>?=B35U^j8euyj%H_P zN)B>|!vW4XwA!hY2An%L4R?C(f^#m3XJ=@5I+%AA#57m9*vLWciYk6W$+hjFEJZ z=a7VeFvJ#X(qcJ{9jcp3O5lgY4l-6~Y>*ox{ej2L`6 zD4m#pQdUy3@z$lb3tx^0Dfb&j&4hqakpV#I+ERO6+p%{y)H*;`f|?E-rj+K_Vx|{z?3OUh$0JlcMR6LS5~q0udI2u zIIm#bZyg|9;ZO=Xl1aa=obGtHd#)I^XxkiZO%MsrTX{5S#$>?6A0Aw=RxD{8NTWkhkHW&==l$7SDQy)!a zl%#OZy&UABobv}o8;b5u28KlV4mK}FxVkbW5q1_lFe0k}08 ppm567uaPauTnGS|J11>4{y$!IE6+Ly4J-fv002ovPDHLkV1f_D@0tJr diff --git a/proj/map/asset/markers/train-32x27.png b/proj/map/asset/markers/train-32x27.png new file mode 100644 index 0000000000000000000000000000000000000000..a65461bc579b7417a972503dcb90e2305fec8632 GIT binary patch literal 1274 zcmVzwbGxrQBM~CMdNUMjZhuYq?I`92YZK1vTEn#f){E#7#{!;UDlf z6E|nfelTp=A|@tgVm1l|mO%?lvM|_|!Q@iFD3`hx$E}67ho09TCLOi(vKsyVbl&%Q z-tXtU&v~CWhaiO7jBQWx9>KD@Y7dx02!Tu{9jz?ZW(4!%Lcsvw!Gk5Vv~+mK^KWtA9>eJ~pPm?OHH@`C)_Gyq;0v)v+>%N4GFK)Ia$9zhR?NGw7{MOoN@ zrNw0!jeP;*!C@SSg9nSlhRw{(2Ze20#{WwHD=cUkDX3px1h%*sxFv ztBkQRF(4#xyRj?_i6kndPtctaLQr2{2en3pxj73?pFWHAHK$KbO3HKi@Z;l%mPpY2 zV+*>wBRq}ID3YPpr~m+R`P0bG-s6{3QnDYhF)?5m2Cs(b$)K>M#bvm8-aEEg|MbhT z*%rLdR;w*2ENB^5SM50abtCc$vSA*d#>B*=Uru{_7kD?1cv(EIT{T4x0|2vm8fNo! zz&OwIXz%C>WfK^dwI>rhckT$wAdnQ#%EN$B;aYya#zAOyqK676hKBB7Zr0)rE0rmD zAv0aLH!{jhPX6khmrCR5zWpz{qC}#Llu#=J#z{S%v8~oV&2zb@Q$by>o_Wh3DS{xN zxml0NEhS7(-;LMb(1H*GN-3^fHehsg;?Zst$*8V*2Qe`cBqb%CuP7?7-};;2h3UKW z@(n@gIoJ4I>fO8d!mZY}B7~r>t{MePQl<0dp-u-1{B$ekk{1z*p z-vya8KA`#X%BoKVD5bbLcnhkmj1LSZ!)KJz`-Bk60f64r{^f#g;S-ru3a8WehDc3K z!P{@W2EqisuBbq9>CzQUO+EUCYmRl;tP60&MqBiz_OAeZN?MJEFK*u+Za8f`H!Meq^fB8#swX z(pp%USFyEmb8^)?HZ0i_AKXrB{>U7mcLYR!fo3|dm041OT&iGu!YK;oV-hXc*TFf1Y z1OxzYmX%p0V(}|FUDbF_uG%L?TDlA+F1M@8Znxu!goH_!K~ZICTwENY#8IVx0ai-DuY>Z2ZU6uP07*qoM6N<$f?P#c8vp