This commit is contained in:
Fred Boniface 2023-05-08 20:40:31 +01:00
parent 326b9a4f7a
commit 16ba0e20a0
2 changed files with 132 additions and 8 deletions

View File

@ -105,12 +105,48 @@ pis:
stops: [wsb,fro,bru,clc,tau,tvp,exd] stops: [wsb,fro,bru,clc,tau,tvp,exd]
- code: 5053 - code: 5053
stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn] stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn]
- code: 5054
stops: [bri,srd,mtp,rda,cfn,sml,shh,avn]
- code: 5055 - code: 5055
stops: [bri,lwh,srd,fit,bpw] stops: [bri,lwh,srd,fit,bpw]
- code: 5056
stops: [bri,fit,pwy,stj,nwp,cdf]
- code: 5057
stops: [bri,lwh,srd,fit,pwy,stj,nwp,cdf]
- code: 5058
stops: [bri,lwh,srd,fit,stj,nwp,cdf]
- code: 5059 - code: 5059
stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,svb] stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,svb]
- code: 5060 - code: 5060
stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb] stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
- code: 5061
stops: [bri,lwh,srd,mtp,rda,cfn,shh,avn,sar,svb]
- code: 5062
stops: [exd,tvp,tau,bwt,hig,wsm,wor,yat,nls,bri,lwh,srd,mtp,rda,cfn,sml,shh,avn]
- code: 5063
stops: [exd,tvp,tau,bwt,hig,wsm,wnm,wor,yat,nls,bri]
- code: 5064
stops: [exd,tvp,tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bmt,bri]
- code: 5065
stops: [exd,tvp,tau,wsm,bri]
- code: 5066
stops: [exd,tvp,tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,fit,bpw]
- code: 5067
stops: [exd,tvp,tau,bwt,hig,wsm,wor,yat,nls,bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
- code: 5068
stops: [pgn,tqy,nta,tgm,dwl,dww,exd,tau,bri]
- code: 5069
stops: [pgn,tqy,trr,nta,tgm,dww,exd,tvp,tau,bwt,hig,wsm,wor,yat,nls,bri]
- code: 5070
stops: [pnz,ser,hyl,cbn,red,tru,sau,par,los,bod,lsk,sgm,sts,ply,ivy,tot,nta,tgm,dwl,exd,tau,bwt,hig,wsm,wor,yat,nls,bri]
- code: 5071
stops: [pnz,ser,hyl,cbn,red,tru,sau,par,los,bod,lsk,men,sgm,sts,sbf,key,doc,dvp,ply,ivy,tot,nta,swl,exd,tvp,tau,bwt,hig,wsm,wor,yat,nls,bri,fit,pwy,stj,nwp,cdf]
- code: 5072
stops: [pnz,ser,hyl,cbn,red,tru,sau,par,los,bod,lsk,sgm,sts,ply,ivy,tot,nta,exd,tvo,tau]
- code: 5073
stops: [tau,bwt,hig,wsm,wnm,wor,yat,nls,bmt,bri]
- code: 5074
stops: [tau,bwt,hig,wsm,wnm,wor,yat,nls,bri]
- code: 5075 - code: 5075
stops: [tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bwt,bri] stops: [tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bwt,bri]
- code: 5076 - code: 5076
@ -125,6 +161,8 @@ pis:
stops: [tau,bwt,hig,wsm,wor,yat,nls,bri,lwh,srd,fit,bpw] stops: [tau,bwt,hig,wsm,wor,yat,nls,bri,lwh,srd,fit,bpw]
- code: 5081 - code: 5081
stops: [tau,bwt,hig,wsm,wor,yat,nls,psn,bri,lwh,srd,fit,bpw] stops: [tau,bwt,hig,wsm,wor,yat,nls,psn,bri,lwh,srd,fit,bpw]
- code: 5082
stops: [tau,bwt,hig,wsm,wnm,wor,yat,nls,bmt,bri]
- code: 5092 - code: 5092
stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri] stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri]
- code: 5101 - code: 5101
@ -319,8 +357,38 @@ pis:
stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw] stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw]
- code: 5198 - code: 5198
stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit,stj,nwp,cdf] stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit,stj,nwp,cdf]
- code: 5199
stops: [cpm,mlk,tro,wsb]
- code: 5200 - code: 5200
stops: [gcr,cnm] stops: [gcr,cnm]
- code: 5201
stops: [cnm,gcr,shu,std,kem,swi]
- code: 5202
stops: [cnm,gcr,shu,std,kem,swi,cpm,mlk,tro,wsb,dmh,wmn,sal,rom,sou]
- code: 5203
stops: [cnm,gcr,shu,std,kem,swi,cpm,mlk,tro,wsb]
- code: 5204
stops: [gcr,shu,std,kem,swi]
- code: 5205
stops: [gcr,shu,std,kem,swi,cpm,mlk,tro,wsb,dmh,wmn,sal,rom,sou]
- code: 5206
stops: [swi,cpm,mlk,tro,wsb,fro]
- code: 5207
stops: [swi,cpm,mlk,tro,wsb,dmh,wmn]
- code: 5208
stops: [swi,cpm,mlk,tro,wsb]
- code: 5209
stops: [fro,wsb,tro,mlk,cpm,swi]
- code: 5210
stops: [swi,kem,std,shu,gcr,cnm]
- code: 5211
stops: [swi,kem,std,shu,gcr]
- code: 5212
stops: [wsb,tro,mlk,cpm]
- code: 5213
stops: [wsb,tro,mlk,cpm,swi,kem,std,shu,gcr,cnm]
- code: 5214
stops: [wsb,tro,mlk,cpm,swi]
- code: 5215 - code: 5215
stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey] stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]
- code: 5223 - code: 5223
@ -359,6 +427,8 @@ pis:
stops: [bri,wsm,tau,tvp,exd,ext,dwl,tgm,nta,tot,ivy,ply,lsk,bod,par,sau,tru,red,cbn,hyl,ser,pnz] stops: [bri,wsm,tau,tvp,exd,ext,dwl,tgm,nta,tot,ivy,ply,lsk,bod,par,sau,tru,red,cbn,hyl,ser,pnz]
- code: 5443 - code: 5443
stops: [bpw,fit,srd,lwh,bri,kyn,olf,bth,ffd,boa,tro,wsb,dmh,wmn] stops: [bpw,fit,srd,lwh,bri,kyn,olf,bth,ffd,boa,tro,wsb,dmh,wmn]
- code: 5444
stops: [cmn,gcr,shu,std,kem,swi]
- code: 5446 - code: 5446
stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh] stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
- code: 5447 - code: 5447
@ -467,6 +537,8 @@ pis:
stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau] stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau]
- code: 5556 - code: 5556
stops: [wsb,tro,boa,ffd,bth,olf,kyn,bri,lwh,srd,fit,bpw] stops: [wsb,tro,boa,ffd,bth,olf,kyn,bri,lwh,srd,fit,bpw]
- code: 5557
stops: [wsb,tro,mlk,cpm,swi,kem,std,shu,gcr,cnm]
- code: 5558 - code: 5558
stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit] stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit]
- code: 5559 - code: 5559
@ -513,6 +585,8 @@ pis:
stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd] stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
- code: 5613 - code: 5613
stops: [wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm] stops: [wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm]
- code: 5614
stops: [wmn,dmh,wsb,tro,mlk,cpm,swi]
- code: 5617 - code: 5617
stops: [bri,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd] stops: [bri,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
- code: 5618 - code: 5618
@ -613,6 +687,8 @@ pis:
stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,bri,fit,nwp,cdf] stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,bri,fit,nwp,cdf]
- code: 5752 - code: 5752
stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,olf,kyn,bri,fit,nwp,cdf] stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,olf,kyn,bri,fit,nwp,cdf]
- code: 5754
stops: [swi,cpm,mlk,tro,wsb,dmh,wmn,sal,rom,sou]
- code: 5255 - code: 5255
stops: [sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri] stops: [sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
- code: 5761 - code: 5761
@ -705,6 +781,8 @@ pis:
stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,old,kyn,bri,lwh,srd,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv] stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,old,kyn,bri,lwh,srd,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv]
- code: 5798 - code: 5798
stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,bri,fit,nwp,cdf] stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,bri,fit,nwp,cdf]
- code: 5801
stops: [sal,wmn,wsb,tro,mlk,cpm,swi,kem,std,shu,gcr,cnm]
- code: 5804 - code: 5804
stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof] stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof]
- code: 5806 - code: 5806
@ -743,12 +821,38 @@ pis:
stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh] stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
- code: 5846 - code: 5846
stops: [btn,bri] ### Not in use, intermediate stops omitted stops: [btn,bri] ### Not in use, intermediate stops omitted
- code: 5847
stops: [wos,asc,cnm,gcr,cdu,yae,bpw,pwy,stj,nwp,cdf]
- code: 5848
stops: [wof,wos,asc,cnm,gcr,cdu,yae,bpw,pwy,stj,nwp,cdf]
- code: 5849 - code: 5849
stops: [gcr,cdu,yae,bpw] stops: [gcr,cdu,yae,bpw]
- code: 5850
stops: [gmv,mvl,wof,wos,asc,cnm,gcr,cdu,yae,bpw,pwy,stj,nwp,cdf]
- code: 5851 - code: 5851
stops: [bpw,yar,cdu,gcr] stops: [bpw,yar,cdu,gcr]
- code: 5852
stops: [cdf,nwp,stj,pwy,bpw,yae,cdu,gcr]
- code: 5853
stops: [cdf,nwp,stj,pwy,bpw,yae,cdu,gcr,cnm,asc,wos]
- code: 5854
stops: [cdf,nwp,stj,pwy,bpw,yae,cdu,gcr,cnm,asc,wos,wof]
- code: 5855
stops: [cdf,nwp,stj,pwy,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mlv,gmv]
- code: 5856
stops: [cdf,nwp,stj,pwy,bpw,yae,cdu,gcr,cnm]
- code: 5857
stops: [bpw,pwy,stj,nwp,cdf]
- code: 5858
stops: [gcr,cdu,yae,bpw,pwy,stj,nwp,cdf]
- code: 5859
stops: [cdf,nwp,stj,pil,pwy,bpw,yae,cdu,gcr]
- code: 5860 - code: 5860
stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh] stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
- code: 5861
stops: [gmv,mvl,wof,wos,asc,cnm,gcr,cdu,yae,bpw]
- code: 5862
stops: [cdf,nwp,stj,pwy,bpw,yae,cdu,gcr,cnm]
- code: 5863 - code: 5863
stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,bpw,pwy,stj,nwp,cdf] stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,bpw,pwy,stj,nwp,cdf]
- code: 5866 - code: 5866
@ -789,14 +893,24 @@ pis:
stops: [wsb,tro,boa,bth,olf,kyn,fit,bpw,stj,nwp,cdf] stops: [wsb,tro,boa,bth,olf,kyn,fit,bpw,stj,nwp,cdf]
- code: 5904 - code: 5904
stops: [cdf,nwp,stj,pwy,bpw,fit,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh] stops: [cdf,nwp,stj,pwy,bpw,fit,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
- code: 5905
stops: [bpw,yae,cdu,gcr,cnm,asc,wos,wof]
- code: 5906 - code: 5906
stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,fit,bpw,stj,nwp,cdf] stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,fit,bpw,stj,nwp,cdf]
- code: 5907
stops: [wos,asc,cnm,gcr,cdu,yae,bpw]
- code: 5908
stops: [bpw,yae,cdu,gcr,cnm]
- code: 5909
stops: [wof,wos,asc,cnm,gcr,cdu,yae,bpw]
- code: 5911 - code: 5911
stops: [wsb,tro,boa,avf,ffd,bth] stops: [wsb,tro,boa,avf,ffd,bth]
- code: 5912 - code: 5912
stops: [bth,ffd,boa,tro,wsb] stops: [bth,ffd,boa,tro,wsb]
- code: 5913 - code: 5913
stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,avf,ffd,bth,olf,kyn,fit,bpw,stj,nwp,cdf] stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,avf,ffd,bth,olf,kyn,fit,bpw,stj,nwp,cdf]
- code: 5915
stops: [cdf,nwp,bpw,yae,cdu,gcr,cnm,asc,wos,wof]
- code: 5917 - code: 5917
stops: [bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh] stops: [bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
- code: 5918 - code: 5918
@ -827,6 +941,16 @@ pis:
stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms] stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms]
- code: 5931 - code: 5931
stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,wmn,sal,wom,sou,soa,esl,hde,boe,frm,ftn,pms,pmh] stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,wmn,sal,wom,sou,soa,esl,hde,boe,frm,ftn,pms,pmh]
- code: 5932
stops: [wos,asc,cnm,gcr,cdu,yae,bpw,pwy,stj,nwp,cdf]
- code: 5933
stops: [cnm,gcr,cdu,yae,bpw]
- code: 5936
stops: [cdf,nwp,stj,pwy,bpw]
- code: 5937
stops: [cdf,nwp,stj,pwy,bpw,yae,cdu,gcr,cnm,asc,wos]
- code: 5938
stops: [gmv,mlv,wof,wos,asc,cnm,gcr,cdu,yae,bpw,stj,nwp,cdf]
- code: 5940 - code: 5940
stops: [bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn] stops: [bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn]
- code: 5941 - code: 5941
@ -881,10 +1005,8 @@ pis:
stops: [cdf,nwp,stj,bpw,fit,kyn,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh] stops: [cdf,nwp,stj,bpw,fit,kyn,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
- code: 5993 - code: 5993
stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,lwh,srd,fit,stj,nwp,cdf] stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,lwh,srd,fit,stj,nwp,cdf]
# - code: 5994 - code: 5994
# stops: [cdf,nwp,stj,pwy,bpw,fit,kwn,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh] -- ONE 5994 ENTRY IS ERRORNOUS stops: [bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
# - code: 5994
# stops: [bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh] -- ONE 5994 ENTRY IS ERRORNOUS
- code: 5995 - code: 5995
stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,lwh,srd,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv] stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,lwh,srd,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv]
- code: 5996 - code: 5996
@ -945,6 +1067,8 @@ pis:
stops: [avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm] stops: [avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
- code: 6070 - code: 6070
stops: [svb,sar,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri] stops: [svb,sar,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri]
- code: 6071
stops: [gcr,shu,std,kem,swi,cpm,mlk,tro,wsb,dmh,wmn]
- code: 6073 - code: 6073
stops: [wnm,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv] stops: [wnm,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv]
- code: 6074 - code: 6074
@ -1042,5 +1166,5 @@ pis:
- code: 9812 - code: 9812
stops: [hwv,hxx] stops: [hwv,hxx]
### Still to do: `North PNZ to CDF-WOS` ### Next Up: 5083 (North PNZ-CDF/WOS)
### Next Up: 5199 (CNM to SWI & WSB) ### Next Up: 5215 (GMV-WEY)

View File

@ -14,7 +14,7 @@
# program. If not, see # program. If not, see
# https://git.fjla.uk/OwlBoard/db-manager/src/branch/main/LICENSE # https://git.fjla.uk/OwlBoard/db-manager/src/branch/main/LICENSE
version = "2.1.2" version = "2.1.3"
print(f"main.py: Initialising db-manager v{version}") print(f"main.py: Initialising db-manager v{version}")
#Third Party Imports #Third Party Imports
@ -63,7 +63,7 @@ else:
# If older than 2 days then update # If older than 2 days then update
pisAge = int(time.time()) - mongo.metaCheckTime("pis") pisAge = int(time.time()) - mongo.metaCheckTime("pis")
log.out(f'main.py: PIS Data is {pisAge}s old', "INFO") log.out(f'main.py: PIS Data is {pisAge}s old', "INFO")
if pisAge > 172800: # Temporarily set to 15 minutes if pisAge > 43200: # Temporarily set to 15 minutes
log.out('main.py: Updating PIS data', "INFO") log.out('main.py: Updating PIS data', "INFO")
pisData = pis.load() pisData = pis.load()
pisParsed = pis.parse(pisData) pisParsed = pis.parse(pisData)