Compare commits

..

No commits in common. "main" and "20240628_202129" have entirely different histories.

4 changed files with 115 additions and 2358 deletions

View File

@ -32,3 +32,13 @@ jobs:
commit_user_name: owlbot commit_user_name: owlbot
commit_user_email: owlbot@owlboard.info commit_user_email: owlbot@owlboard.info
commit_author: owlbot <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

View File

@ -234,216 +234,56 @@
<CrsCode>DEB</CrsCode> <CrsCode>DEB</CrsCode>
<Name>Dereham Bus (Market Place)</Name> <Name>Dereham Bus (Market Place)</Name>
<SixteenCharacterName>Dereham Bus</SixteenCharacterName> <SixteenCharacterName>Dereham Bus</SixteenCharacterName>
<Longitude>-0.940602</Longitude> <Longitude>0.940602</Longitude>
<Latitude>52.681599</Latitude> <Latitude>52.681599</Latitude>
</Station> </Station>
<Station> <Station>
<CrsCode>EMA</CrsCode> <CrsCode></CrsCode>
<Name>East Midlands Airport (Bus)</Name> <Name></Name>
<SixteenCharacterName>E Midlands Aprt.</SixteenCharacterName> <SixteenCharacterName></SixteenCharacterName>
<Longitude>-1.330462</Longitude> <Longitude></Longitude>
<Latitude>52.825718</Latitude> <Latitude></Latitude>
</Station> </Station>
<Station> <Station>
<CrsCode>SGQ</CrsCode> <CrsCode></CrsCode>
<Name>Stone (Granville Square, Bus)</Name> <Name></Name>
<SixteenCharacterName>Granville Square</SixteenCharacterName> <SixteenCharacterName></SixteenCharacterName>
<Longitude>-2.148309</Longitude> <Longitude></Longitude>
<Latitude>52.903549</Latitude> <Latitude></Latitude>
</Station> </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>
<Station> <!-- To Check: (Other end of routes starting at:)
<CrsCode>SAI</CrsCode>
<Name>Sheffield Arena (Tram)</Name>
<SixteenCharacterName>Sheffield Arena</SixteenCharacterName>
<Longitude>-1.420300</Longitude>
<Latitude>53.398331</Latitude>
</Station>
<Station> EMA - EMPKAIR - East Midlands Airport (Bus)
<CrsCode>XCF</CrsCode> SGQ - STONEGS - Stone Granville Square (Bus)
<Name>Cardiff Airport (Bus)</Name> LUB - LUTOBUS - Luton (Bus)
<SixteenCharacterName>Cardiff Airport</SixteenCharacterName> EDA - EDINAIR - Edinburgh Airport (Bus)
<Longitude>-3.339034</Longitude> SAI - SANWBUS - St Andrews (Bus)
<Latitude>51.398851</Latitude> XCF - CRDFAIR - Cardiff Airport (Bus)
</Station> XAA - BRWCGAL - Galashiels Bus Station
KYL - KYLELSH - Kyle of Lochalsh
<Station> DEW - DWBY - Dewsbury (Bus)
<CrsCode>XAA</CrsCode> FRH - FRETHUN - Calais Frethun
<Name>Galashiels Bus Station</Name> PBN - PARISND - Paris Nord
<SixteenCharacterName>Galashiels Bus</SixteenCharacterName> AMS - AMSTDAM - Amsterdan Central Station
<Longitude>-2.805677</Longitude> BXS - BRUXMID - Brusells Midi
<Latitude>55.617594</Latitude> SGE - SWNAGE - Swanage (Swanage Rly)
</Station> CFC - SWNACFC - Corfe Castle (Swanage Rly)
HAR - SWNAHMC - Harmans Cross (Swanage Rly)
<Station> HEH - SWNAHNH - Herston Halt (Swanage Rly)
<CrsCode>FRH</CrsCode> NOD - SWNANDN - Norden (Swanage Rly)
<Name>Calais Frethun</Name> MHD - MINEHED - Minehead (WSR)
<SixteenCharacterName>Calais Frethun</SixteenCharacterName> WCT - WATCHET - Watchet (WSR & Bus)
<Longitude>1.821091</Longitude> BIB - BSPSLYD - Bishops Lydeard (WSR)
<Latitude>50.921963</Latitude> XLU - BSPSHIT - Bishops Lydeard (Bus)
</Station> YVB - YOVILBS - Yeovil Bus Station
CAQ - YORKCSH - Castle Howard (Bus)
<Station> FLZ - YORKFLM - Flamingo Land (Bus)
<CrsCode>PBN</CrsCode> XKW - YSTRBWD - Blackwood (Bus)
<Name>Paris Gare du Nord</Name> XEQ - RADSVHL - Radstock (Bus)
<SixteenCharacterName>Paris Nord</SixteenCharacterName> XBR - MIDSTHL - Midsomer Norton (Bus)
<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>

File diff suppressed because it is too large Load Diff

View File

@ -39,7 +39,6 @@ function sortAndMergeYAMLFiles() {
if (item.stops.length > 0) { if (item.stops.length > 0) {
outputString += ` - code: "${item.code}"\n`; outputString += ` - code: "${item.code}"\n`;
outputString += ` stops: [${item.stops.map(stop => `${stop}`).join(',')}]\n`; outputString += ` stops: [${item.stops.map(stop => `${stop}`).join(',')}]\n`;
outputString += ` toc: "gw"\n`;
} }
}); });
@ -50,9 +49,8 @@ function sortAndMergeYAMLFiles() {
console.error("Error writing gw.pis", err) console.error("Error writing gw.pis", err)
} }
// Remove any files created by dgp2
files.forEach(file => { files.forEach(file => {
if (file.startsWith('auto-dgp2')) { if (file.startsWith('dg_parser')) {
fs.unlinkSync(directoryPath + file); fs.unlinkSync(directoryPath + file);
console.log(`Deleted file: ${file}`); console.log(`Deleted file: ${file}`);
} }