Merge branch 'main' into deploy

.yarnrc.yml

@@ -4,4 +4,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.0.2.cjs
+yarnPath: .yarn/releases/yarn-4.1.0.cjs

cf-workers/.yarnrc.yml

@@ -4,4 +4,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.0.2.cjs
+yarnPath: .yarn/releases/yarn-4.1.0.cjs

cf-workers/package.json

@@ -10,17 +10,18 @@
     "format:check": "prettier --check \"**/*.{js,ts,json,md}\""
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20240117.0",
+    "@cloudflare/workers-types": "^4.20240208.0",
     "@types/uuid": "^9.0.8",
-    "prettier": "^3.2.4",
+    "prettier": "^3.2.5",
     "typescript": "^5.3.3",
-    "wrangler": "^3.24.0"
+    "wrangler": "^3.28.1"
   },
   "dependencies": {
-    "@cfworker/json-schema": "^1.12.7",
+    "@cfworker/json-schema": "^1.12.8",
     "dayjs": "^1.11.10",
     "itty-cors": "^0.3.6",
     "itty-router": "^4.0.27",
     "uuid": "^9.0.1"
-  }
+  },
+  "packageManager": "[email protected]"
 }

cf-workers/tsconfig.json

@@ -96,6 +96,6 @@
 
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true /* Skip type checking all .d.ts files. */,
-  },
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
+  }
 }

package.json

@@ -26,8 +26,8 @@
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
     "@reach/tabs": "^0.18.0",
-    "@sentry/gatsby": "^7.98.0",
-    "@sentry/tracing": "^7.98.0",
+    "@sentry/gatsby": "^7.100.1",
+    "@sentry/tracing": "^7.100.1",
     "clsx": "^2.1.0",
     "copy-to-clipboard": "^3.3.3",
     "crunker": "^2.4.0",
@@ -59,17 +59,17 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@sentry/cli": "^2.26.0",
+    "@sentry/cli": "^2.28.5",
     "@types/gatsbyjs__reach-router": "^2.0.4",
-    "@types/node": "^20.11.7",
-    "@types/react": "^18.2.48",
+    "@types/node": "^20.11.17",
+    "@types/react": "^18.2.55",
     "@types/react-beautiful-dnd": "^13.1.8",
-    "@types/react-dom": "^18.2.18",
+    "@types/react-dom": "^18.2.19",
     "@types/uuid": "^9.0.8",
     "cross-env": "^7.0.3",
     "gatsby-plugin-webpack-bundle-analyser-v2": "^1.1.32",
-    "prettier": "^3.2.4",
+    "prettier": "^3.2.5",
     "typescript": "^5.3.3"
   },
-  "packageManager": "yarn@4.0.2"
+  "packageManager": "yarn@4.1.0"
 }

src/components/AmeyLiveTrainAnnouncements.tsx

@@ -1049,6 +1049,20 @@ export function LiveTrainAnnouncements<SystemKeys extends string>({
     enabledAnnouncements,
   ])
 
+  const iframeQueryParams = new URLSearchParams({
+    type: displayType,
+    station: selectedCrs,
+    noBg: '1',
+    hideSettings: '1',
+    useLegacyTocNames: useLegacyTocNames ? '1' : '0',
+  })
+
+  Object.entries(systemKeyForPlatform)
+    .filter(([_, system]) => system !== null)
+    .forEach(([p]) => {
+      iframeQueryParams.append('platform', p)
+    })
+
   return (
     <div style={{ width: '100%' }}>
       <label className="option-select" htmlFor="station-select">
@@ -1448,7 +1462,7 @@ export function LiveTrainAnnouncements<SystemKeys extends string>({
                   height: '100%',
                 },
               }}
-              src={`https://raildotmatrix.co.uk/board/?type=${encodeURIComponent(displayType)}&station=${selectedCrs}&noBg=1&hideSettings=1`}
+              src={`https://raildotmatrix.co.uk/board/?${iframeQueryParams}`}
             />
           </FullScreen>
 

src/helpers/crsToStationItemMapper.ts

@@ -3,19 +3,23 @@ import { getStationByCrs } from '@data/StationManipulators'
 import { nanoid } from 'nanoid'
 
 export default function crsToStationItemMapper(crs: string): CallingAtPoint {
+  const stn = getStationByCrs(crs)
+
   return {
     crsCode: crs,
-    name: getStationByCrs(crs)?.stationName ?? null,
+    name: stn ? `${stn.stationName} (${crs})` : `Unknown (${crs})`,
     randomId: nanoid(),
   }
 }
 
 export function stationItemCompleter(point: string | (Partial<CallingAtPoint> & { crsCode: string })): CallingAtPoint {
   const p = typeof point === 'string' ? { crsCode: point } : point
 
+  const stn = getStationByCrs(p.crsCode)
+
   return {
     crsCode: p.crsCode,
-    name: p.name ?? getStationByCrs(p.crsCode)?.stationName ?? null,
+    name: stn ? `${stn.stationName} (${p.crsCode})` : `Unknown (${p.crsCode})`,
     shortPlatform: p.shortPlatform ?? '',
     requestStop: p.requestStop ?? false,
     splitType: p.splitType ?? 'none',

tsconfig.json

@@ -23,8 +23,8 @@
       "@helpers/*": ["./src/helpers/*"],
       "@announcement-data/*": ["./src/announcement-data/*"],
       "@hooks/*": ["./src/hooks/*"],
-      "@assets/*": ["./src/assets/*"],
-    },
+      "@assets/*": ["./src/assets/*"]
+    }
   },
-  "include": ["./src/**/*", "./gatsby-node.ts", "./gatsby-config.ts", "./gatsby-browser.tsx", "./gatsby-ssr.tsx", "./plugins/**/*"],
+  "include": ["./src/**/*", "./gatsby-node.ts", "./gatsby-config.ts", "./gatsby-browser.tsx", "./gatsby-ssr.tsx", "./plugins/**/*"]
 }