From fba335d0c725d8073e24b9754104e91a992b7748 Mon Sep 17 00:00:00 2001 From: Spythere Date: Fri, 5 Sep 2025 20:03:17 +0200 Subject: [PATCH] fix: scenery without general info shown always as offline; wrong route info for unknown sceneries --- src/components/TrainsView/TrainSchedule.vue | 36 +++++++++------------ 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/src/components/TrainsView/TrainSchedule.vue b/src/components/TrainsView/TrainSchedule.vue index 0128399..1d4bc06 100644 --- a/src/components/TrainsView/TrainSchedule.vue +++ b/src/components/TrainsView/TrainSchedule.vue @@ -186,26 +186,28 @@ export default defineComponent({ const sceneryData = this.store.stationList?.find((sc) => sc.name == pathEl.stationName) ?? null; - if (!sceneryData || !sceneryData.generalInfo) return null; - const activeScenery = this.apiStore.activeData?.activeSceneries?.find( (sc) => sc.stationName == pathEl.stationName ); - const arrivalLineData = pathEl.arrivalRouteExt - ? (sceneryData.generalInfo.routes.all.find( - (rt) => rt.routeName == pathEl.arrivalRouteExt - ) ?? null) + const arrivalLineData = sceneryData?.generalInfo + ? pathEl.arrivalRouteExt + ? (sceneryData.generalInfo.routes.all.find( + (rt) => rt.routeName == pathEl.arrivalRouteExt + ) ?? null) + : null : null; - const departureLineData = pathEl.departureRouteExt - ? (sceneryData.generalInfo.routes.all.find( - (rt) => rt.routeName == pathEl.departureRouteExt - ) ?? null) + const departureLineData = sceneryData?.generalInfo + ? pathEl.departureRouteExt + ? (sceneryData.generalInfo.routes.all.find( + (rt) => rt.routeName == pathEl.departureRouteExt + ) ?? null) + : null : null; return { - generalInfo: sceneryData.generalInfo, + generalInfo: sceneryData?.generalInfo ?? null, isOnline: activeScenery && (activeScenery.isOnline == 1 || activeScenery.lastSeen >= Date.now() - 60000), @@ -234,7 +236,7 @@ export default defineComponent({ let isActive = false; if (pathData?.departureLineData) { - // arrivalLineInfo = pathData.departureLineData; + arrivalLineInfo = pathData.departureLineData; departureLineInfo = pathData.departureLineData; } @@ -245,22 +247,16 @@ export default defineComponent({ isExternal = true; departureLineInfo = pathData?.arrivalLineData ?? null; - - if (pathData?.arrivalLineData) { - arrivalLineInfo = pathData.arrivalLineData; - } + arrivalLineInfo = pathData.arrivalLineData; } - let correctedDepartureLineData: StationRoutesInfo | null = null; - const internalRouteInfo = stop.departureLine - ? pathData?.generalInfo.routes.all.find( + ? pathData?.generalInfo?.routes.all.find( (route) => route.isInternal && route.routeName == stop.departureLine ) : undefined; if (internalRouteInfo) { - correctedDepartureLineData = internalRouteInfo; departureLineInfo = internalRouteInfo; }