From afa7d801c345e5ddf3dab6d1a4df206f7b68fe57 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sun, 5 Nov 2023 11:30:10 +0100 Subject: [PATCH] waypoints: Merge waypoint_editor into waypoints application Waypoint editor is reasonably small piece of javascript, so merge it with waypoints and make it always-available. --- apps/waypoint_editor/ChangeLog | 3 -- apps/waypoint_editor/README.md | 3 -- apps/waypoint_editor/app-icon.js | 1 - apps/waypoint_editor/app.png | Bin 11143 -> 0 bytes apps/waypoint_editor/metadata.json | 15 -------- apps/waypoints/ChangeLog | 1 + apps/waypoints/README.md | 13 +++++-- apps/waypoints/app-icon.js | 2 +- apps/waypoints/app.js | 34 ------------------ apps/waypoints/metadata.json | 6 ++-- .../app.js => waypoints/waypoints.app.js} | 0 11 files changed, 16 insertions(+), 62 deletions(-) delete mode 100644 apps/waypoint_editor/ChangeLog delete mode 100644 apps/waypoint_editor/README.md delete mode 100644 apps/waypoint_editor/app-icon.js delete mode 100644 apps/waypoint_editor/app.png delete mode 100644 apps/waypoint_editor/metadata.json delete mode 100644 apps/waypoints/app.js rename apps/{waypoint_editor/app.js => waypoints/waypoints.app.js} (100%) diff --git a/apps/waypoint_editor/ChangeLog b/apps/waypoint_editor/ChangeLog deleted file mode 100644 index 0f45b79cc..000000000 --- a/apps/waypoint_editor/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -0.01: New App! -0.02: Display waypoint name instead of its index in remove menu and fix icon -0.03: Use text input for waypoint names, allow marking waypoint with current GPS position diff --git a/apps/waypoint_editor/README.md b/apps/waypoint_editor/README.md deleted file mode 100644 index f9c603a84..000000000 --- a/apps/waypoint_editor/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Waypoints - -Simple waypoint editor. diff --git a/apps/waypoint_editor/app-icon.js b/apps/waypoint_editor/app-icon.js deleted file mode 100644 index 6ab351afa..000000000 --- a/apps/waypoint_editor/app-icon.js +++ /dev/null @@ -1 +0,0 @@ -require("heatshrink").decompress(atob("mEwxH+AH4A/AA0QF1wABF94xrFwgvV63W5/PF1AsBAAQvBAAQviFggvHGRXWFwvWFigvKGQgPCFwwvMFxQvL54PDF9wuHF8wuIF7/OAYguFF7mBrtdFQWAvWA5+qvV6FxIvXrwfCGAQqBvXP0guLF6XV1awCmggCmgvB1Wk1QEBRpQvTJ4OAAgM6F4oAEFwulF66zBvXV62sMAM0M4IuKOYOlwGrF6nP0oXD54tGRpDLCO4TvXDwIAHXhB3BSQYvfdZPVSQIvsUILWBF8xeEX4OkF8wQFd7mlDgPP52q5wvDAYISF1elBAYvWwBNB54DBGYIAEO5YvSFAInB1asBQAQzBF5HQxGsF64rBvWlX4fO0nOSQgvD6E0TANeL65XCd4ySFCYWCe4ZhDF6GIxHQ6vVGgQAESQfOTwQvZnQWBmgXDF4qSC5+kGYOr62sR4U0R6WsI4eCF5AzETwYYBwWC6AvlX4gAIR553DR5Ivhd4OCFwYvpAAwv/F7wMBF6ouLF5APHF54sMF44SNF5IsPF4gUSGQQXVAH4A/AH4A/ADY")) diff --git a/apps/waypoint_editor/app.png b/apps/waypoint_editor/app.png deleted file mode 100644 index e97f1bb7b308f6b2549f828e8495b3bef1b6ede5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11143 zcmeHtXIPWlwr=RX7wH6$CWKxiy>}u_x=`w&prQkc=C}s=R4jp<~zrjU%vSy24bX5LCQi3001a-bu>({ z|HUre#Dv)Eb=<>f0DwLrz|0b3;@}HJc_Ez;Zg3#R9|Z@({SZz7fZzB?`gI>R`Si%? zs#q)BCM(Ky`I_7IXF-=}3N#)IdS7p@wRCiXYqgy$vfSxE`*hB+qkN)UYDH&STEF0S zNN3~LvQsp^WZc@Cm9W2mN;g$;a4wpYF(9hI8Hv0;dSZY6t^Sy8#($+rf11K<>G;jT zk!IZ1!H?+hlSYZ>I$NKvLIR0M&kj49@pheUWa_M2raL|ltQ~#U4L)Nzjs3A!9eQ-G zwrk;-J#$JaVi|HglS6=iO2LPj!VhVrK0RFyF*(TU=(Zr~shEYe+N2(e3*~H0B9+d$ z1i6%RSd|V~`cDpz`UdQdzV7&{pw&-;v-$@fw+2nkYO}NuT7?c+jbzs3eEE?^f(ViQ zQI&dpkBo?mYX4=w@mJ(*aJ_Ou&aINEx3+yoR}UVS%NtwYi}R@8yf?A$-SCz+f4XIR z^>p`Zh=uyMcLOT$WYFoWIeiz0NWDeA6^fu$@|BNQshq;ub9ld*Jdwdok`5$JQt`4Cof`M>?LeuAE4%`uX|~x z{gn@la+v+0TP?K49!4$h>nJXAA1A|3N93waljwVzZoLpNp1CoS++@b&dz|?ZlNz7= zh^xn@;HLdra;OqvjgAKCW395wCCN{TE3YZ@THGr6U@KmjVyY|s;v>38yf_p67Pr-2 zErvJMRvf{otPW42#Hvfa zaj$dNW2bDmh2+F~UqxkGOzL$j?-wI=6Dh;@u5L8-l{apL2)v*(QdpTcHB#Kz9e5_c zQ}ClWM|mLqxF@~!@o?mVr0b-0Z#T6O>OqR6#9}_roF;Q_ZnKxu)3_nlLL>Pa!?cGA zPYv|md-XCg$4?w$CY?81;G6nW2JxXn$TJ?aR_QUngmX&6G;DLJ>6F`5-%Zk8OjiAt zI>89xcp{n4MvG6uSp34zigo z<9$=5|D$N0Fa%bThFj}%dxPHF%0Irkqd5gQPhNuJT@csaxdQ~UOw!>FFBh+ftb2X8 zq+hj7rnzFp;jk|iV^UA^MSZ8MC``h=><3{=p2c$6)lyaoyW_Xndry7u`+241KW!@Q zs-H}c7M#870dWs}Vasy+@^eb!VjiXeX0Im;o=-cHUd!KFw2sC#`4M`jAaVQ%5ky6z ziiXNGu5uA39GZAU+p{hhLTegNl@ZL1;`;C4Y!lfeZ4>3bbHdKO^1||&8%#b&d7@!{ z5y5-GIlFl*9UCF%0LZd;Wv-xDb4ZJd%{@~mfjcR>C+-o7IJ`>u|q zFE|)vfsxq$h>VN3c(id}tjEM17#tLI2VXJetI_g8+qbhM1P+m&@^{_=S5cSqr5bG}l}E5{W)a}l+y`2lgnvmw zdYocz9U`c;@oyCiF-CT&G-q4yV?s9P*bO0%v?)ezE&y2kCjuWf%&9^7mTxP0H#^%7 zZc@yCUHia|N%1nQ$77V*tr?}`aZH)2Sb53M)?|h#q$ndPGQilUU%kFxbXm%DPY_5h zNK(_$pQpbVj@x9;Bi`bCcxtBqJ%!=Y6~NkrJ+&0v1D(}4T&vb%R}^}i=ir!vj9qWr zsyZt$#4y8udR}Wli-dSpz^@%oyq0FnXoi}OhwcgM=0>2a|AtDtpM~ULczr$>-pqq+ z5uT{mpO{IE0eaoBWw11g1NQnrsSX40+w`z_#_VNQBDcV5LVm~@`Qlr<#Z8j}u|-P5 zhK-cB{ODY(=3+n>Sc&6+--8H<{(K0A9TW(ro zY+hQ3tD^_G=DZ|@S$Iecc$rInlGpZ*VVG)lB!HH@#3_#A8tEr4w98_dQ-(%el$Ao$ zdsyvL=VF{~u#P@A&I-SqxO4T}F1=zMOr|AU zQALb0lMhXbC|TC<5$taLh~76ONUh9E6CTzWWo6*EV-?(VGtc+G8#MFO!l$oIuKq@f zOZcYl74t_D&Dk`~Y3TubS|lFkPr;E&Rxx=brMaO-^fsGwGX(KWAT!~wj(RyyHr4m) zD-z%?yn9q(9$Tmu4f>5Oo>;#J`T|YDFp{`u$wv>1Zak-nNWSjX$8q!{>diXO9x-a9 z7WE9TqJ&18@yiRAh!rEe&_U`UM@hX?VjFSdldP7!a#ZJF}t1t&f>&9@cYf>3uXJVxVOG`e`VUxuucTqIz zQx)Lb$h)xGMR0gX9T$H?xk%FPPzYVDBOz~o;zqKa`a4S$OJfshn9}Af?+2Uypf4O! z#V=%s!cjwo4!!r9Q$o03aCp?;Gs;jYs``DwonTjDa*gIvtVV{Td`sq!y3CY2u z4L+L!13Dpmwkp6C`&;gp$0M^N8)?Z3B9o1>0WUq#3EON?)s4v;hQirLjyA6B(~~qa z-7&!^4%^KV+*=PC)Ef=}d-;d2&5i(ja)K`Noh)4;tTGmp4 zE+1!RZLGuG0zNkP9@vt)DjLUJdzlps%9*a&^&Tm!4e1DkN`^1E zq`845X~j%E%q-Vv8Pz2}%Z>5Y*D3|8EwR42Pg;S8Yw$(EXJ-c&6ooq8IH@irtN<_-;H7VRAtlt&4#(_v$a zMMJ(H_7Ds;AgWZ@=lz8OuP&ME(nGWjfLqm1qep7Siq6!Js_fR8Ig(G?=LAygZ$036 zMhE8z*5>9pYxg1S7<%0_*nip6-CbJq)11)UN3lAQFn1RK={+WNbT52t27g#KJi#m1 z?pd+P+fqpNWHi}L3d@$*_dXA97;!$-$?l1{t42YH%ER=1#8JQh&XQGJS}*z$xXE-| zOj{=^Ms}V`Sqc1-^VoC7h+N&1|Df%Z>iXQFcbA{3q3g0=*t=m6L`UwyCYYIbP{w^X z8KO48S0a$e(J8we)Xc@nol81cM>5B#aCIsQvPTu`JM;+V6WkX!*pAm(pRq?7h+?2ZR%yJ&9(p{3tSvY?mOYG|=YPVq#^wq~mQya5>H{cd%re;<%+v#RORVs#d4zIQ4xC zlL7~EVjrQ(7^R1nKe?*igFO>}yg^61;@57S-%`D@Hn-BmO4wf$^gbpHGGk{Q)!%SQ z8Coc0;X&F%7+eQqsJ>m&;I3kOu8@C@%b-{j`eytPq9c?#) zI)I>;=F;t=(VA(1`}AuINXOJxSd8^0wSx?9DNNn_RJslOT@-syfNIge+MEEszC-fH zQ)#BUvJsR@uGt4GpW2)8hxm_Qs~vSdye%E@Y^8+=IPY7W`Hk5S62n<->>ch|t}tWF zxSS1W?RVW4$5pxq#&jg{6mBrr*smrRc;X{TeS8L=Nbx0el-sN657-2=7o@L8m|wjg z*m}yRl3M){-Tmr$|7_CRf~YH}MBm|Tp#v#W@-l5)WBj_>(M5L7lJxPe-hFHb%wmz9 zO+E249~G?gUk#Tykl^;t7vU@@YuR#~U%A!Ox3M88-3zEQpG&Smc-yKLlD_)*c>YTV zdz(&HPdi11<=j_M_?>UTLHCSGJG_?!b)!bf!igeWc;;ECANe|aruFN(jmR`cb$=Wz z@)Q2J?&>cS^H!NdBgC3%w>=J(r>nqu^a+jz&kyN#-tj|FE7tAco(j&zUBj8UWy6ff zZ^La2_^el;(r_CTivCD`DgJ%#6$}5Wry{rwscU9x>RkcZD&BX>y2Ao&30B)|NZv%? z0VE!5b(TOF3Lo&fgIy}4IybFm*i@&o=nbB=-m5DPrS(q5Rg!S%>Uq$RBefAGd%x_U zhi=D1kL~Pfi7Pc#aa=@KAe*AQCrW+Il2VQ2vQ3JOIBPa-D-tJ(a&32)dMymdZ)|-j zBhj%uzA-o8S+=NH0Z zDza97nyuM>#l0Jwqa?IqdvAkAn2n;)5P3;T+RcOF%QB`-c7eIwYs(w@VC*K@ETlH_ zDOfQ4(n&D!P*|u%0e`7Lz_sqTU2j1gE8h*p#kCV^hYHzV(4^osk@Z=uzEw*U;0&0( zO@!NdkM}7Jqbf%3?iJ#RYeHsIZf+T`09?dw>En{#!rr6QkVuV%Qgak7(C}t|#Bp@z zZM>k${rg2moY33lZRS}@9Z>XI%9pZdE&;Khl5r+2^{?@N2ETmSZD75*N0ygq!3<6i z1_$k15!DH>iD{&p6yC`ROUpa(j`dnKufnAzr7faZ2V`B}Jy^DgzwfW?-B39}!_P$> zep4J!D-j<TSz_2*Ij@%6748${(Olu_phfR2QY zUBg6s7gMR!iu#a8p+?PF)#&Betq;~mcx20;@iIzZtlfXMQcxY2dHD{XM=XPVxrWLy>CQcG~mPISH&Mme5#?&6px20KUnR#SE z+;+b;x1QGG3w$lDEh556R5&aB*zqaiQ|00yj)o{SXG1#O zRB^fKz*lbx$uPPry->cBmWacy72c1^JU z?P$cX)@W1p;$S;JF;o}j3sP^v4H|qi##*~My-Xj(QRiUkJ9N6 zsM@JbF2PQe>7F=O8ef53LyENYoo!VkJZJ>Px7k!*8*|l7B};G5CZ2=h4v){77F*%K zSfun$D7RbwH^|_GI{<(aiBMOE=&Gy#<6shd9GMxMq^R>+h3(A^Q+>@cN=6#b9teA9 zM9JNJizmbkYR?DDZoe(OF<8Kb@bsj&C8G=xwqUo-^!7$E;I~szU%$k!c}ehFsO}TZ zc%tr8Ki@6SeM;(8-XbgZxv-+^{V)Z-BFU$Y+YBMQxtuuhz5No4mj!VKzIjt|-q^}h z=sTXw$+vlDO}-t|S<^2j)XCcUA%o%ej*@2@11$9*)33jPj8@sp&hsz?MY9QDr3 zD_hP$cyYoK0ksg5p2eQdl&z$Q7T8(HBRxm;%txE}LmdR3RtTfB7O7_~J83W9g+MfE zc+IE_&H3M`J=lYCoT+w;Ch2osr-^4H6Hvdse$akC<6CFp;niVC`X;O`&OMYIuiY;9 zTFu55biyMOaOOOthdk`_zPXsZYpoy0hSNOJ_QqS^bT6!r{pQTu`-WplCsL8Nlzz(j z$X-Bjoyw>52^%zLF_lVegWe>7D7sB2yZV#j)R(cTiB{+I(^G&>nAby5dr1%gKoy6; zo)lXe8i1ilcM%5|(h)A==Z?ajBm)2n%6=#Zs4E-;bc8!2JQTUN8e6%62$&-Gb!kH} zLzFt)1)&q*1vd>aGJ^)VLgiuH%1WdPeqbztI~?Nx^mBLfK!g1hxqtG4v7axxMY(}L zAsAOhZc9T5P#x(72TF-ZiHLzT{SZD9+)AWC1uvKr*hE9?4+?Bck=q4>L4id@eSLjJ zd?iJYUe2Q8^78VcViKYf5+E!Bg!cEqIQW4)&^#9uzc@7DXs8zgg+U-afESz&j!18e zA~!d79QX%0b`+}Vhwc2s!A1KgJsJZO)x|cXu=BwJL?y(;>b+3mKge?x>#@7wF%SFzBB+l((1LPYety z3U`CMV*^2BnZ^Hx#~_^kTA;tp=VIi)1%h?=C;#8j|Iq7aEI)MxYapTC7fy9G6uB?r z1;da~1PuK1qm!ef7*x(l3M3^d>j091JHSBlV$$Lun2a>kQBuy)NnR5A8K-dcmBqb*;0dj;(OM|2x9VO)@upvo_N&lp}SO>5wL|2hp zLPYGZ9*CO*#tG@=uE=eG@bLEgYrqWQ4mZU(T!zeFVC-bD!a7{k2A26}KXxu)buYLB z2I*ynM7k+*U&IQ$p!``epK7wP3{>}BkD3l7EnYo31w{*%cByVs#HUjDlO!=(NXoWiek)xp{# zz5IXkZwmMP)%vv|xgmZ^1qA-w1i%i^U-F|JeBiL3OMun!*AUdj!NVDj-EIFUwSV*@ z{z)2($;iRPVK8|R6y_ial5&uC0?EnCI)db+BpoDRvT&%lxYXa-(MTtZuY(s{)ft-u z*mcI1*3WeY3jEAI!M~$@UEtUp5fT#zi-~dnT3(=n=*5QmkLf8~Y&nL8;NJyMxY&}w zx)+&e>WxCVA>dwr7v>*{@_)hoX8%W0{!iw=!+u$-BT@d?qIJO-`+EFK_x}X=i@^W^ z#h#ZV|5fO}Lw?Ef+kFQc^RGVa{S1416#eu5_(xh?RL=k6>yLE%U-W>b{*RM?OW*&< z^&h$ZEd~B9@PD%FKXUzB3jAB(|76$yH@QgvdcuZ#V87`3VxON2YBQa&&)$TN`q~#BqUU8)GTLe6GZ}l&8Tq8c!|$f?J;jj6giU$DaMCMDR6lDtzhN`j z(-VH#toHq$XgndOq1MA|;iEs+dl;8QogB z$x6q9h(8m&K{&5h|C&{7+C7>xeho$zw|#!8@S!lyOSrLlLxa?6=8c8J<19s|M!+iv zU(?-)h!8qcf2qR~5r*ALG!K76!8vSbj?GYCIvT4#A|_103D zW<}WGn*8}H!Rn@*UmJsl)Y@xYs+sf^4bmw2U~VrTJ!5;W4b8-F_zE#1-$@_t`Xi-R zV4Vb71#^K!pPcF*WP+2Uj%1o1lgvGej54dtTMrp{#zVZl`!W?DkIT_}R}^A9Pj2i3Cf$@?|sv8YrUkeUn^Iw(A;OkN9whoC>!e!#~=)!aO(Ezwto4>pASA zS62aFE4$j&4G)626gZNe+azz{DOLJQ(r!ClCimZAR$3eCn9Kw8+MleIfq_Oa6I z7&g+Kn--2ao^{%=dTspNR|hg6kOOV9o7-6C$BNcj^r*--pxCuPv);o=GwK!_jup*8 zRfk$M`QaF@XmbmtAyG17CXT}DUXKo?X12RKskVMPH9I@K(hKrvQw@vb8v|k_f-LmG z3%ToB8n`(eALP%h`31|{m3w4839hlEq~^>QjrS$PN~Wf9E*EWpS*_H%^RHSKttus4G@;+XCO`DE>Ce;_p^&ZUMU@ zY_P&u*7u}_S5|>5pqNWjMN0kcJs?pp=l~wx!4_#HS^HKU(B?4WfA%$|YK^WTi^CaL zjTf8)EFr7pecr|5OPpNuMb1z0g!Ot%q#ouJz~|jceXg+(e7hL18`b=Da9;LWVfP^J z2a4TkU!Pi>=ED*tlj7zR4W17|3HK(?0r+}XxQ%|`shvcT^58$2KB}fR3}H32)-v!( l7&n(EY?V3I#68a&3+tPe|8oT2HbTy4M%GGX0{1*0) { - n++; - draw(); - } else { - n = 0; - draw(); - } -}); - -// First draw... -draw(); - -// Load widgets -Bangle.loadWidgets(); -Bangle.drawWidgets(); diff --git a/apps/waypoints/metadata.json b/apps/waypoints/metadata.json index d7fa00f7e..db5b2e627 100644 --- a/apps/waypoints/metadata.json +++ b/apps/waypoints/metadata.json @@ -1,7 +1,7 @@ { "id": "waypoints", "name": "Waypoints", - "version":"0.01", - "description": "Provides 'waypoints.json' used by various navigation apps, as well as a way to edit it from the App Loader with maps or a list", + "version":"0.02", + "description": "Provides 'waypoints.json' used by various navigation apps, as well as a way to edit it from the App Loader or from the device", "icon": "app.png", "tags": "tool,outdoors,gps", "type": "waypoints", @@ -9,6 +9,8 @@ "readme": "README.md", "interface": "interface.html", "storage": [ + {"name":"waypoints.app.js","url":"waypoints.app.js"}, + {"name":"waypoints.img","url":"app-icon.js","evaluate":true}, {"name":"waypoints","url":"lib.js"} ], "data": [ diff --git a/apps/waypoint_editor/app.js b/apps/waypoints/waypoints.app.js similarity index 100% rename from apps/waypoint_editor/app.js rename to apps/waypoints/waypoints.app.js