From 1a00a995d3b9a1b9aab6ba642267bba9ac96ce76 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Fri, 21 Apr 2023 15:32:43 +0100
Subject: [PATCH 01/23] Add PIS sample data

---
 data/pis/gwr-west.yaml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 data/pis/gwr-west.yaml

diff --git a/data/pis/gwr-west.yaml b/data/pis/gwr-west.yaml
new file mode 100644
index 0000000..387b006
--- /dev/null
+++ b/data/pis/gwr-west.yaml
@@ -0,0 +1,25 @@
+pis:
+  - code: 5001
+    stops: [avn,shh,sml,cfn,rda,mtp,srd,lwh,bri]
+  - code: 5047
+    stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri]
+  - code: 5053
+    stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn]
+  - code: 5055
+    stops: [bri,lwh,srd,fit,bpw]
+  - code: 5060
+    stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
+  - code: 5487
+    stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
+  - code: 5502
+    stops: [bri,lwh,srd,fit]
+  - code: 5513
+    stops: [cfn,rda,mtp,srd,lwh,bri]
+  - code: 5523
+    stops: [fit,srd,lwh,bri]
+  - code: 6067
+    stops: [avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 6070
+    stops: [svb,sar,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri]
+  - code: 6076
+    stops: [avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
\ No newline at end of file
-- 
2.34.1


From 0bc82d03f9ac3565f497ad46fff9d0f3061d6f6a Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Fri, 21 Apr 2023 16:05:15 +0100
Subject: [PATCH 02/23] Add PIS Parsing code

---
 requirements.txt |  2 ++
 src/main.py      | 19 +++++++++++++++----
 src/mongo.py     | 17 +++++++++++++++++
 src/pis.py       | 11 +++++++++++
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 src/pis.py

diff --git a/requirements.txt b/requirements.txt
index a838dd0..952ef5a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,8 @@ certifi==2022.12.7
 charset-normalizer==3.0.1
 dnspython==2.3.0
 idna==3.4
+pyaml==21.10.1
 pymongo==4.3.3
+PyYAML==6.0
 requests==2.28.2
 urllib3==1.26.14
diff --git a/src/main.py b/src/main.py
index 2db2003..3795e22 100644
--- a/src/main.py
+++ b/src/main.py
@@ -14,7 +14,7 @@
 #     program.  If not, see
 #     https://git.fjla.uk/OwlBoard/db-manager/src/branch/main/LICENSE
 
-version = "2.0.0-dev"
+version = "2.1.0-dev"
 print(f"main.py: Initialising db-manager v{version}")
 
 #Third Party Imports
@@ -22,7 +22,7 @@ import os
 import time
 
 #Local Imports
-import corpus, mongo
+import corpus, mongo, pis
 import logger as log
 
 log.out("main.py: db-manager Initialised", "INFO")
@@ -47,11 +47,22 @@ log.out(f'main.py: Stations is {stationsAge}s old', "INFO")
 # While the source of stations data is CORPUS, this statement is based on corpusAge, when/if changing the source, it should be changed to use stationsAge
 # if stationsAge is used now, there could be a situation where stationsAge tries to update but fails as corpusData doesn't exist.
 if corpusAge > 1036800:
-    log.out('main.py: Updating stations data until it is 1036800s old.', "INFO")
+    log.out('main.py: Updating stations data', "INFO")
     stationData = corpus.onlyStations(corpusData)
     mongo.putBulkStations(stationData)
 else:
-    log.out('main.py: Not updating stations data', "INFO")
+    log.out('main.py: Not updating stations data until it is 1036800s old.', "INFO")
+
+#Check & Update pis data:
+  # If older than 12 days then update
+pisAge = int(time.time()) - mongo.metaCheckTime("pis")
+log.out(f'main.py: PIS Data is {pisAge}s old', "INFO")
+if pisAge > 1036800:
+    log.out('main.py: Updating PIS data', "INFO")
+    pisData = pis.load()
+    mongo.putBulkPis(pisData)
+else:
+    log.out('main.py: Not updating PIS data until is it 1036800a old', "INFO")
 
 log.out('main.py: Requesting TTL Index Creation', "INFO")
 mongo.createTtlIndex("users", "atime", 2629800)
diff --git a/src/mongo.py b/src/mongo.py
index fda809c..b8b7421 100644
--- a/src/mongo.py
+++ b/src/mongo.py
@@ -88,6 +88,23 @@ def putBulkStations(data):
     metaUpdateTime(collection)
     return
 
+def putBulkPis(data):
+    collection = "pis"
+    startCount = getLength(collection)
+    col = db[collection]
+    incrementCounter(collection)
+    if startCount > 0:
+        log.out(f'mongo.putBulkPid: Dropping {startCount} pis documents', "INFO")
+        col.drop()
+    col.insert_many(data)
+    endCount = getLength(collection)
+    log.out(f'mongo.putBulkPis: {endCount} documents inserted', "INFO")
+    log.out(f'mongo.putBulkPis: {endCount-startCount} new documents', "INFO")
+    log.out('mongo.putBulkPis: Updating meta time', "INFO")
+    metaUpdateTime(collection)
+    return
+
+
 def incrementCounter(target):
     collection = "meta"
     col = db[collection]
diff --git a/src/pis.py b/src/pis.py
new file mode 100644
index 0000000..fbccf3d
--- /dev/null
+++ b/src/pis.py
@@ -0,0 +1,11 @@
+import yaml
+
+def load():
+    with open("../data/pis/gwr-west.yaml", "r") as data:
+        try:
+            pis = yaml.safe_load(data)
+            print(pis)
+            return pis["pis"]
+        except yaml.YAMLError as exc:
+            print(exc)
+            return exc
-- 
2.34.1


From 65febce05c01052ca91b20e736eb5a88ef2ef006 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Sat, 22 Apr 2023 22:26:23 +0100
Subject: [PATCH 03/23] Add notes

---
 data/pis/{gwr-west.yaml => gwr.yaml} | 0
 src/pis.py                           | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename data/pis/{gwr-west.yaml => gwr.yaml} (100%)

diff --git a/data/pis/gwr-west.yaml b/data/pis/gwr.yaml
similarity index 100%
rename from data/pis/gwr-west.yaml
rename to data/pis/gwr.yaml
diff --git a/src/pis.py b/src/pis.py
index fbccf3d..85d4f01 100644
--- a/src/pis.py
+++ b/src/pis.py
@@ -1,7 +1,7 @@
 import yaml
 
-def load():
-    with open("../data/pis/gwr-west.yaml", "r") as data:
+def load():  # Programatically add a `toc` field to each entry.
+    with open("../data/pis/gwr.yaml", "r") as data:
         try:
             pis = yaml.safe_load(data)
             print(pis)
-- 
2.34.1


From 6c0b016a9aaf017491fd248a870da6b6156c1b13 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Mon, 24 Apr 2023 12:07:21 +0100
Subject: [PATCH 04/23] Change PIS path

---
 Dockerfile | 1 +
 src/pis.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1fceb50..8e93c6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,4 +2,5 @@ FROM python:3.11-alpine
 COPY ./requirements.txt /app/requirements.txt
 RUN [ "pip", "install", "-r", "/app/requirements.txt" ]
 COPY ./src /app/src
+COPY ./data /app/data
 CMD [ "python", "/app/src/main.py" ]
\ No newline at end of file
diff --git a/src/pis.py b/src/pis.py
index 85d4f01..692d574 100644
--- a/src/pis.py
+++ b/src/pis.py
@@ -1,7 +1,7 @@
 import yaml
 
 def load():  # Programatically add a `toc` field to each entry.
-    with open("../data/pis/gwr.yaml", "r") as data:
+    with open("/app/data/pis/gwr.yaml", "r") as data:
         try:
             pis = yaml.safe_load(data)
             print(pis)
-- 
2.34.1


From 45baf8a1c3a90e362c1484016f583a9329a65f95 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Wed, 26 Apr 2023 10:56:02 +0100
Subject: [PATCH 05/23] Update PIS Codes

---
 data/pis/gwr.yaml | 14 ++++++++++++++
 src/main.py       |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index 387b006..3e14525 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -1,6 +1,12 @@
 pis:
   - code: 5001
     stops: [avn,shh,sml,cfn,rda,mtp,srd,lwh,bri]
+  - code: 5017
+    stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 5032
+    stops: [cdf,nwp,stj,pwy,fit,srd,lwh,bri]
+  - code: 5038
+    stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
   - code: 5047
     stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri]
   - code: 5053
@@ -9,6 +15,12 @@ pis:
     stops: [bri,lwh,srd,fit,bpw]
   - code: 5060
     stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
+  - code: 5092
+    stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri]
+  - code: 5215
+    stops: [bri,kyn,olf,bth,ffd,avn,boa,tro,wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]
+  - code: 5248
+    stops: [wey,upw,dcw,mdn,cno,yet,tho,yvp,clc,bru,fro,wsb,tro,boa,avn,ffd,bth,olf,kyn,bri]
   - code: 5487
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
   - code: 5502
@@ -17,6 +29,8 @@ pis:
     stops: [cfn,rda,mtp,srd,lwh,bri]
   - code: 5523
     stops: [fit,srd,lwh,bri]
+  - code: 5866
+    stops: [sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
   - code: 6067
     stops: [avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 6070
diff --git a/src/main.py b/src/main.py
index 3795e22..3ab992a 100644
--- a/src/main.py
+++ b/src/main.py
@@ -57,7 +57,7 @@ else:
   # If older than 12 days then update
 pisAge = int(time.time()) - mongo.metaCheckTime("pis")
 log.out(f'main.py: PIS Data is {pisAge}s old', "INFO")
-if pisAge > 1036800:
+if pisAge > 43200: # Temporarily set to one day
     log.out('main.py: Updating PIS data', "INFO")
     pisData = pis.load()
     mongo.putBulkPis(pisData)
-- 
2.34.1


From b6c31b85faaa9eb8afd355e4b054b9a71cd31678 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Wed, 26 Apr 2023 11:00:37 +0100
Subject: [PATCH 06/23] Add notes

---
 data/pis/gwr.yaml | 4 ++--
 src/pis.py        | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index 3e14525..5047d49 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -20,7 +20,7 @@ pis:
   - code: 5215
     stops: [bri,kyn,olf,bth,ffd,avn,boa,tro,wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]
   - code: 5248
-    stops: [wey,upw,dcw,mdn,cno,yet,tho,yvp,clc,bru,fro,wsb,tro,boa,avn,ffd,bth,olf,kyn,bri]
+    stops: [wey,upw,dcw,mdn,cno,yet,tho,yvp,clc,bru,fro,wsb,tro,boa,avn,ffd,bth,olf,kyn,bri] # [reverse,5215]
   - code: 5487
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
   - code: 5502
@@ -28,7 +28,7 @@ pis:
   - code: 5513
     stops: [cfn,rda,mtp,srd,lwh,bri]
   - code: 5523
-    stops: [fit,srd,lwh,bri]
+    stops: [fit,srd,lwh,bri] # [reverse,5513]
   - code: 5866
     stops: [sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
   - code: 6067
diff --git a/src/pis.py b/src/pis.py
index 692d574..26de545 100644
--- a/src/pis.py
+++ b/src/pis.py
@@ -9,3 +9,6 @@ def load():  # Programatically add a `toc` field to each entry.
         except yaml.YAMLError as exc:
             print(exc)
             return exc
+
+## Do some magic here so that if any pis["pis"]["stops"][0] field contains 'reverse' then get the stops for the code stored in pis["pis"]["stops"][1]
+## reverse the stops and store that.
\ No newline at end of file
-- 
2.34.1


From 1d7d8cf5584895c7bf162ccf19191a8f24d4de87 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Thu, 27 Apr 2023 10:46:45 +0100
Subject: [PATCH 07/23] Add PIS

---
 data/pis/gwr.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index 5047d49..de517ce 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -17,6 +17,16 @@ pis:
     stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
   - code: 5092
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri]
+  - code: 5124
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wnm,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5184
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,dmh,wsb,tro,boa,bth,bri,fit,stj,nwp,cdf]
+  - code: 5185
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,wsb,tro,boa,bth,bri,fit,pwy,stj,nwp,cdf]
+  - code: 5186
+    stops: [pmh,pms,ftn,frm,esl,soa,sou,rom,sal,wnm,dmh,wsb]
+  - code: 5187
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,dmh,wsb]
   - code: 5215
     stops: [bri,kyn,olf,bth,ffd,avn,boa,tro,wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]
   - code: 5248
@@ -29,6 +39,8 @@ pis:
     stops: [cfn,rda,mtp,srd,lwh,bri]
   - code: 5523
     stops: [fit,srd,lwh,bri] # [reverse,5513]
+  - code: 5533
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri]
   - code: 5866
     stops: [sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
   - code: 6067
-- 
2.34.1


From c091eae1d5446d94ee66aaee05a604c85af480e1 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Thu, 27 Apr 2023 13:06:54 +0100
Subject: [PATCH 08/23] Add PIS

---
 data/pis/gwr.yaml | 118 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 118 insertions(+)

diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index de517ce..83dfa92 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -1,24 +1,102 @@
 pis:
   - code: 5001
     stops: [avn,shh,sml,cfn,rda,mtp,srd,lwh,bri]
+  - code: 5002
+    stops: [avn,shh,sml,cfn,mtp,rda,srd,lwh,bri,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5003
+    stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5004
+    stops: [bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5005
+    stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5013
+    stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5014
+    stops: [bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5015
+    stops: [bri,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5016
+    stops: [bri,bmt,nls,yat,wor,wnm,wsm]
   - code: 5017
     stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 5018
+    stops: [bpw,fit,bri]
+  - code: 5019
+    stops: [bpw,fit,srd,bri]
+  - code: 5020
+    stops: [bpw,fit,srd,lwh,bri]
   - code: 5032
     stops: [cdf,nwp,stj,pwy,fit,srd,lwh,bri]
   - code: 5038
     stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
   - code: 5047
     stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri]
+  - code: 5052
+    stops: [wsb,fro,bru,clc,tau,tvp,exd]
   - code: 5053
     stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn]
   - code: 5055
     stops: [bri,lwh,srd,fit,bpw]
+  - code: 5059
+    stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,svb]
   - code: 5060
     stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
+  - code: 5075
+    stops: [tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bwt,bri]
+  - code: 5076
+    stops: [tau,bwt,hig,wsm,wor,yat,nls,bri]
+  - code: 5077
+    stops: [tau,bwt,hig,wsm,wor,yat,nls,psn,bmt,bri]
+  - code: 5078
+    stops: [tau,bmt,hig,wsm,wnm,wor,yat,nls,bri,lwh,srd,fit,bpw]
+  - code: 5079
+    stops: [tau,bmt,hig,wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,fit,bpw] # Check for LWH and SRD
+  - code: 5080
+    stops: [tau,bmt,hig,wsm,wor,yat,nls,bri,lwh,srd,fit,bpw]
+  - code: 5081
+    stops: [tau,bmt,hig,wsm,wor,yat,nls,psn,bri,lwh,srd,fit,bpw]
   - code: 5092
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri]
   - code: 5124
     stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wnm,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5128
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5129
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5130
+    stops: [cdf,nwp,stj,fit,bri,bth,ffd,avf,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5131
+    stops: [cdf,nwp,stj,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5132
+    stops: [cdf,nwp,stj,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5133
+    stops: [cdf,nwp,stj,fit,bri,bth,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5134
+    stops: [cdf,nwp,stj,fit,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5135
+    stops: [cdf,nwp,stj,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5136
+    stops: [cdf,nwp,stj,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5137
+    stops: [cdf,nwp,stj,pwy,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5164
+    stops: [fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,pwy,nwp,cdf]
+  - code: 5165
+    stops: [fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,pwy,stj,nwp,cdf]
+  - code: 5166
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wnm,dmh,wsb,tro,boa,bth,bri,fit,bpw]
+  - code: 5167
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wnm,dmh,wsb,tro,boa,bth,olf,kyn,bri,fit,bpw]
+  - code: 5168
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wnm,wsb,tro,boa,avf,ffd,bth,bri,fit,bpw]
+  - code: 5169
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wnm,wsb,tro,boa,bth,bri,fit,bpw]
+  - code: 5170
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wnm,wsb,tro,boa,bth,olf,kyn,bri,fit,bpw]
+  - code: 5171
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,dmh,wsb,tro,boa,bth,bri,fit,bpw]
+  - code: 5172
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,wsb,tro,boa,bth,bri,fit,bpw]
   - code: 5184
     stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,dmh,wsb,tro,boa,bth,bri,fit,stj,nwp,cdf]
   - code: 5185
@@ -27,12 +105,48 @@ pis:
     stops: [pmh,pms,ftn,frm,esl,soa,sou,rom,sal,wnm,dmh,wsb]
   - code: 5187
     stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,dmh,wsb]
+  - code: 5188
+    stops: [sal,wmn,dmh,wsb]
+  - code: 5196
+    stops: [wmn,dmh,wsb]
+  - code: 5200
+    stops: [gcr,cnm]
   - code: 5215
     stops: [bri,kyn,olf,bth,ffd,avn,boa,tro,wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]
+  - code: 5223
+    stops: [bpw,srd,lwh,bri,kyn,olf,bth,ffd,avn,boa,tro,wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]
+  - code: 5238
+    stops: [wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]
   - code: 5248
     stops: [wey,upw,dcw,mdn,cno,yet,tho,yvp,clc,bru,fro,wsb,tro,boa,avn,ffd,bth,olf,kyn,bri] # [reverse,5215]
+  - code: 5254
+    stops: [reverse,5248]
+  - code: 5225
+    stops: [gmv,mvl,wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri]
+  - code: 5226
+    stops: [gmv,mvl,wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,srd,lwh,bri]
+  - code: 5231
+    stops: [wos,asc,cnm,gcr,bpw,bri]
+  - code: 5232
+    stops: [wos,asc,cmn,gcr,cdu,yae,bpw,fit,bri]
+  - code: 5237
+    stops: [wsb,fro]
+  - code: 5240
+    stops: [bri,fit,bpw,yae,cdu,gcr,cnm]
+  - code: 5241
+    stops: [bri,fit,bpw,yae,cdu,gcr]
+  - code: 5242
+    stops: [bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos]
+  - code: 5256
+    stops: [wsb,tro,boa,bth]
+  - code: 5257
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
+  - code: 5258
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,bpw]
   - code: 5487
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
+  - code: 5499
+    stops: [bth,olf,kyn,bri,lwh,srd,fit]
   - code: 5502
     stops: [bri,lwh,srd,fit]
   - code: 5513
@@ -41,6 +155,10 @@ pis:
     stops: [fit,srd,lwh,bri] # [reverse,5513]
   - code: 5533
     stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri]
+  - code: 5542
+    stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5561
+    stops: [tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bmt,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
   - code: 5866
     stops: [sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
   - code: 6067
-- 
2.34.1


From 10e616c29df16460abc0ac6eaf31a260e3538afc Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Thu, 27 Apr 2023 13:07:42 +0100
Subject: [PATCH 09/23] Change PIS update time

---
 src/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.py b/src/main.py
index 3ab992a..4a40015 100644
--- a/src/main.py
+++ b/src/main.py
@@ -57,7 +57,7 @@ else:
   # If older than 12 days then update
 pisAge = int(time.time()) - mongo.metaCheckTime("pis")
 log.out(f'main.py: PIS Data is {pisAge}s old', "INFO")
-if pisAge > 43200: # Temporarily set to one day
+if pisAge > 3600: # Temporarily set to four hours
     log.out('main.py: Updating PIS data', "INFO")
     pisData = pis.load()
     mongo.putBulkPis(pisData)
-- 
2.34.1


From 633e3f4ac5cf7eab8c1979690afbe3d6378178b3 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Thu, 27 Apr 2023 13:27:43 +0100
Subject: [PATCH 10/23] Fox incorrect data

---
 data/pis/gwr.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index 83dfa92..d4a6853 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -48,13 +48,13 @@ pis:
   - code: 5077
     stops: [tau,bwt,hig,wsm,wor,yat,nls,psn,bmt,bri]
   - code: 5078
-    stops: [tau,bmt,hig,wsm,wnm,wor,yat,nls,bri,lwh,srd,fit,bpw]
+    stops: [tau,bwt,hig,wsm,wnm,wor,yat,nls,bri,lwh,srd,fit,bpw]
   - code: 5079
-    stops: [tau,bmt,hig,wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,fit,bpw] # Check for LWH and SRD
+    stops: [tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,fit,bpw] # Check for LWH and SRD
   - code: 5080
-    stops: [tau,bmt,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
-    stops: [tau,bmt,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: 5092
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri]
   - code: 5124
@@ -112,15 +112,15 @@ pis:
   - code: 5200
     stops: [gcr,cnm]
   - code: 5215
-    stops: [bri,kyn,olf,bth,ffd,avn,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
-    stops: [bpw,srd,lwh,bri,kyn,olf,bth,ffd,avn,boa,tro,wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]
+    stops: [bpw,srd,lwh,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]
   - code: 5238
     stops: [wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]
   - code: 5248
-    stops: [wey,upw,dcw,mdn,cno,yet,tho,yvp,clc,bru,fro,wsb,tro,boa,avn,ffd,bth,olf,kyn,bri] # [reverse,5215]
+    stops: [wey,upw,dcw,mdn,cno,yet,tho,yvp,clc,bru,fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri] # [reverse,5215]
   - code: 5254
-    stops: [reverse,5248]
+    stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]  # [reverse,5248]
   - code: 5225
     stops: [gmv,mvl,wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri]
   - code: 5226
-- 
2.34.1


From 55d99ec493aa1ae693336b2b6232fa2b8fedd234 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Fri, 28 Apr 2023 16:30:03 +0100
Subject: [PATCH 11/23] Additional Codes

---
 data/pis/gwr.yaml | 190 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 189 insertions(+), 1 deletion(-)

diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index d4a6853..e4dc686 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -9,6 +9,20 @@ pis:
     stops: [bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
   - code: 5005
     stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5006
+    stops: [bri,wsm,hig,bwt,tau,tvp,exd,ext,scs,dww,dwl,tgm,nta,tot,ivy,ply,lsk,bod,los,par,lux,bgl,roc,scr,qui,nqy]
+  - code: 5007
+    stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5008
+    stops: [bri,wsm,hig,bwt,tau,tvp,exd,ext,scs,dww,dwl,tgm,nta,tot,ivy,ply,dpt,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5009
+    stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,ext,dwl,tgm,nta,tot,ivy,ply,sts,sgm,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5010
+    stops: [bri,yat,wor,wsm,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ply,dpt,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5011
+    stops: [bri,wsm,hig,bwt,tau,tvp,exd,ext,sts,dww,dwl,tgm,nta,tot,ivy,ply]
+  - code: 5012
+    stops: [bri,bmt,nls,yat,wor,wsm,hig,bwt]
   - code: 5013
     stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
   - code: 5014
@@ -25,12 +39,68 @@ pis:
     stops: [bpw,fit,srd,bri]
   - code: 5020
     stops: [bpw,fit,srd,lwh,bri]
+  - code: 5021
+    stops: [bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5022
+    stops: [bpw,fit,bri,wsm,hig,bwt,tau,tvp,exd,tgm,tot,ivy,ply,dvp,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5023
+    stops: [bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5024
+    stops: [bpw,fit,bri,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5025
+    stops: [bpw,fit,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5026
+    stops: [bpw,fit,bri,psn,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5027
+    stops: [bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 5028
+    stops: [bpw,fit,srd,bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 5029
+    stops: [cnm,gcr,cdu,yae,bpw,fit,bri,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5030
+    stops: [cnm,gcr,cdu,yae,bpw,fit,bri,nls,yat,wor,wsm]
+  - code: 5031
+    stops: [cdf,nwp,stj,pwy,fit,bri]
   - code: 5032
     stops: [cdf,nwp,stj,pwy,fit,srd,lwh,bri]
+  - code: 5033
+    stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5034
+    stops: [cdf,nwp,stj,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5035
+    stops: [cdf,nwp,stj,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,exd,dww,dwl,tgm,nta,trr,tqy,pgn]
+  - code: 5036
+    stops: [cdf,nwp,stj,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,scs,dww,dwl,tgm,nta,tot,ivy,ply]
+  - code: 5037
+    stops: [cdf,nwp,stj,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply]
   - code: 5038
     stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5039
+    stops: [cdf,nwp,stj,pwy,fit,bri,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5040
+    stops: [cdf,nwp,stj,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5041
+    stops: [cdf,nwp,stj,pwy,fit,bri,psn,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5042
+    stops: [cdf,nwp,stj,pil,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5043
+    stops: [gcr,cdu,yae,bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5044
+    stops: [gcr,cdu,yae,bpw,fit,srd,lwh,bri,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5045
+    stops: [svb,avn,shh,sml,cfn,rda,mtp,srd,bri]
+  - code: 5046
+    stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,bri]
   - code: 5047
     stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri]
+  - code: 5048
+    stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5049
+    stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5050
+    stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5051
+    stops: [wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,nls,yat,wor,wnm,wsm]
   - code: 5052
     stops: [wsb,fro,bru,clc,tau,tvp,exd]
   - code: 5053
@@ -143,27 +213,145 @@ pis:
     stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
   - code: 5258
     stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,bpw]
+  - code: 5436
+    stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5437
+    stops: [bri,wsm,tau,tvp,exd,ext,dwl,tgm,nta,tot,ivy,ply,lsk,bod,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 5487
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
+  - code: 5488
+    stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5489
+    stops: [avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5490
+    stops: [bri,tau,tvp,exd]
+  - code: 5493
+    stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
   - code: 5499
     stops: [bth,olf,kyn,bri,lwh,srd,fit]
   - code: 5502
     stops: [bri,lwh,srd,fit]
+  - code: 5503
+    stops: [bpw,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5504
+    stops: [bpw,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,exd,dww,dwl,tgm,nta,trr,tqy,pgn]
+  - code: 5510
+    stops: [bpw,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply]
+  - code: 5511
+    stops: [bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
   - code: 5513
     stops: [cfn,rda,mtp,srd,lwh,bri]
   - code: 5523
     stops: [fit,srd,lwh,bri] # [reverse,5513]
+  - code: 5524
+    stops: [fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5526
+    stops: [fit,bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 5527
+    stops: [fit,srd,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 5533
     stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri]
   - code: 5542
     stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5559
+    stops: [cdf,nwp,bri]
+  - code: 5560
+    stops: [cdf,nwp,stj,pil,pwy,fit,bri,psn,nls,yat,wor,wsm,hig,bwt,tau]
   - code: 5561
     stops: [tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bmt,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
+  - code: 5564
+    stops: [bri,wsm,hig,bwt,tau,tvp,exd,ext,dww,dwl,tgm,nta,tot,ivy,ply,lsk,bod,los,par,lux,bgl,roc,scr,qui,nwq]
+  - code: 5570
+    stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5572
+    stops: [cdf,nwp,stj,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5573
+    stops: [gcr,cdu,yae,bpw,fit,srd,lwh,bri]
+  - code: 5587
+    stops: [bri,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5590
+    stops: [cnm,gcr,cdu,yae,bpw,fit,bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5608
+    stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5613
+    stops: [wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 5617
+    stops: [bri,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5619
+    stops: [bri,wsm,hig,bwt,tau,tvp,exd,ext,scs,dww,dwl,tgm,nta,tot,ivy,ply,dvp,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5620
+    stops: [bri,yat,wsm,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,dvp,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5621
+    stops: [bpw,fit,bri,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,dvp,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5642
+    stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5678
+    stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5681
+    stops: [wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5689
+    stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 5866
     stops: [sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
+  - code: 5700
+    stops: [bri,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5702
+    stops: [bri,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5708
+    stops: [bpw,fit,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 5709
+    stops: [cnm,gcr,cdu,yae,bpw,fit,bri,nls,yat,wor,wsm]
+  - code: 5710
+    stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5711
+    stops: [cdf,nwp,stj,pwy,fit,bri,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5712
+    stops: [cdf,nwp,stj,pil,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5715
+    stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply]
+  - code: 5716
+    stops: [cdf,nwp,stj,pwy,fit,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5722
+    stops: [exd,dwl,tgm,nta,trr,tqy,pgn]
+  - code: 5730
+    stops: [fit,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 5731
+    stops: [gcr,cdu,yae,bpw,fit,bri]
+  - code: 5761
+    stops: [svb,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri]
+  - code: 5767
+    stops: [wos,asc,cnm,gcr,bpw,fit,bri]
+  - code: 5768
+    stops: [wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5777
+    stops: [cnm,gcr,cdu,yae,bpw,fit,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 5807
+    stops: [gcr,cdu,yae,bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5812
+    stops: [bri,yat,bwt,tau,tvp,exd,dww,dwl,tgm,nta,tot,ivy,ply,dpt,doc,key,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5814
+    stops: [bri,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,dpt,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5815
+    stops: [cdf,nwp,stj,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5825
+    stops: [bri,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,dpt,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5877
+    stops: [bri,nls,yat,wor,wsm]
+  - code: 5885
+    stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply]
+  - code: 5886
+    stops: [bri,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,dpt,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5339
+    stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5948
+    stops: [bri,psn,nls,yat,wor,wsm,hig,bwt,tau]
   - code: 6067
     stops: [avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 6070
     stops: [svb,sar,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri]
   - code: 6076
-    stops: [avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
\ No newline at end of file
+    stops: [avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 6081
+    stops: [svb,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 6082
+    stops: [svb,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
-- 
2.34.1


From cae0bd869f9cb5b073013bb95e38cabae401a916 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Fri, 28 Apr 2023 16:30:36 +0100
Subject: [PATCH 12/23] Add note

---
 data/pis/gwr.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index e4dc686..addeeff 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -355,3 +355,4 @@ pis:
     stops: [svb,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 6082
     stops: [svb,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
+## 6088 is next
-- 
2.34.1


From 8cb685385d7eaf2e0891e1f2aaa3329b9f45f10b Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Wed, 3 May 2023 21:17:07 +0100
Subject: [PATCH 13/23] Add additional PIS

---
 data/pis/gwr.yaml | 178 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 177 insertions(+), 1 deletion(-)

diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index addeeff..9a6c179 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -127,8 +127,60 @@ pis:
     stops: [tau,bwt,hig,wsm,wor,yat,nls,psn,bri,lwh,srd,fit,bpw]
   - code: 5092
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri]
+  - code: 5101
+    stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro]
+  - code: 5102
+    stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5103
+    stops: [bpw,btn] # No longer used so intermediate stops omitted
+  - code: 5104
+    stops: [bpw,btn] # No longer used so intermediate stops omitted
+  - code: 5105
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5106
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5107
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5108
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5109
+    stops: [bpw,fit,bri,bth,ffd,avf,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5110
+    stops: [bpw,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5111
+    stops: [bpw,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5112
+    stops: [bpw,fit,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5113
+    stops: [bpw,fit,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5114
+    stops: [bpw,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5115
+    stops: [bpw,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5116
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,dmh,wmn]
+  - code: 5117
+    stops: [bpw,fit,srd,lwh,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,dmh,wmn]
+  - code: 5118
+    stops: [cnm,gcr,cdu,yae,bpw,fit,srd,lwh,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
+  - code: 5119
+    stops: [cdf,btn]  # No longer used so intermediate stops omitted
+  - code: 5120
+    stops: [cdf,btn]  # No longer used so intermediate stops omitted
+  - code: 5121
+    stops: [cdf,btn]  # No longer used so intermediate stops omitted
+  - code: 5122
+    stops: [cdf,nwp,stj,fit,bri]
+  - code: 5123
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
   - code: 5124
     stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wnm,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5125
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wnm,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5126
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,soa,esl,hde,boe,frm,ftn,pms,pmh]
+  - code: 5127
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftm,pms,pmh]
   - code: 5128
     stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5129
@@ -149,6 +201,32 @@ pis:
     stops: [cdf,nwp,stj,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
   - code: 5137
     stops: [cdf,nwp,stj,pwy,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5139
+    stops: [cdf,nwp,stj,pwy,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5140
+    stops: [cdf,nwp,stj,pwy,fit,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5141
+    stops: [cdf,nwp,stj,pwy,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5142
+    stops: [cdf,nwp,stj,pwy,fit,bri,bth,boa,tro,wsb,dmh,wmn]
+  - code: 5143
+    stops: [cdf,nwp,stj,pwy,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
+  - code: 5144
+    stops: [gmv,btn]  # No longer in use, intermittent stops omitted
+  - code: 5145
+    stops: [gmv,btn]  # No longer in use, intermittent stops omitted
+  - code: 5146
+    stops: [pmh,btn]  # No longer in use, intermittent stops omitted
+  - code: 5147
+    stops: [rom,btn]  # No longer in use, intermittent stops omitted
+  - code: 5148
+    stops: [wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5149
+    stops: [wsb,wmn,sal]
+  - code: 5150
+    stops: [wsb,dmh,wmn,sal,rom,sou]
+  - code: 5151
+    stops: [wsb,dmh,wmn]
   - code: 5164
     stops: [fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,pwy,nwp,cdf]
   - code: 5165
@@ -217,6 +295,22 @@ pis:
     stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
   - code: 5437
     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
+    stops: [bpw,fit,srd,lwh,bri,kyn,olf,bth,ffd,boa,tro,wsb,dmh,wmn]
+  - code: 5446
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5447
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5448
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5449
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5450
+    stops: [cdf,nwp,stj,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5451
+    stops: [cdf,nwp,stj,fir,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5452
+    stops: [cdf,nwp,stj,fir,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5487
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
   - code: 5488
@@ -225,6 +319,10 @@ pis:
     stops: [avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
   - code: 5490
     stops: [bri,tau,tvp,exd]
+  - code: 5491
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5492
+    stops: [cdf,nwp,stj,pwy,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5493
     stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
   - code: 5499
@@ -235,20 +333,48 @@ pis:
     stops: [bpw,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
   - code: 5504
     stops: [bpw,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,exd,dww,dwl,tgm,nta,trr,tqy,pgn]
+  - code: 5505
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5506
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5508
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,soa,esl,hde,boe,frm,ftn,pms,pmh]
+  - code: 5509
+    stops: [bpw,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
   - code: 5510
     stops: [bpw,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply]
   - code: 5511
     stops: [bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5512
+    stops: [bpw,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
   - code: 5513
     stops: [cfn,rda,mtp,srd,lwh,bri]
+  - code: 5514
+    stops: [cdf,nwp,stj,bpw,fit,bri]
+  - code: 5515
+    stops: [cdf,nwp,pwy,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5517
+    stops: [cdf,nwp,stj,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5518
+    stops: [cdf,nwp,stj,fit,bri,kwn,olf,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5519
+    stops: [cdf,nwp,stj,pwy,fit,bri,bth,ffd,avf,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5521
+    stops: [fit,kyn,olf,bth]
+  - code: 5522
+    stops: [fit,srd,bri]
   - code: 5523
     stops: [fit,srd,lwh,bri] # [reverse,5513]
   - code: 5524
     stops: [fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5525
+    stops: [fit,srd,lwh,bri,kyn,olf,bth,ffd,boa,tro,wsb,dmh,wmn]
   - code: 5526
     stops: [fit,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 5527
     stops: [fit,srd,bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 5528
+    stops: [fit,srd,lwh,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
   - code: 5533
     stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri]
   - code: 5542
@@ -263,20 +389,38 @@ pis:
     stops: [bri,wsm,hig,bwt,tau,tvp,exd,ext,dww,dwl,tgm,nta,tot,ivy,ply,lsk,bod,los,par,lux,bgl,roc,scr,qui,nwq]
   - code: 5570
     stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5571
+    stops: [bpw,fit,srd,lwh,bri,kyn,olf,bth,boa,tro,wsb]
   - code: 5572
     stops: [cdf,nwp,stj,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 5573
     stops: [gcr,cdu,yae,bpw,fit,srd,lwh,bri]
+  - code: 5574
+    stops: [gmv,mvl,wof,wos,asc,cnm,gcr,fit,bri]
   - code: 5587
     stops: [bri,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd]
   - code: 5590
     stops: [cnm,gcr,cdu,yae,bpw,fit,bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5591
+    stops: [cdf,btn] ### Not in use, intermediate stops omitted
+  - code: 5592
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5593
+    stops: [cdf,nwp,stj,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5601
+    stops: [fro,wsb,dmh,wmn,sal,rom,sou]
+  - code: 5602
+    stops: [gcr,cdu,yae,bpw,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro]
+  - code: 5603
+    stops: [gmv,btn] ### Not in use, intermediate stops omitted
   - code: 5608
     stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
   - code: 5613
     stops: [wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 5617
     stops: [bri,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5618
+    stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro]
   - code: 5619
     stops: [bri,wsm,hig,bwt,tau,tvp,exd,ext,scs,dww,dwl,tgm,nta,tot,ivy,ply,dvp,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 5620
@@ -355,4 +499,36 @@ pis:
     stops: [svb,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 6082
     stops: [svb,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
-## 6088 is next
+  - code: 6088
+    stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd,dwl,tgm,nta,tot,ivy,ply,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6093
+    stops: [cdf,nwp,stj,pil,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6095
+    stops: [cdf,nwp,stj,pil,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dww,dwl,tgm,nta,tot,ivy,ply,dvp,doc,key,sbf,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6097
+    stops: [cdf,nwp,stj,pwy,fit,bri,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6099
+    stops: [bri,wsm,hig,bwt,tau,tvp,exd,dww,dwl,tgm,nta,tot,ivy,ply,dvp,doc,key,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6101
+    stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,exd,dww,tgm,nta,tot,ivy,ply,dvp,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6103
+    stops: [cdf,nwl,stj,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dww,dwl,tgm,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6123
+    stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6125
+    stops: [cdf,nwl,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd,dww,tgm,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6134
+    stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dww,tgm,nta,tot,ivy,ply,dvp,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6136
+    stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd,dww,dwl,tgm,nta,tot,ivy,ply,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6137
+    stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd]
+  - code: 6139
+    stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd,dww,dwl,tgm,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6140
+    stops: [svb,sar,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd]
+  - code: 6141
+    stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd]
+
+### Still to do: `North PNZ to CDF-WOS`
+### Next Up: 5622
-- 
2.34.1


From ef7d2cd6361067892066106fa88566f4c851a50a Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Thu, 4 May 2023 09:28:28 +0100
Subject: [PATCH 14/23] PIS Updates

---
 data/pis/gwr.yaml | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index 9a6c179..324b3ad 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -427,6 +427,30 @@ pis:
     stops: [bri,yat,wsm,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,dvp,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 5621
     stops: [bpw,fit,bri,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,dvp,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5622
+    stops: [cdf,btn] ### Not in use, intermediate stops omitted
+  - code: 5623
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5624
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5627
+    stops: [cdf.nwp,stj,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5628
+    stops: [cdf.nwp,stj,pwy,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5631
+    stops: [gmv,mlv,wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri]
+  - code: 5636
+    stops: [pmh,btn] ### Not in use, intermediate stops omitted
+  - code: 5654
+    stops: [cdf,btn] ### Not in use, intermediate stops omitted
+  - code: 5655
+    stops: [cdf,nwp,pwy,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5656
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5657
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5659
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5642
     stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
   - code: 5678
@@ -529,6 +553,14 @@ pis:
     stops: [svb,sar,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd]
   - code: 6141
     stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd]
+  - code: 9801
+    stops: [pad,hxx,hwv]
+  - code: 9802
+    stops: [hxx,hwv]
+  - code: 9811
+    stops: [hwv,hxx,pad]
+  - code: 9812
+    stops: [hwv,hxx]
 
 ### Still to do: `North PNZ to CDF-WOS`
-### Next Up: 5622
+### Next Up: 5660
-- 
2.34.1


From cea6c3ebf0349728afb1453962355cb0ef565425 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Thu, 4 May 2023 10:29:47 +0100
Subject: [PATCH 15/23] Bump version

---
 src/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.py b/src/main.py
index 4a40015..452fffb 100644
--- a/src/main.py
+++ b/src/main.py
@@ -14,7 +14,7 @@
 #     program.  If not, see
 #     https://git.fjla.uk/OwlBoard/db-manager/src/branch/main/LICENSE
 
-version = "2.1.0-dev"
+version = "2.1.0"
 print(f"main.py: Initialising db-manager v{version}")
 
 #Third Party Imports
-- 
2.34.1


From 896febe817d88c472a496b666421a46e9e9e9b19 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Fri, 5 May 2023 11:35:12 +0100
Subject: [PATCH 16/23] PIS Updates

---
 data/pis/gwr.yaml | 168 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 165 insertions(+), 3 deletions(-)

diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index 324b3ad..d47f0f9 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -434,9 +434,9 @@ pis:
   - code: 5624
     stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5627
-    stops: [cdf.nwp,stj,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+    stops: [cdf,nwp,stj,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5628
-    stops: [cdf.nwp,stj,pwy,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+    stops: [cdf,nwp,stj,pwy,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5631
     stops: [gmv,mlv,wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri]
   - code: 5636
@@ -511,14 +511,152 @@ pis:
     stops: [bri,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,dpt,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 5339
     stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5660
+    stops: [cdf,nwp,stj,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5661
+    stops: [cdf,nwp,stj,pwy,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5662
+    stops: [cdf,nwp,stj,pwy,fit,bri,bth,boa,tro,wsb,dmh,wmn]
+  - code: 5684
+    stops: [wsb,wmn]
+  - code: 5701
+    stops: [bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5704
+    stops: [bpw,fit,srd,lwh,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,sou,frm,ftn,pms]
+  - code: 5705
+    stops: [bpw,fit,srd,lwh,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,sou,soa,esl,frm,ftn,pms]
+  - code: 5713
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5714
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,soa,esl,hde,boe,frm,ftn,pms,pmh]
+  - code: 5729
+    stops: [fit,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn]
+  - code: 5734
+    stops: [gmv,btn] ### Not in use, intermediate stops omitted
+  - code: 5735
+    stops: [gmv,wof,wos,asc,cmn,gcr,cdu,yae,bpw,fit,bri]
+  - code: 5736
+    stops: [gmv,mvl,wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,dmh,wmn,sal,rom,sou]
+  - code: 5765
+    stops: [wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri]
+  - code: 5766
+    stops: [wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
+  - code: 5769
+    stops: [wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
+  - code: 5776
+    stops: [bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5778
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,ftm,ftn,pms,pmh]
+  - code: 5779
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5834
+    stops: [cdf,nwp,stj,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5836
+    stops: [cdf,nwp,stj,bpw,fit,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5839
+    stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5841
+    stops: [cdf,nwp,stj,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5843
+    stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5844
+    stops: [cdf,nwp,stj,bpw,fit,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5845
+    stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5849
+    stops: [gcr,cdu,yae,bpw]
+  - code: 5860
+    stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5872
+    stops: [bth,ffd,avf,boa,tro,wsb,fro]
+  - code: 5878
+    stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5894
+    stops: [cdf,nwp,stj,bpw,fit,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn]
+  - code: 5895
+    stops: [bri,btn]  ### Not in use, intermediate stops omitted
+  - code: 5897
+    stops: [wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5899
+    stops: [cdf,nwp,stj,pwy,bpw,fit,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5901
+    stops: [cdf,nwp,stj,pwy,bpw,fit,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5902
+    stops: [cdf,nwp,stj,bpw,fit,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - 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]
+  - code: 5912
+    stops: [bth,ffd,boa,tro,wsb]
+  - code: 5917
+    stops: [bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5918
+    stops: [wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5920
+    stops: [cdf,nwp,stj,pwy,bpw,fit,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5925
+    stops: [bri,btn]  ## Not in use, intermediate stops omitted
+  - code: 5926
+    stops: [cdf,nwp,stj,bpw,fit,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5928
+    stops: [cdf,nwp,stj,bpw,fit,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5929
+    stops: [bri,kyn,olf,bth,ffd,boa,tro,wsb,dmh,wmn]
+  - code: 5930
+    stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms]
+  - code: 5931
+    stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,wmn,sal,wom,sou,soa,esl,hde,boe,frm,ftn,pms,pmh]
+  - code: 5940
+    stops: [bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn]
+  - code: 5941
+    stops: [cdf,nwp,stj,pwy,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5942
+    stops: [cdf,nwp,bpw,fit,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5948
     stops: [bri,psn,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5962
+    stops: [gmv,btn] ### Not in use, intermediate stops omitted
+  - code: 5965
+    stops: [cdf,nwp,stj,pwy,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5967
+    stops: [cdf,nwp,stj,pwy,bpw,fit,kyn,bth,boa,tro,wsb,wmn,sal,rom,sou,soa,esl,hde,boe,frm,ftn,pms,pmh]
+  - code: 5968
+    stops: [cdf,nwp,stj,pwy,bpw,fit,kyn,bth,boa,tro,wsb,dmh,wmn,wal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5969
+    stops: [gcr,cdu,yae,bpw,fit,srd,lwh,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms]
+  - code: 5986
+    stops: [gmv,mvl,wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,srd,lwh,kyn,olf,bth,ffd,avf,boa,tro,wsb]
+  - code: 5992
+    stops: [cdf,nwp,stj,bpw,fit,kyn,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5994
+    stops: [cdf,nwp,stj,pwy,bpw,fit,kwn,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]
+  - code: 6002
+    stops: [bpw,fit,srd,lwh,kwn,olf,bth,ffd,avf,boa,tro,wsb]
+  - code: 6003
+    stops: [kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 6015
+    stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 6017
+    stops: [gmv,btn] ### Not in use, intermediate stops omitted
+  - code: 6022
+    stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,soa,esl,hde,boe,frm,ftn,pms,pmh]
+  - code: 6023
+    stops: [cdf,nwp,bpw,fit,kyn,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 6024
+    stops: [bpw,fit,srd,lwh,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms]
+  - code: 6044
+    stops: [cdf,nwp,stj,pwy,bpw,fit,srd,lwh,bri]
   - code: 6067
     stops: [avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 6070
     stops: [svb,sar,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri]
+  - code: 6074
+    stops: [gmv,wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
   - code: 6076
     stops: [avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 6079
+    stops: [cdf,nwp,stj,fit,bri,kyn,bth,boa,tro,wsb,fro]
   - code: 6081
     stops: [svb,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 6082
@@ -537,12 +675,36 @@ pis:
     stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,exd,dww,tgm,nta,tot,ivy,ply,dvp,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 6103
     stops: [cdf,nwl,stj,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dww,dwl,tgm,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6108
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 6111
+    stops: [bri,kyn,olf,bth,boa,tro,wsb]
+  - code: 6114
+    stops: [bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ptc,csa,ftn]
+  - code: 6116
+    stops: [cdf,nwp,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 6117
+    stops: [cdf,nwp,fit,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 6118
+    stops: [bri,btn] ### Not in use, intermediate stops omitted
+  - code: 6121
+    stops: [cdf,nwp,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 6122
+    stops: [cdf,nwp,stj,pwy,fit,bri,kyn,olf,bth,boa,tro,wsg,wmn,sal,rom,sou,frm,ftn,pms,pmh]
   - code: 6123
     stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 6125
     stops: [cdf,nwl,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd,dww,tgm,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6129
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 6130
+    stops: [cdf,nwp,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 6133
+    stops: [cdf,nwp,stj,pwy,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
   - code: 6134
     stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dww,tgm,nta,tot,ivy,ply,dvp,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6135
+    stops: [bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 6136
     stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd,dww,dwl,tgm,nta,tot,ivy,ply,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 6137
@@ -563,4 +725,4 @@ pis:
     stops: [hwv,hxx]
 
 ### Still to do: `North PNZ to CDF-WOS`
-### Next Up: 5660
+### Next Up: 5152 (North BTN to CDF-GMV)
-- 
2.34.1


From b67eed3efb8a288b35dfcbfb751b9b61bd7ee6c8 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Fri, 5 May 2023 12:24:11 +0100
Subject: [PATCH 17/23] PIS Updates

---
 data/pis/gwr.yaml | 148 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 143 insertions(+), 5 deletions(-)

diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index d47f0f9..d3a64fd 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -227,6 +227,30 @@ pis:
     stops: [wsb,dmh,wmn,sal,rom,sou]
   - code: 5151
     stops: [wsb,dmh,wmn]
+  - code: 5152
+    stops: [btm,bri] # No longer in use, intermittent stops omitted
+  - code: 5153
+    stops: [btm,bri] # No longer in use, intermittent stops omitted
+  - code: 5154
+    stops: [btm,bri] # No longer in use, intermittent stops omitted
+  - code: 5155
+    stops: [btm,bpw] # No longer in use, intermittent stops omitted
+  - code: 5156
+    stops: [btm,cdf] # No longer in use, intermittent stops omitted
+  - code: 5157
+    stops: [btm,gmv] # No longer in use, intermittent stops omitted
+  - code: 5158
+    stops: [btm,gmv] # No longer in use, intermittent stops omitted
+  - code: 5159
+    stops: [btm,gmv] # No longer in use, intermittent stops omitted
+  - code: 5160
+    stops: [btm,pmh] # No longer in use, intermittent stops omitted
+  - code: 5161
+    stops: [bri,fit,bpw]
+  - code: 5162
+    stops: [bri,fit,nwp,cdf]
+  - code: 5163
+    stops: [bri,fit,stj,nwp,cdf]
   - code: 5164
     stops: [fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,pwy,nwp,cdf]
   - code: 5165
@@ -245,8 +269,28 @@ pis:
     stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,dmh,wsb,tro,boa,bth,bri,fit,bpw]
   - code: 5172
     stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,wsb,tro,boa,bth,bri,fit,bpw]
+  - code: 5173
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,bri,fit,nwp,cdf]
+  - code: 5174
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,bri,fit,pwy,stj,nwp,cdf]
+  - code: 5175
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,bri,fit,stj,nwp,cdf]
+  - code: 5176
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,olf,kyn,bri,fit,stj,nwp,cdf]
+  - code: 5177
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,olf,kyn,bri,fit,nwp,cdf]
+  - code: 5178
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,avf,ffd,bth,bri,fit,stj,nwp,cdf]
+  - code: 5179
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,nwp,cdf]
+  - code: 5180
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,pwy,stj,nwp,cdf]
+  - code: 5181
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,stj,nwp,cdf]
+  - code: 5182
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,stj,nwp,cdf]
   - code: 5184
-    stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,dmh,wsb,tro,boa,bth,bri,fit,stj,nwp,cdf]
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,dmh,wsb,tro,boa,bth,kyn,bri,fit,nwp,cdf]
   - code: 5185
     stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,wsb,tro,boa,bth,bri,fit,pwy,stj,nwp,cdf]
   - code: 5186
@@ -255,8 +299,26 @@ pis:
     stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,dmh,wsb]
   - code: 5188
     stops: [sal,wmn,dmh,wsb]
+  - code: 5189
+    stops: [sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
+  - code: 5190
+    stops: [sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv]
+  - code: 5191
+    stops: [sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof]
+  - code: 5192
+    stops: [sou,rom,sal,wmn,dmh,wsb]
+  - code: 5193
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr]
+  - code: 5194
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv]
+  - code: 5195
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos]
   - code: 5196
     stops: [wmn,dmh,wsb]
+  - code: 5197
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw]
+  - code: 5198
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit,stj,nwp,cdf]
   - code: 5200
     stops: [gcr,cnm]
   - code: 5215
@@ -311,6 +373,18 @@ pis:
     stops: [cdf,nwp,stj,fir,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5452
     stops: [cdf,nwp,stj,fir,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5470
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,bpw]
+  - code: 5471
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,ffd,bth,bri,fit,nwp,cdf]
+  - code: 5472
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,avf,ffd,bth,bri,fit,stj,nwp,cdf]
+  - code: 5473
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,nwp,cdf]
+  - code: 5474
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,pwy,stj,nwp,cdf]
+  - code: 5475
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,stj,nwp,cdf]
   - code: 5487
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
   - code: 5488
@@ -325,8 +399,12 @@ pis:
     stops: [cdf,nwp,stj,pwy,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5493
     stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5496
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,olf,kyn,bri,fit,nwp,cdf]
   - code: 5499
     stops: [bth,olf,kyn,bri,lwh,srd,fit]
+  - code: 5501
+    stops: [bri,stj,nwp,cdf]
   - code: 5502
     stops: [bri,lwh,srd,fit]
   - code: 5503
@@ -375,10 +453,22 @@ pis:
     stops: [fit,srd,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 5528
     stops: [fit,srd,lwh,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
+  - code: 5529
+    stops: [fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw]
   - code: 5533
     stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri]
+  - code: 5534
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,olf,kyn,bri,fit,bpw]
+  - code: 5539
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,bpw]
+  - code: 5540
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,olf,kyn,bri,fit,bpw]
   - code: 5542
     stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5556
+    stops: [wsb,tro,boa,ffd,bth,olf,kyn,bri,lwh,srd,fit,bpw]
+  - code: 5558
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit]
   - code: 5559
     stops: [cdf,nwp,bri]
   - code: 5560
@@ -397,6 +487,12 @@ pis:
     stops: [gcr,cdu,yae,bpw,fit,srd,lwh,bri]
   - code: 5574
     stops: [gmv,mvl,wof,wos,asc,cnm,gcr,fit,bri]
+  - code: 5578
+    stops: [sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr]
+  - code: 5581
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm]
+  - code: 5584
+    stops: [btn,gmv] ### Not in use, intermediate stops omitted
   - code: 5587
     stops: [bri,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd]
   - code: 5590
@@ -438,9 +534,21 @@ pis:
   - code: 5628
     stops: [cdf,nwp,stj,pwy,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5631
-    stops: [gmv,mlv,wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri]
+    stops: [gmv,mvl,wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri]
   - code: 5636
     stops: [pmh,btn] ### Not in use, intermediate stops omitted
+  - code: 5637
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,stj,nwp,cdf]
+  - code: 5638
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,stj,nwp,cdf]
+  - code: 5639
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,olf,kyn,bri,fit,stj,nwp,cdf]
+  - code: 5640
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,pwy,stj,nwp,cdf]
+  - code: 5642
+    stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5651
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,stj,nwp,cdf]
   - code: 5654
     stops: [cdf,btn] ### Not in use, intermediate stops omitted
   - code: 5655
@@ -451,20 +559,34 @@ pis:
     stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
   - code: 5659
     stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
-  - code: 5642
-    stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5665
+    stops: [fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,stj,nwp,cdf]
+  - code: 5671
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,bri,fit,pwy,stj,nwp,cdf]
+  - code: 5672
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,avf,ffd,bth,bri,fit,pwy,stj,nwp,cdf]
+  - code: 5673
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,pwy,stj,nwp,cdf]
   - code: 5678
     stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,nls,yat,wor,wnm,wsm,hig,bwt,tau]
   - code: 5681
     stops: [wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5683
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,pwy,stj,nwp,cdf]
   - code: 5689
     stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5690
+    stops: [bth,olf,kyn,bri]
+  - code: 5691
+    stops: [btn,bpw] ### Not in Use, intermediate stops omitted
   - code: 5866
     stops: [sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
   - code: 5700
     stops: [bri,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 5702
     stops: [bri,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5703
+    stops: [bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof]
   - code: 5708
     stops: [bpw,fit,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 5709
@@ -485,12 +607,28 @@ pis:
     stops: [fit,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 5731
     stops: [gcr,cdu,yae,bpw,fit,bri]
+  - code: 5750
+    stops: [pmh,pms,ftn,frm,wsl,soa,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,bri]
+  - code: 5751
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,bri,fit,nwp,cdf]
+  - code: 5752
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,olf,kyn,bri,fit,nwp,cdf]
+  - code: 5255
+    stops: [sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
   - code: 5761
     stops: [svb,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri]
   - code: 5767
     stops: [wos,asc,cnm,gcr,bpw,fit,bri]
   - code: 5768
     stops: [wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5770
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit,bpw]
+  - code: 5771
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof]
+  - code: 5774
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit,bpw]
+  - code: 5775
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit,stj,nwp,cdf]
   - code: 5777
     stops: [cnm,gcr,cdu,yae,bpw,fit,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 5807
@@ -725,4 +863,4 @@ pis:
     stops: [hwv,hxx]
 
 ### Still to do: `North PNZ to CDF-WOS`
-### Next Up: 5152 (North BTN to CDF-GMV)
+### Next Up: 5785
-- 
2.34.1


From 08188599295f4668359077d5ace73bbce290ac4b Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Fri, 5 May 2023 13:39:49 +0100
Subject: [PATCH 18/23] PIS Updates

---
 data/pis/gwr.yaml | 190 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 185 insertions(+), 5 deletions(-)

diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index d3a64fd..bfd53d5 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -687,54 +687,138 @@ pis:
     stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,ftm,ftn,pms,pmh]
   - code: 5779
     stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5785
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,nwp,cdf]
+  - code: 5786
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,nwp,cdf]
+  - code: 5787
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,nwp,cdf]
+  - code: 5789
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv]
+  - code: 5793
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,stj,nwp,cdf]
+  - code: 5794
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,bri,fit,nwp,cdf]
+  - code: 5796
+    stops: [ftn,csa,ptc,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,old,kyn,bri,fit,bpw,yae,cdu,gcr]
+  - code: 5797
+    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
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,bri,fit,nwp,cdf]
+  - code: 5804
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof]
+  - code: 5806
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv]
+  - code: 5809
+    stops: [pmh,pms,ftn,frm,esl,soa,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,bri]
+  - code: 5810
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit,bpw,yae,cdu,gcr]
+  - code: 5818
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,lwh,srd,fit]
+  - code: 5833
+    stops: [pmh,pms,ftn,csa,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,fit,bpw,nwp,cdf]
   - code: 5834
     stops: [cdf,nwp,stj,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5835
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,fit,bpw,nwp,cdf]
   - code: 5836
     stops: [cdf,nwp,stj,bpw,fit,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5837
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,fit,bpw,nwp,cdf]
+  - code: 5838
+    stops: [pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,bri]
   - code: 5839
     stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5840
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,fit,bpw,stj,nwp,cdf]
   - code: 5841
     stops: [cdf,nwp,stj,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5842
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,fit,bpw,stj,nwp,cdf]
   - code: 5843
     stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
   - code: 5844
     stops: [cdf,nwp,stj,bpw,fit,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
   - code: 5845
     stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5846
+    stops: [btn,bri] ### Not in use, intermediate stops omitted
   - code: 5849
     stops: [gcr,cdu,yae,bpw]
+  - code: 5851
+    stops: [bpw,yar,cdu,gcr]
   - code: 5860
     stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5863
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri,fit,bpw,pwy,stj,nwp,cdf]
+  - code: 5866
+    stops: [sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
+  - code: 5868
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,fit,bpw,pwy,stj,nwp,cdf]
+  - code: 5870
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
+  - code: 5871
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri]
   - code: 5872
     stops: [bth,ffd,avf,boa,tro,wsb,fro]
+  - code: 5873
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wmn,dmh,tro,boa,bth]
   - code: 5878
     stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5893
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,olf,kyn,fit,bpw,pwy,stj,nwp,cdf]
   - code: 5894
     stops: [cdf,nwp,stj,bpw,fit,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn]
   - code: 5895
     stops: [bri,btn]  ### Not in use, intermediate stops omitted
+  - code: 5896
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,fit,bpw,pwy,stj,nwp,cdf]
   - code: 5897
     stops: [wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5898
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,avf,ffd,bth,fit,bpw,pwy,stj,nwp,cdf]
   - code: 5899
     stops: [cdf,nwp,stj,pwy,bpw,fit,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5900
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,bri]
   - code: 5901
     stops: [cdf,nwp,stj,pwy,bpw,fit,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
   - code: 5902
     stops: [cdf,nwp,stj,bpw,fit,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5903
+    stops: [wsb,tro,boa,bth,olf,kyn,fit,bpw,stj,nwp,cdf]
   - 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]
+  - code: 5906
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,fit,bpw,stj,nwp,cdf]
+  - code: 5911
+    stops: [wsb,tro,boa,avf,ffd,bth]
   - code: 5912
     stops: [bth,ffd,boa,tro,wsb]
+  - 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]
   - code: 5917
     stops: [bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5918
     stops: [wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5919
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,olf,kyn,fit,bpw,stj,nwp,cdf]
   - code: 5920
     stops: [cdf,nwp,stj,pwy,bpw,fit,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5921
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,olf,kyn,bri]
+  - code: 5922
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,olf,kyn,fit,bpw,stj,nwp,cdf]
+  - code: 5923
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,olf,kyn,fit,bpw,stj,nwp,cdf]
+  - code: 5924
+    stops: [ftn,csa,ptc,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
   - code: 5925
     stops: [bri,btn]  ## Not in use, intermediate stops omitted
   - code: 5926
     stops: [cdf,nwp,stj,bpw,fit,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5927
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,fit,bpw,stj,nwp,cdf]
   - code: 5928
     stops: [cdf,nwp,stj,bpw,fit,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
   - code: 5929
@@ -749,46 +833,120 @@ pis:
     stops: [cdf,nwp,stj,pwy,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5942
     stops: [cdf,nwp,bpw,fit,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5943
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,fit,bpw,stj,nwp,cdf]
+  - code: 5944
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
+  - code: 5946
+    stops: [fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,fit,bpw,pwy,nwp,cdf]
   - code: 5948
     stops: [bri,psn,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5955
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,olf,kyn,fit,bpw,pwy,stj,nwp,cdf]
+  - code: 5956
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,olf,kyn,fit,bpw]
+  - code: 5957
+    stops: [ftn,csa,ptc,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,lwh,srd,fit,bpw,pwy,yae,cdu,gcr]
+  - code: 5958
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,lwh,srd,fit,bpw,pwy,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv]
+  - code: 5959
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,lwh,srd,fit,bpw]
+  - code: 5960
+    stops: [pmh,pms,ftm,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,fit,bpw,pwy,srj,nwp,cdf]
+  - code: 5961
+    stops: [btn,gmv] ### Not in use, intermediate stops omitted
   - code: 5962
     stops: [gmv,btn] ### Not in use, intermediate stops omitted
+  - code: 5963
+    stops: [btn,wos] ### Not in use, intermediate stops omitted
+  - code: 5964
+    stops: [pmh,pms,frn,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,fit,bpw,pwy,stj,nwp,cdf]
   - code: 5965
     stops: [cdf,nwp,stj,pwy,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5966
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,lwh,srd,fit,bpw,yae,cdu,gcr]
   - code: 5967
     stops: [cdf,nwp,stj,pwy,bpw,fit,kyn,bth,boa,tro,wsb,wmn,sal,rom,sou,soa,esl,hde,boe,frm,ftn,pms,pmh]
   - code: 5968
     stops: [cdf,nwp,stj,pwy,bpw,fit,kyn,bth,boa,tro,wsb,dmh,wmn,wal,rom,sou,frm,ftn,pms,pmh]
   - code: 5969
     stops: [gcr,cdu,yae,bpw,fit,srd,lwh,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms]
+  - code: 5973
+    stops: [sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,lwh,srd,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv]
+  - code: 5985
+    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: 5986
     stops: [gmv,mvl,wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,srd,lwh,kyn,olf,bth,ffd,avf,boa,tro,wsb]
   - code: 5992
     stops: [cdf,nwp,stj,bpw,fit,kyn,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
-  - code: 5994
-    stops: [cdf,nwp,stj,pwy,bpw,fit,kwn,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]
+  - code: 5993
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,lwh,srd,fit,stj,nwp,cdf]
+#  - 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
+#  - code: 5994
+#    stops: [bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh] -- ONE 5994 ENTRY IS ERRORNOUS
+  - 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]
+  - code: 5996
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,avf,ffd,bth,kyn,fit,bpw,pwy,stj,nwp,cdf]
+  - code: 5997
+    stops: [pmh,pms,ftn,frm,esl,soa,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth]
   - code: 6002
     stops: [bpw,fit,srd,lwh,kwn,olf,bth,ffd,avf,boa,tro,wsb]
   - code: 6003
     stops: [kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 6009
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,lwh,srd,fit,bpw]
+  - code: 6013
+    stops: [ftn,csa,ptc,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,fit,bpw,yae,cdu,gcr]
+  - code: 6014
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv]
   - code: 6015
     stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 6016
+    stops: [btn,gmv] ### Not in use, intermediate stops omitted
   - code: 6017
     stops: [gmv,btn] ### Not in use, intermediate stops omitted
+  - code: 6018
+    stops: [btn,bpw] ### Not in use, intermediate stops omitted
+  - code: 6019
+    stops: [pmh,pms,ftn,ftm,sou,rom,sal,wmn,wsb,tro,boa,bth,fit,bpw]
+  - code: 6021
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,fit,bpw]
   - code: 6022
     stops: [cdf,nwp,bpw,fit,bth,boa,tro,wsb,wmn,sal,rom,sou,soa,esl,hde,boe,frm,ftn,pms,pmh]
   - code: 6023
     stops: [cdf,nwp,bpw,fit,kyn,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
   - code: 6024
     stops: [bpw,fit,srd,lwh,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms]
+  - code: 6028
+    stops: [sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv]
+  - code: 6034
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof]
+  - code: 6035
+    stops: [wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv]
+  - code: 6036
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,avf,ffd,bth,kyn,fit,bpw,stj,nwp,cdf]
+  - code: 6042
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,fit,bpw]
   - code: 6044
     stops: [cdf,nwp,stj,pwy,bpw,fit,srd,lwh,bri]
+  - code: 6062
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,ffd,bth,olf,kyn,bri,fit,stj,nwp,cdf]
+  - code: 6063
+    stops: [btn,wof] ### Not in use, intermediate stops omitted
+  - code: 6064
+    stops: [btn,bpw] ### Not in use, intermediate stops omitted
+  - code: 6065
+    stops: [gcr,cnm,asc,wos,wof]
+  - code: 6066
+    stops: [bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof,mvl,gmv]
   - code: 6067
     stops: [avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 6070
     stops: [svb,sar,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri]
+  - 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]
   - code: 6074
     stops: [gmv,wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
   - code: 6076
@@ -813,18 +971,32 @@ pis:
     stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,exd,dww,tgm,nta,tot,ivy,ply,dvp,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 6103
     stops: [cdf,nwl,stj,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dww,dwl,tgm,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6105
+    stops: [btn,wof] ### Not in use, intermediate stops omitted
+  - code: 6106
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof]
+  - code: 6107
+    stops: [pms,ftn,csa,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos,wof]
   - code: 6108
     stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 6109
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,bri,fit,pwy,stj,nwp,cdf]
   - code: 6111
     stops: [bri,kyn,olf,bth,boa,tro,wsb]
   - code: 6114
     stops: [bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ptc,csa,ftn]
+  - code: 6115
+    stops: [pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,olf,kyn,bri,fit,nwp,cdf]
   - code: 6116
     stops: [cdf,nwp,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 6117
     stops: [cdf,nwp,fit,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 6118
     stops: [bri,btn] ### Not in use, intermediate stops omitted
+  - code: 6119
+    stops: [btn,bri] ### Not in use, intermediate stops omitted
+  - code: 6120
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,nwp,cdf]
   - code: 6121
     stops: [cdf,nwp,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
   - code: 6122
@@ -833,10 +1005,18 @@ pis:
     stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 6125
     stops: [cdf,nwl,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd,dww,tgm,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6127
+    stops: [fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,nwp,cdf]
+  - code: 6128
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,nwp,cdf]
   - code: 6129
     stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 6130
     stops: [cdf,nwp,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 6131
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wmn,dmh,wsb,tro,boa,bth,bri,fit,stj,nwp,cdf]
+  - code: 6132
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,kyn,bri]
   - code: 6133
     stops: [cdf,nwp,stj,pwy,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
   - code: 6134
@@ -863,4 +1043,4 @@ pis:
     stops: [hwv,hxx]
 
 ### Still to do: `North PNZ to CDF-WOS`
-### Next Up: 5785
+### Next Up: 5199 (CNM to SWI & WSB)
-- 
2.34.1


From 73d46f7bb9fc1861f7ac4659ead4e4610ee5e86e Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Sat, 6 May 2023 20:37:55 +0100
Subject: [PATCH 19/23] Programatically remove duplicate PIS codes

---
 src/main.py |  5 +++--
 src/pis.py  | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/main.py b/src/main.py
index 452fffb..c2737ca 100644
--- a/src/main.py
+++ b/src/main.py
@@ -14,7 +14,7 @@
 #     program.  If not, see
 #     https://git.fjla.uk/OwlBoard/db-manager/src/branch/main/LICENSE
 
-version = "2.1.0"
+version = "2.1.1"
 print(f"main.py: Initialising db-manager v{version}")
 
 #Third Party Imports
@@ -60,7 +60,8 @@ log.out(f'main.py: PIS Data is {pisAge}s old', "INFO")
 if pisAge > 3600: # Temporarily set to four hours
     log.out('main.py: Updating PIS data', "INFO")
     pisData = pis.load()
-    mongo.putBulkPis(pisData)
+    pisParsed = pis.parse(pisData)
+    mongo.putBulkPis(pisParsed)
 else:
     log.out('main.py: Not updating PIS data until is it 1036800a old', "INFO")
 
diff --git a/src/pis.py b/src/pis.py
index 26de545..470e315 100644
--- a/src/pis.py
+++ b/src/pis.py
@@ -1,5 +1,7 @@
 import yaml
 
+print("PIS Module imported")
+
 def load():  # Programatically add a `toc` field to each entry.
     with open("/app/data/pis/gwr.yaml", "r") as data:
         try:
@@ -11,4 +13,31 @@ def load():  # Programatically add a `toc` field to each entry.
             return exc
 
 ## Do some magic here so that if any pis["pis"]["stops"][0] field contains 'reverse' then get the stops for the code stored in pis["pis"]["stops"][1]
-## reverse the stops and store that.
\ No newline at end of file
+## reverse the stops and store that.
+
+def parse(codeList):
+    print(f"pis.parse: codeList starting length: {len(codeList)}")
+    for i in codeList:
+        stops = i['stops']
+        code = i['code']
+        for ii in codeList:
+            if stops == ii['stops'] and code != ii['code']:
+                print("Identical stopping pattern found")
+                print(ii)
+                codeList.remove(ii)
+    print(f"pis.parse: codeList finishing length: {len(codeList)}")
+    return codeList
+
+def devLoad():  # Programatically add a `toc` field to each entry.
+    with open("/home/fred.boniface/git/owlboard/db-manager/data/pis/gwr.yaml", "r") as data:
+        try:
+            pis = yaml.safe_load(data)
+            print(pis)
+            return pis["pis"]
+        except yaml.YAMLError as exc:
+            print(exc)
+            return exc
+
+def dev():
+    data = devLoad()
+    parse(data)
\ No newline at end of file
-- 
2.34.1


From ad4961bbe0b3ec970918952765ae0d053b42d005 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Sat, 6 May 2023 20:39:03 +0100
Subject: [PATCH 20/23] Bugfixes

---
 src/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.py b/src/main.py
index c2737ca..365f116 100644
--- a/src/main.py
+++ b/src/main.py
@@ -57,13 +57,13 @@ else:
   # If older than 12 days then update
 pisAge = int(time.time()) - mongo.metaCheckTime("pis")
 log.out(f'main.py: PIS Data is {pisAge}s old', "INFO")
-if pisAge > 3600: # Temporarily set to four hours
+if pisAge > 900: # Temporarily set to 15 minutes
     log.out('main.py: Updating PIS data', "INFO")
     pisData = pis.load()
     pisParsed = pis.parse(pisData)
     mongo.putBulkPis(pisParsed)
 else:
-    log.out('main.py: Not updating PIS data until is it 1036800a old', "INFO")
+    log.out('main.py: Not updating PIS data until is it 1036800s old', "INFO")
 
 log.out('main.py: Requesting TTL Index Creation', "INFO")
 mongo.createTtlIndex("users", "atime", 2629800)
-- 
2.34.1


From 556c09f8f693740c31ae0fb679774ce804837c2a Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Sat, 6 May 2023 20:47:34 +0100
Subject: [PATCH 21/23] Adjustments

---
 src/pis.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pis.py b/src/pis.py
index 470e315..65ae7cb 100644
--- a/src/pis.py
+++ b/src/pis.py
@@ -16,16 +16,16 @@ def load():  # Programatically add a `toc` field to each entry.
 ## reverse the stops and store that.
 
 def parse(codeList):
-    print(f"pis.parse: codeList starting length: {len(codeList)}")
+    StartLen = len(codeList)
+    print(f"pis.parse: codeList starting length: {StartLen}")
     for i in codeList:
         stops = i['stops']
         code = i['code']
         for ii in codeList:
             if stops == ii['stops'] and code != ii['code']:
-                print("Identical stopping pattern found")
-                print(ii)
+                print(f"Identical stopping pattern found: {ii['code']}")
                 codeList.remove(ii)
-    print(f"pis.parse: codeList finishing length: {len(codeList)}")
+    print(f"pis.parse: Removed {StartLen - len(codeList)} duplicates")
     return codeList
 
 def devLoad():  # Programatically add a `toc` field to each entry.
-- 
2.34.1


From 08805c9f8605f76842471e2c8923b6122f41b33b Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Sat, 6 May 2023 21:29:05 +0100
Subject: [PATCH 22/23] Add while loop to prevent crash when DB not ready

---
 src/main.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main.py b/src/main.py
index 365f116..c70d0ec 100644
--- a/src/main.py
+++ b/src/main.py
@@ -14,7 +14,7 @@
 #     program.  If not, see
 #     https://git.fjla.uk/OwlBoard/db-manager/src/branch/main/LICENSE
 
-version = "2.1.1"
+version = "2.1.2"
 print(f"main.py: Initialising db-manager v{version}")
 
 #Third Party Imports
@@ -27,9 +27,15 @@ import logger as log
 
 log.out("main.py: db-manager Initialised", "INFO")
 
-    
-#Ensure count document exists in meta:
-mongo.metaCounters()
+
+#Ensure count document exists in meta, wrap in while look to prevent crashing if the DB is not ready:
+dbReady = False
+while dbReady is False:
+    try:
+        mongo.metaCounters()
+        dbReady = True
+    except:
+        dbReady = False
 
 #Check & Update corpus/stations:
   # If older than 12 days then update
-- 
2.34.1


From 86d439e70ab5d0fa55d1ea1ecd7e4ee34fc09a59 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Sat, 6 May 2023 21:31:52 +0100
Subject: [PATCH 23/23] Adjust PIS update time

---
 src/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.py b/src/main.py
index c70d0ec..f153d22 100644
--- a/src/main.py
+++ b/src/main.py
@@ -60,10 +60,10 @@ else:
     log.out('main.py: Not updating stations data until it is 1036800s old.', "INFO")
 
 #Check & Update pis data:
-  # If older than 12 days then update
+  # If older than 2 days then update
 pisAge = int(time.time()) - mongo.metaCheckTime("pis")
 log.out(f'main.py: PIS Data is {pisAge}s old', "INFO")
-if pisAge > 900: # Temporarily set to 15 minutes
+if pisAge > 172800: # Temporarily set to 15 minutes
     log.out('main.py: Updating PIS data', "INFO")
     pisData = pis.load()
     pisParsed = pis.parse(pisData)
-- 
2.34.1