Spythere/stacjownik
1
0
Fork 0
mirror of https://github.com/Spythere/stacjownik.git synced 2026-05-04 05:48:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

przywrócenie SRJP bez pokazywania dod. informacji

Browse Source
This commit is contained in:
Spythere
2024-01-06 14:05:40 +01:00
parent e7f651d2b9
commit f74962222b
1 changed files with 37 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/TrainsView/TrainSchedule.vue
+37 -45
View File
@@ -14,10 +14,7 @@
:data-stop-type="stop.type" :data-stop-type="stop.type"
:data-minor-stop-active="stop.isActive" :data-minor-stop-active="stop.isActive"
:data-last-confirmed="stop.isLastConfirmed" :data-last-confirmed="stop.isLastConfirmed"
:data-track-count-arrival="stop.arrivalTrackCount" x
:data-track-count-departure="stop.departureTrackCount"
:data-electrified-arrival="stop.currentArrivalRoute?.isElectric ?? false"
:data-electrified-departure="stop.currentDepartureRoute?.isElectric ?? false"
> >
<span class="stop_info"> <span class="stop_info">
<span class="distance"> <span class="distance">
@@ -35,13 +32,13 @@
<div class="stop_line" v-if="i < scheduleStops.length - 1"> <div class="stop_line" v-if="i < scheduleStops.length - 1">
<!-- Grid placeholder --> <!-- Grid placeholder -->
<div class="line-speed"> <div>
<div class="speed-departure" v-if="stop.currentDepartureRoute"> <!-- <div class="speed-departure" v-if="stop.currentDepartureRoute">
{{ stop.currentDepartureRoute.routeSpeed }} {{ stop.currentDepartureRoute.routeSpeed }}
</div> </div>
<div class="speed-next-arrival" v-if="stop.nextArrivalRoute"> <div class="speed-next-arrival" v-if="stop.nextArrivalRoute">
{{ stop.nextArrivalRoute.routeSpeed }} {{ stop.nextArrivalRoute.routeSpeed }}
</div> </div> -->
</div> </div>
<div class="progress"> <div class="progress">
@@ -49,10 +46,6 @@
</div> </div>
<div class="bottom-line-info"> <div class="bottom-line-info">
<!-- <div>
{{ stop.sceneryName }}
</div> -->
<div class="info-comments" v-if="stop.comments" style="color: salmon"> <div class="info-comments" v-if="stop.comments" style="color: salmon">
<img src="/images/icon-warning.svg" alt="icon-warning" width="20" /> <img src="/images/icon-warning.svg" alt="icon-warning" width="20" />
<b v-html="stop.comments"></b> <b v-html="stop.comments"></b>
@@ -100,7 +93,6 @@ import StopLabel from './StopLabel.vue';
import StockList from '../Global/StockList.vue'; import StockList from '../Global/StockList.vue';
import { useMainStore } from '../../store/mainStore'; import { useMainStore } from '../../store/mainStore';
import { useApiStore } from '../../store/apiStore'; import { useApiStore } from '../../store/apiStore';
import { StationRoutesInfo } from '../../store/typings';
export interface TrainScheduleStop { export interface TrainScheduleStop {
nameHtml: string; nameHtml: string;
@@ -129,12 +121,12 @@ export interface TrainScheduleStop {
sceneryHash: string; sceneryHash: string;
distance: number; distance: number;
arrivalTrackCount: number; // arrivalTrackCount: number;
departureTrackCount: number; // departureTrackCount: number;
currentArrivalRoute?: StationRoutesInfo; // currentArrivalRoute?: StationRoutesInfo;
currentDepartureRoute?: StationRoutesInfo; // currentDepartureRoute?: StationRoutesInfo;
nextArrivalRoute?: StationRoutesInfo; // nextArrivalRoute?: StationRoutesInfo;
arrivalLine: string | null; arrivalLine: string | null;
departureLine: string | null; departureLine: string | null;
@@ -165,8 +157,8 @@ export default defineComponent({
computed: { computed: {
scheduleStops(): TrainScheduleStop[] { scheduleStops(): TrainScheduleStop[] {
let currentSceneryIndex = 0; let currentSceneryIndex = 0;
let lastDepartureTrackCount = 2; // let lastDepartureTrackCount = 2;
let lastArrivalTrackCount = 2; // let lastArrivalTrackCount = 2;
return ( return (
this.train.timetableData?.followingStops.map((stop, i, arr) => { this.train.timetableData?.followingStops.map((stop, i, arr) => {
@@ -178,32 +170,32 @@ export default defineComponent({
) )
currentSceneryIndex++; currentSceneryIndex++;
const sceneryInfo = this.apiStore.sceneryData.find( // const sceneryInfo = this.apiStore.sceneryData.find(
(sd) => // (sd) =>
sd.name.toLocaleLowerCase() == // sd.name.toLocaleLowerCase() ==
this.timetableSceneryNames[currentSceneryIndex].toLocaleLowerCase() // this.timetableSceneryNames[currentSceneryIndex].toLocaleLowerCase()
); // );
const nextSceneryInfo = this.apiStore.sceneryData.find( // const nextSceneryInfo = this.apiStore.sceneryData.find(
(sd) => // (sd) =>
sd.name.toLocaleLowerCase() == // sd.name.toLocaleLowerCase() ==
this.timetableSceneryNames[currentSceneryIndex + 1]?.toLocaleLowerCase() // this.timetableSceneryNames[currentSceneryIndex + 1]?.toLocaleLowerCase()
); // );
const currentDepartureRoute = sceneryInfo?.routesInfo.find( // const currentDepartureRoute = sceneryInfo?.routesInfo.find(
(r) => r.routeName == stop.departureLine // (r) => r.routeName == stop.departureLine
); // );
const currentArrivalRoute = sceneryInfo?.routesInfo.find( // const currentArrivalRoute = sceneryInfo?.routesInfo.find(
(r) => r.routeName == stop.arrivalLine // (r) => r.routeName == stop.arrivalLine
); // );
const nextArrivalRoute = nextSceneryInfo?.routesInfo.find( // const nextArrivalRoute = nextSceneryInfo?.routesInfo.find(
(r) => r.routeName == arr[i + 1]?.arrivalLine // (r) => r.routeName == arr[i + 1]?.arrivalLine
); // );
lastDepartureTrackCount = currentDepartureRoute?.routeTracks ?? lastDepartureTrackCount; // lastDepartureTrackCount = currentDepartureRoute?.routeTracks ?? lastDepartureTrackCount;
lastArrivalTrackCount = currentArrivalRoute?.routeTracks ?? lastArrivalTrackCount; // lastArrivalTrackCount = currentArrivalRoute?.routeTracks ?? lastArrivalTrackCount;
return { return {
nameHtml: stop.stopName, nameHtml: stop.stopName,
@@ -228,12 +220,12 @@ export default defineComponent({
// arrivalSpeed: nextArrivalRoute?.routeSpeed ?? null, // arrivalSpeed: nextArrivalRoute?.routeSpeed ?? null,
// departureSpeed: currentDepartureRoute?.routeSpeed ?? null, // departureSpeed: currentDepartureRoute?.routeSpeed ?? null,
arrivalTrackCount: currentArrivalRoute?.routeTracks ?? lastArrivalTrackCount, // arrivalTrackCount: currentArrivalRoute?.routeTracks ?? lastArrivalTrackCount,
departureTrackCount: currentDepartureRoute?.routeTracks ?? lastDepartureTrackCount, // departureTrackCount: currentDepartureRoute?.routeTracks ?? lastDepartureTrackCount,
currentArrivalRoute, // currentArrivalRoute,
currentDepartureRoute, // currentDepartureRoute,
nextArrivalRoute, // nextArrivalRoute,
type: stop.stopType, type: stop.stopType,
distance: stop.stopDistance, distance: stop.stopDistance,