Spythere/stacjownik
1
0
Fork 0
mirror of https://github.com/Spythere/stacjownik.git synced 2026-05-03 21:38:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

checkpointy; hotfixy

Browse Source
This commit is contained in:
Spythere
2024-02-10 22:42:35 +01:00
parent fc0c04ec9d
commit 90b2099955
11 changed files with 83 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/store/utils.ts
+29 -60
View File
@@ -102,51 +102,33 @@ export function getCheckpointTrain(
let prevStationName = '',
nextStationName = '';
let prevDepartureLine: string | null = null,
nextArrivalLine: string | null = null;
for (let i = trainStopIndex - 1; i >= 0; i--) {
if (/strong|podg/g.test(followingStops[i].stopName)) {
prevStationName = followingStops[i].stopNameRAW.replace(/,.*/g, '');
break;
}
}
for (let i = trainStopIndex + 1; i < followingStops.length; i++) {
if (/strong|podg/g.test(followingStops[i].stopName)) {
nextStationName = followingStops[i].stopNameRAW.replace(/,.*/g, '');
break;
}
}
let departureLine: string | null = null;
let arrivingLine: string | null = null;
for (let i = trainStopIndex; i < followingStops.length; i++) {
const currentStop = followingStops[i];
let prevDepartureLine: string | null = null,
nextArrivalLine: string | null = null;
if (currentStop.departureLine == null) continue;
for (let i = trainStopIndex; i >= 0; i--) {
const stop = followingStops[i];
if (!/-|_|it|sbl/gi.test(currentStop.departureLine)) {
departureLine = currentStop.departureLine;
nextArrivalLine = followingStops[i + 1]?.arrivalLine || null;
if (/strong|podg/g.test(stop.stopName) && !prevStationName && i <= trainStopIndex - 1)
prevStationName = stop.stopNameRAW.replace(/,.*/g, '');
break;
if (stop.arrivalLine != null && !arrivingLine && !/-|_|it|sbl/gi.test(stop.arrivalLine)) {
arrivingLine = stop.arrivalLine;
prevDepartureLine = followingStops[i - 1]?.departureLine || null;
}
}
for (let i = trainStopIndex; i >= 0; i--) {
const currentStop = followingStops[i];
for (let i = trainStopIndex; i < followingStops.length; i++) {
const stop = followingStops[i];
if (currentStop.arrivalLine == null) continue;
if (/strong|podg/g.test(stop.stopName) && !nextStationName && i > trainStopIndex)
nextStationName = stop.stopNameRAW.replace(/,.*/g, '');
if (!/-|_|it|sbl/gi.test(currentStop.arrivalLine)) {
arrivingLine = currentStop.arrivalLine;
prevDepartureLine = followingStops[i - 1]?.departureLine || null;
break;
if (stop.departureLine && !departureLine && !/-|_|it|sbl/gi.test(stop.departureLine)) {
departureLine = stop.departureLine;
nextArrivalLine = followingStops[i + 1]?.arrivalLine || null;
}
}
@@ -177,8 +159,8 @@ export function getCheckpointTrain(
region: train.region,
arrivingLine,
departureLine,
arrivingLine: arrivingLine,
departureLine: departureLine,
nextArrivalLine,
prevDepartureLine
@@ -192,7 +174,7 @@ export function getScheduledTrains(
region: string
// sceneryData: API.ActiveSceneries.Data,
): ScheduledTrain[] {
stationGeneralInfo?.checkpoints.forEach((cp) => (cp.scheduledTrains.length = 0));
// stationGeneralInfo?.checkpoints.forEach((cp) => (cp.scheduledTrains.length = 0));
return trainList.reduce((acc: ScheduledTrain[], train) => {
if (!train.timetableData) return acc;
@@ -201,32 +183,19 @@ export function getScheduledTrains(
const timetable = train.timetableData;
if (!timetable.sceneryNames.includes(stationName)) return acc;
const stopInfoIndex = timetable.followingStops.findIndex((stop) => {
return stationName.toLocaleLowerCase() == stop.stopNameRAW.toLocaleLowerCase();
});
const checkpoints = [stationName];
if (stationGeneralInfo?.checkpoints) checkpoints.push(...stationGeneralInfo.checkpoints);
const checkpointScheduledTrains: ScheduledTrain[] = [];
if (stopInfoIndex != -1) {
checkpointScheduledTrains.push(getCheckpointTrain(train, stopInfoIndex, stationName));
}
stationGeneralInfo?.checkpoints?.forEach((checkpoint) => {
for (let i = 0; i < timetable.followingStops.length; i++) {
if (
checkpointScheduledTrains.findIndex(
(cpTrain) =>
cpTrain.checkpointName.toLocaleLowerCase() ==
checkpoint.checkpointName.toLocaleLowerCase()
) != -1
)
return;
const index = timetable.followingStops.findIndex(
(stop) => stop.stopNameRAW.toLowerCase() == checkpoint.checkpointName.toLowerCase()
);
if (index > -1) checkpointScheduledTrains.push(getCheckpointTrain(train, index, stationName));
});
new RegExp(`^(${checkpoints.join('|')})$`, 'i').test(
timetable.followingStops[i].stopNameRAW
)
) {
checkpointScheduledTrains.push(getCheckpointTrain(train, i, stationName));
}
}
acc.push(...checkpointScheduledTrains);
return acc;