pis-manual-fixes (#95)

Reviewed-on: #95

.gitea/workflows/auto_pr.yaml

@@ -6,6 +6,7 @@ on:
         branches:
             - auto-*
             - workflow_update
+            - pis-*
 
 jobs:
     validate_and_release:
@@ -31,14 +32,4 @@ jobs:
                   commit_message: Sort & Merge PIS Files
                   commit_user_name: owlbot
                   commit_user_email: owlbot@owlboard.info
-                  commit_author: owlbot <owlbot@owlboard.info>
-
-            - name: Create PR
-              uses: https://github.com/peter-evans/create-pull-request@v6
-              with:
-                  token: ${{ secrets.OWLBOT_KEY }}
-                  committer: OwlBot <owlbot@owlboard.info>
-                  signoff: true
-                  title: Merge Changes
-                  reviewers: fred.boniface
-                  branch: main
+                  commit_author: owlbot <owlbot@owlboard.info>

knowledgebase/additional.xml

@@ -234,56 +234,216 @@
     <CrsCode>DEB</CrsCode>
     <Name>Dereham Bus (Market Place)</Name>
     <SixteenCharacterName>Dereham Bus</SixteenCharacterName>
-    <Longitude>0.940602</Longitude>
+    <Longitude>-0.940602</Longitude>
     <Latitude>52.681599</Latitude>
   </Station>
 
   <Station>
-    <CrsCode></CrsCode>
-    <Name></Name>
-    <SixteenCharacterName></SixteenCharacterName>
-    <Longitude></Longitude>
-    <Latitude></Latitude>
+    <CrsCode>EMA</CrsCode>
+    <Name>East Midlands Airport (Bus)</Name>
+    <SixteenCharacterName>E Midlands Aprt.</SixteenCharacterName>
+    <Longitude>-1.330462</Longitude>
+    <Latitude>52.825718</Latitude>
   </Station>
 
   <Station>
-    <CrsCode></CrsCode>
-    <Name></Name>
-    <SixteenCharacterName></SixteenCharacterName>
-    <Longitude></Longitude>
-    <Latitude></Latitude>
+    <CrsCode>SGQ</CrsCode>
+    <Name>Stone (Granville Square, Bus)</Name>
+    <SixteenCharacterName>Granville Square</SixteenCharacterName>
+    <Longitude>-2.148309</Longitude>
+    <Latitude>52.903549</Latitude>
   </Station>
 
+  <Station>
+    <CrsCode>LUB</CrsCode>
+    <Name>Luton Airport (Bus)</Name>
+    <SixteenCharacterName>Luton Airport</SixteenCharacterName>
+    <Longitude>-0.375259</Longitude>
+    <Latitude>51.879070</Latitude>
+  </Station>
 
+  <Station>
+    <CrsCode>EDA</CrsCode>
+    <Name>Edinburgh Airport (Bus)</Name>
+    <SixteenCharacterName>Edinburgh Airpt</SixteenCharacterName>
+    <Longitude>-3.358012</Longitude>
+    <Latitude>55.947523</Latitude>
+  </Station>
 
-  <!-- To Check: (Other end of routes starting at:)
+  <Station>
+    <CrsCode>SAI</CrsCode>
+    <Name>Sheffield Arena (Tram)</Name>
+    <SixteenCharacterName>Sheffield Arena</SixteenCharacterName>
+    <Longitude>-1.420300</Longitude> 
+    <Latitude>53.398331</Latitude>
+  </Station>
 
-    EMA - EMPKAIR - East Midlands Airport (Bus)
-    SGQ - STONEGS - Stone Granville Square (Bus)
-    LUB - LUTOBUS - Luton (Bus)
-    EDA - EDINAIR - Edinburgh Airport (Bus)
-    SAI - SANWBUS - St Andrews (Bus)
-    XCF - CRDFAIR - Cardiff Airport (Bus)
-    XAA - BRWCGAL - Galashiels Bus Station
-    KYL - KYLELSH - Kyle of Lochalsh
-    DEW - DWBY - Dewsbury (Bus)
-    FRH - FRETHUN - Calais Frethun
-    PBN - PARISND - Paris Nord
-    AMS - AMSTDAM - Amsterdan Central Station
-    BXS - BRUXMID - Brusells Midi
-    SGE - SWNAGE - Swanage (Swanage Rly)
-    CFC - SWNACFC - Corfe Castle (Swanage Rly)
-    HAR - SWNAHMC - Harmans Cross (Swanage Rly)
-    HEH - SWNAHNH - Herston Halt (Swanage Rly)
-    NOD - SWNANDN - Norden (Swanage Rly)
-    MHD - MINEHED - Minehead (WSR)
-    WCT - WATCHET - Watchet (WSR & Bus)
-    BIB - BSPSLYD - Bishops Lydeard (WSR)
-    XLU - BSPSHIT - Bishops Lydeard (Bus)
-    YVB - YOVILBS - Yeovil Bus Station
-    CAQ - YORKCSH - Castle Howard (Bus)
-    FLZ - YORKFLM - Flamingo Land (Bus)
-    XKW - YSTRBWD - Blackwood (Bus)
-    XEQ - RADSVHL - Radstock (Bus)
-    XBR - MIDSTHL - Midsomer Norton (Bus)
-  -->
+  <Station>
+    <CrsCode>XCF</CrsCode>
+    <Name>Cardiff Airport (Bus)</Name>
+    <SixteenCharacterName>Cardiff Airport</SixteenCharacterName>
+    <Longitude>-3.339034</Longitude>
+    <Latitude>51.398851</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>XAA</CrsCode>
+    <Name>Galashiels Bus Station</Name>
+    <SixteenCharacterName>Galashiels Bus</SixteenCharacterName>
+    <Longitude>-2.805677</Longitude>
+    <Latitude>55.617594</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>FRH</CrsCode>
+    <Name>Calais Frethun</Name>
+    <SixteenCharacterName>Calais Frethun</SixteenCharacterName>
+    <Longitude>1.821091</Longitude>
+    <Latitude>50.921963</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>PBN</CrsCode>
+    <Name>Paris Gare du Nord</Name>
+    <SixteenCharacterName>Paris Nord</SixteenCharacterName>
+    <Longitude>2.355725</Longitude>
+    <Latitude>48.880557</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>AMS</CrsCode>
+    <Name>Amsterdam Centraal</Name>
+    <SixteenCharacterName>Amsterdan Ctl</SixteenCharacterName>
+    <Longitude>4.900461</Longitude>
+    <Latitude>52.378672</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>BXS</CrsCode>
+    <Name>Brussels Midi</Name>
+    <SixteenCharacterName>Brussels Midi</SixteenCharacterName>
+    <Longitude>4.336522</Longitude>
+    <Latitude>50.835096</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>SGE</CrsCode>
+    <Name>Swanage (Swanage Rly)</Name>
+    <SixteenCharacterName>SWANAGE</SixteenCharacterName>
+    <Longitude>-1.960048</Longitude>
+    <Latitude>50.609976</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>HAR</CrsCode>
+    <Name>Harmans Cross (Swanage Rly)</Name>
+    <SixteenCharacterName>Harmans Cross</SixteenCharacterName>
+    <Longitude>-2.027277</Longitude>
+    <Latitude>50.619897</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>CFC</CrsCode>
+    <Name>Corfe Castle (Swanage Rly)</Name>
+    <SixteenCharacterName>Corfe Castle</SixteenCharacterName>
+    <Longitude>-2.054689</Longitude>
+    <Latitude>50.638107</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>NOD</CrsCode>
+    <Name>Norden (Swanage Rly)</Name>
+    <SixteenCharacterName>Norden</SixteenCharacterName>
+    <Longitude>-2.062072</Longitude>
+    <Latitude>50.644630</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>HEH</CrsCode>
+    <Name>Herston Halt (Swanage Rly)</Name>
+    <SixteenCharacterName>Herston Halt</SixteenCharacterName>
+    <Longitude>-1.980250</Longitude>
+    <Latitude>50.613084</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>MHD</CrsCode>
+    <Name>Minehead (WSR/Bus)</Name>
+    <SixteenCharacterName>Minehead</SixteenCharacterName>
+    <Longitude>-3.469013</Longitude>
+    <Latitude>51.206834</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>XDY</CrsCode>
+    <Name>Dunster (Bus)</Name>
+    <SixteenCharacterName>Dunster</SixteenCharacterName>
+    <Longitude>-3.444564</Longitude>
+    <Latitude>51.182943</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>WCT</CrsCode>
+    <Name>Watchet (WSR/Bus)</Name>
+    <SixteenCharacterName>Watchet</SixteenCharacterName>
+    <Longitude>-3.329689</Longitude>
+    <Latitude>51.180929</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>BIB</CrsCode>
+    <Name>Bishops Lydeard (WSR)</Name>
+    <SixteenCharacterName>Bishops Lydeard</SixteenCharacterName>
+    <Longitude>-3.193899</Longitude>
+    <Latitude>51.053827</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>XLU</CrsCode>
+    <Name>Bishops Lydeard (Bus)</Name>
+    <SixteenCharacterName>Bishop Lyd (BUS)</SixteenCharacterName>
+    <Longitude>-3.187749</Longitude>
+    <Latitude>51.056697</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>YVB</CrsCode>
+    <Name>Yeovil Bus Station</Name>
+    <SixteenCharacterName>Yeovil (BUS)</SixteenCharacterName>
+    <Longitude>-2.627254</Longitude>
+    <Latitude>50.942009</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>FLZ</CrsCode>
+    <Name>Flamingo Land (Bus)</Name>
+    <SixteenCharacterName>Flamingo Land</SixteenCharacterName>
+    <Longitude>-0.808575</Longitude>
+    <Latitude>54.208536</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>XBR</CrsCode>
+    <Name>Midsomer Norton (Bus)</Name>
+    <SixteenCharacterName>Midsomer Norton</SixteenCharacterName>
+    <Longitude>-2.482952</Longitude>
+    <Latitude>51.285678</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>XEQ</CrsCode>
+    <Name>Radstock (Bus)</Name>
+    <SixteenCharacterName>Radstock</SixteenCharacterName>
+    <Longitude>-2.447870</Longitude>
+    <Latitude>51.291644</Latitude>
+  </Station>
+
+  <Station>
+    <CrsCode>XKW</CrsCode>
+    <Name>Blackwood Bus Station</Name>
+    <SixteenCharacterName>Blackwood</SixteenCharacterName>
+    <Longitude>-3.195482</Longitude>
+    <Latitude>51.665032</Latitude>
+  </Station>
+
+</StationList>

scripts/merge-yaml.js

@@ -31,14 +31,17 @@ function sortAndMergeYAMLFiles() {
             return codeA - codeB
         })
 
-        const mergedYaml = yaml.stringify(mergedData);
+        
 
-        // Construct the output string
+        // Construct the output string, removing duplicates
         let outputString = "pis:\n";
+        const seenCodes = new Set();
         mergedData.forEach(item => {
-            if (item.stops.length > 0) {
+            if (!seenCodes.has(item.code) && item.stops.length > 0) {
+                seenCodes.add(item.code);
                 outputString += `  - code: "${item.code}"\n`;
                 outputString += `    stops: [${item.stops.map(stop => `${stop}`).join(',')}]\n`;
+                outputString += `    toc: "${item.toc || "gw"}"\n`;
             }
         });
 
@@ -49,8 +52,9 @@ function sortAndMergeYAMLFiles() {
             console.error("Error writing gw.pis", err)
         }
 
+        // Remove any files created by dgp2
         files.forEach(file => {
-            if (file.startsWith('dg_parser')) {
+            if (file.startsWith('auto-')) {
                 fs.unlinkSync(directoryPath + file);
                 console.log(`Deleted file: ${file}`);
             }