From f74962222b5f54bfa755466a102b35aa084b9bc4 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sat, 6 Jan 2024 14:05:40 +0100 Subject: [PATCH] =?UTF-8?q?przywr=C3=B3cenie=20SRJP=20bez=20pokazywania=20?= =?UTF-8?q?dod.=20informacji?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TrainsView/TrainSchedule.vue | 82 ++++++++++----------- 1 file changed, 37 insertions(+), 45 deletions(-) diff --git a/src/components/TrainsView/TrainSchedule.vue b/src/components/TrainsView/TrainSchedule.vue index 2bf8a6f..e4b210d 100644 --- a/src/components/TrainsView/TrainSchedule.vue +++ b/src/components/TrainsView/TrainSchedule.vue @@ -14,10 +14,7 @@ :data-stop-type="stop.type" :data-minor-stop-active="stop.isActive" :data-last-confirmed="stop.isLastConfirmed" - :data-track-count-arrival="stop.arrivalTrackCount" - :data-track-count-departure="stop.departureTrackCount" - :data-electrified-arrival="stop.currentArrivalRoute?.isElectric ?? false" - :data-electrified-departure="stop.currentDepartureRoute?.isElectric ?? false" + x > @@ -35,13 +32,13 @@
-
-
+
+
@@ -49,10 +46,6 @@
- -
icon-warning @@ -100,7 +93,6 @@ import StopLabel from './StopLabel.vue'; import StockList from '../Global/StockList.vue'; import { useMainStore } from '../../store/mainStore'; import { useApiStore } from '../../store/apiStore'; -import { StationRoutesInfo } from '../../store/typings'; export interface TrainScheduleStop { nameHtml: string; @@ -129,12 +121,12 @@ export interface TrainScheduleStop { sceneryHash: string; distance: number; - arrivalTrackCount: number; - departureTrackCount: number; + // arrivalTrackCount: number; + // departureTrackCount: number; - currentArrivalRoute?: StationRoutesInfo; - currentDepartureRoute?: StationRoutesInfo; - nextArrivalRoute?: StationRoutesInfo; + // currentArrivalRoute?: StationRoutesInfo; + // currentDepartureRoute?: StationRoutesInfo; + // nextArrivalRoute?: StationRoutesInfo; arrivalLine: string | null; departureLine: string | null; @@ -165,8 +157,8 @@ export default defineComponent({ computed: { scheduleStops(): TrainScheduleStop[] { let currentSceneryIndex = 0; - let lastDepartureTrackCount = 2; - let lastArrivalTrackCount = 2; + // let lastDepartureTrackCount = 2; + // let lastArrivalTrackCount = 2; return ( this.train.timetableData?.followingStops.map((stop, i, arr) => { @@ -178,32 +170,32 @@ export default defineComponent({ ) currentSceneryIndex++; - const sceneryInfo = this.apiStore.sceneryData.find( - (sd) => - sd.name.toLocaleLowerCase() == - this.timetableSceneryNames[currentSceneryIndex].toLocaleLowerCase() - ); + // const sceneryInfo = this.apiStore.sceneryData.find( + // (sd) => + // sd.name.toLocaleLowerCase() == + // this.timetableSceneryNames[currentSceneryIndex].toLocaleLowerCase() + // ); - const nextSceneryInfo = this.apiStore.sceneryData.find( - (sd) => - sd.name.toLocaleLowerCase() == - this.timetableSceneryNames[currentSceneryIndex + 1]?.toLocaleLowerCase() - ); + // const nextSceneryInfo = this.apiStore.sceneryData.find( + // (sd) => + // sd.name.toLocaleLowerCase() == + // this.timetableSceneryNames[currentSceneryIndex + 1]?.toLocaleLowerCase() + // ); - const currentDepartureRoute = sceneryInfo?.routesInfo.find( - (r) => r.routeName == stop.departureLine - ); + // const currentDepartureRoute = sceneryInfo?.routesInfo.find( + // (r) => r.routeName == stop.departureLine + // ); - const currentArrivalRoute = sceneryInfo?.routesInfo.find( - (r) => r.routeName == stop.arrivalLine - ); + // const currentArrivalRoute = sceneryInfo?.routesInfo.find( + // (r) => r.routeName == stop.arrivalLine + // ); - const nextArrivalRoute = nextSceneryInfo?.routesInfo.find( - (r) => r.routeName == arr[i + 1]?.arrivalLine - ); + // const nextArrivalRoute = nextSceneryInfo?.routesInfo.find( + // (r) => r.routeName == arr[i + 1]?.arrivalLine + // ); - lastDepartureTrackCount = currentDepartureRoute?.routeTracks ?? lastDepartureTrackCount; - lastArrivalTrackCount = currentArrivalRoute?.routeTracks ?? lastArrivalTrackCount; + // lastDepartureTrackCount = currentDepartureRoute?.routeTracks ?? lastDepartureTrackCount; + // lastArrivalTrackCount = currentArrivalRoute?.routeTracks ?? lastArrivalTrackCount; return { nameHtml: stop.stopName, @@ -228,12 +220,12 @@ export default defineComponent({ // arrivalSpeed: nextArrivalRoute?.routeSpeed ?? null, // departureSpeed: currentDepartureRoute?.routeSpeed ?? null, - arrivalTrackCount: currentArrivalRoute?.routeTracks ?? lastArrivalTrackCount, - departureTrackCount: currentDepartureRoute?.routeTracks ?? lastDepartureTrackCount, + // arrivalTrackCount: currentArrivalRoute?.routeTracks ?? lastArrivalTrackCount, + // departureTrackCount: currentDepartureRoute?.routeTracks ?? lastDepartureTrackCount, - currentArrivalRoute, - currentDepartureRoute, - nextArrivalRoute, + // currentArrivalRoute, + // currentDepartureRoute, + // nextArrivalRoute, type: stop.stopType, distance: stop.stopDistance,