mirror of
https://github.com/Spythere/stacjownik.git
synced 2026-05-03 05:18:11 +00:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e43f1e0819 | |||
| f130e6900b | |||
| db205915be | |||
| 05c38e10e3 | |||
| a8f683a585 |
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "stacjownik",
|
||||
"version": "1.20.2",
|
||||
"version": "1.20.3",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
@@ -29,8 +29,9 @@
|
||||
<span
|
||||
v-if="
|
||||
stop.duration ||
|
||||
(stop.status == 'stopped' && stop.position != 'begin') ||
|
||||
stop.departureDelay != stop.arrivalDelay
|
||||
(stop.status == 'stopped' &&
|
||||
stop.position != 'begin' &&
|
||||
stop.departureDelay != stop.arrivalDelay)
|
||||
"
|
||||
class="date stop"
|
||||
:data-stop-types="stop.type.replace(', ', '-')"
|
||||
|
||||
@@ -30,19 +30,12 @@
|
||||
<StopLabel :stop="stop" />
|
||||
</span>
|
||||
|
||||
<div class="stop_line" v-if="i < scheduleStops.length - 1">
|
||||
<div class="stop_line">
|
||||
<!-- Grid placeholder -->
|
||||
<div>
|
||||
<!-- <div class="speed-departure" v-if="stop.currentDepartureRoute">
|
||||
{{ stop.currentDepartureRoute.routeSpeed }}
|
||||
</div>
|
||||
<div class="speed-next-arrival" v-if="stop.nextArrivalRoute">
|
||||
{{ stop.nextArrivalRoute.routeSpeed }}
|
||||
</div> -->
|
||||
</div>
|
||||
<div></div>
|
||||
|
||||
<div class="progress">
|
||||
<div class="line line_connection"></div>
|
||||
<div class="line line_connection" v-if="i < scheduleStops.length - 1"></div>
|
||||
</div>
|
||||
|
||||
<div class="bottom-line-info">
|
||||
@@ -121,13 +114,6 @@ export interface TrainScheduleStop {
|
||||
sceneryHash: string;
|
||||
distance: number;
|
||||
|
||||
// arrivalTrackCount: number;
|
||||
// departureTrackCount: number;
|
||||
|
||||
// currentArrivalRoute?: StationRoutesInfo;
|
||||
// currentDepartureRoute?: StationRoutesInfo;
|
||||
// nextArrivalRoute?: StationRoutesInfo;
|
||||
|
||||
arrivalLine: string | null;
|
||||
departureLine: string | null;
|
||||
|
||||
@@ -157,8 +143,6 @@ export default defineComponent({
|
||||
computed: {
|
||||
scheduleStops(): TrainScheduleStop[] {
|
||||
let currentSceneryIndex = 0;
|
||||
// let lastDepartureTrackCount = 2;
|
||||
// let lastArrivalTrackCount = 2;
|
||||
|
||||
return (
|
||||
this.train.timetableData?.followingStops.map((stop, i, arr) => {
|
||||
@@ -170,33 +154,6 @@ export default defineComponent({
|
||||
)
|
||||
currentSceneryIndex++;
|
||||
|
||||
// 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 currentDepartureRoute = sceneryInfo?.routesInfo.find(
|
||||
// (r) => r.routeName == stop.departureLine
|
||||
// );
|
||||
|
||||
// const currentArrivalRoute = sceneryInfo?.routesInfo.find(
|
||||
// (r) => r.routeName == stop.arrivalLine
|
||||
// );
|
||||
|
||||
// const nextArrivalRoute = nextSceneryInfo?.routesInfo.find(
|
||||
// (r) => r.routeName == arr[i + 1]?.arrivalLine
|
||||
// );
|
||||
|
||||
// lastDepartureTrackCount = currentDepartureRoute?.routeTracks ?? lastDepartureTrackCount;
|
||||
// lastArrivalTrackCount = currentArrivalRoute?.routeTracks ?? lastArrivalTrackCount;
|
||||
|
||||
return {
|
||||
nameHtml: stop.stopName,
|
||||
nameRaw: stop.stopNameRAW,
|
||||
@@ -217,16 +174,6 @@ export default defineComponent({
|
||||
arrivalLine: stop.arrivalLine,
|
||||
departureLine: stop.departureLine,
|
||||
|
||||
// arrivalSpeed: nextArrivalRoute?.routeSpeed ?? null,
|
||||
// departureSpeed: currentDepartureRoute?.routeSpeed ?? null,
|
||||
|
||||
// arrivalTrackCount: currentArrivalRoute?.routeTracks ?? lastArrivalTrackCount,
|
||||
// departureTrackCount: currentDepartureRoute?.routeTracks ?? lastDepartureTrackCount,
|
||||
|
||||
// currentArrivalRoute,
|
||||
// currentDepartureRoute,
|
||||
// nextArrivalRoute,
|
||||
|
||||
type: stop.stopType,
|
||||
distance: stop.stopDistance,
|
||||
isActive: this.activeMinorStops.includes(i),
|
||||
|
||||
@@ -8732,7 +8732,7 @@
|
||||
"departureDelay": 0,
|
||||
"beginsHere": true,
|
||||
"terminatesHere": false,
|
||||
"confirmed": 0,
|
||||
"confirmed": 1,
|
||||
"stopped": 0,
|
||||
"stopTime": null
|
||||
},
|
||||
@@ -9380,7 +9380,7 @@
|
||||
"stopType": "",
|
||||
"stopDistance": 123.62,
|
||||
"pointId": "1663532077406",
|
||||
"comments": null,
|
||||
"comments": "test121",
|
||||
"mainStop": true,
|
||||
"arrivalLine": "Sk",
|
||||
"arrivalTimestamp": 1701889320000,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user