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

chore: add vmax of internal routes

Browse Source
This commit is contained in:
Spythere
2025-01-27 15:02:41 +01:00
parent 3add3db2f2
commit 745b769070
2 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.vue
+28 -21
View File
@@ -240,7 +240,6 @@
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import sceneryCorrections from './data/corrections.json';
import type { ActiveTrain } from './types/common.types'; import type { ActiveTrain } from './types/common.types';
import { version } from '../package.json'; import { version } from '../package.json';
@@ -357,7 +356,6 @@ export default defineComponent({
arrivalLineData, arrivalLineData,
departureLine: departureLine ?? '', departureLine: departureLine ?? '',
departureLineData, departureLineData,
lineCorrections: sceneryCorrections.find((sc) => sc.sceneryName == sceneryName)?.lineCorrections ?? [],
}; };
}); });
@@ -375,13 +373,18 @@ export default defineComponent({
let departureSpeed = currentPath.departureLineData?.routeSpeed ?? 0, let departureSpeed = currentPath.departureLineData?.routeSpeed ?? 0,
departureTracks = currentPath.departureLineData?.routeTracks ?? 2; departureTracks = currentPath.departureLineData?.routeTracks ?? 2;
let realLineNo = 0;
// console.log('=========== ' + this.selectedTrain.trainNo + ' ==========='); // console.log('=========== ' + this.selectedTrain.trainNo + ' ===========');
for (const stop of timetable.stopList) { for (const stop of timetable.stopList) {
if (stop.arrivalLine && stop.arrivalLine == currentPath.arrivalLine) { if (stop.arrivalLine && stop.arrivalLine == currentPath.arrivalLine) {
arrivalKm = stop.stopDistance; arrivalKm = stop.stopDistance;
arrivalSpeed = currentPath.arrivalLineData?.routeSpeed ?? 0;
arrivalTracks = currentPath.arrivalLineData?.routeTracks ?? 2; if (currentPath.arrivalLineData) {
arrivalSpeed = currentPath.arrivalLineData.routeSpeed;
arrivalTracks = currentPath.arrivalLineData.routeTracks;
}
departureSpeed = arrivalSpeed; departureSpeed = arrivalSpeed;
departureTracks = arrivalTracks; departureTracks = arrivalTracks;
@@ -391,15 +394,16 @@ export default defineComponent({
let correctedDepartureSpeed = 0, let correctedDepartureSpeed = 0,
correctedDepartureTracks = 0; correctedDepartureTracks = 0;
const lineCorrection = const internalRouteInfo = stop.departureLine
stop.departureLine != null ? currentPath.lineCorrections.find((corr) => corr.lineName == stop.departureLine) : undefined; ? currentPath.sceneryData?.routesInfo.find((route) => route.isInternal && route.routeName == stop.departureLine)
: undefined;
if (lineCorrection) { if (internalRouteInfo) {
correctedDepartureSpeed = lineCorrection.departureSpeed; correctedDepartureSpeed = internalRouteInfo.routeSpeed;
departureSpeed = lineCorrection.departureSpeed; departureSpeed = internalRouteInfo.routeSpeed;
correctedDepartureTracks = lineCorrection.departureTracks; correctedDepartureTracks = internalRouteInfo.routeTracks;
departureTracks = lineCorrection.departureTracks; departureTracks = internalRouteInfo.routeTracks;
} }
let rowData: StopRow = { let rowData: StopRow = {
@@ -411,7 +415,7 @@ export default defineComponent({
stopTime: stop.stopTime ? (stop.departureTimestamp - stop.arrivalTimestamp) / 60000 : 0, stopTime: stop.stopTime ? (stop.departureTimestamp - stop.arrivalTimestamp) / 60000 : 0,
stopType: stop.stopType, stopType: stop.stopType,
sceneryName: currentPath.sceneryName, sceneryName: currentPath.sceneryName,
realLine: '-', realLine: realLineNo == 0 ? ' - ' : realLineNo.toString(),
driveTime: lastDepartureTimestamp ? stop.arrivalTimestamp - lastDepartureTimestamp : 0, driveTime: lastDepartureTimestamp ? stop.arrivalTimestamp - lastDepartureTimestamp : 0,
additionalAbbrevs: [], additionalAbbrevs: [],
controlAbbrevs: [], controlAbbrevs: [],
@@ -445,17 +449,20 @@ export default defineComponent({
if (stop.departureLine && stop.departureLine == currentPath.departureLine) { if (stop.departureLine && stop.departureLine == currentPath.departureLine) {
// Reverse search for last scenery checkpoint // Reverse search for last scenery checkpoint
for (let i = stopRows.length - 1; i > 0; i--) { for (let i = stopRows.length - 1; i > 0; i--) {
stopRows[i].departureTracks = currentPath.departureLineData?.routeTracks ?? 0; if (currentPath.departureLineData) {
stopRows[i].departureSpeed = currentPath.departureLineData?.routeSpeed ?? 0; stopRows[i].departureTracks = currentPath.departureLineData.routeTracks;
stopRows[i].departureSpeed = currentPath.departureLineData.routeSpeed;
stopRows[i].realLine = currentPath.departureLineData.realLineNo?.toString() ?? ' - ';
if (stopRows[i].isMain || stopRows[i].pointName.endsWith(', podg')) { if (stopRows[i].isMain || stopRows[i].pointName.endsWith(', podg')) {
stopRows[i].departureSpeed = currentPath.departureLineData?.routeSpeed ?? 0; stopRows[i].departureSpeed = currentPath.departureLineData.routeSpeed;
stopRows[i].departureTracks = currentPath.departureLineData?.routeTracks ?? 0; stopRows[i].departureTracks = currentPath.departureLineData.routeTracks;
break; break;
}
stopRows[i].arrivalSpeed = currentPath.departureLineData.routeSpeed;
stopRows[i].arrivalTracks = currentPath.departureLineData.routeTracks;
} }
stopRows[i].arrivalSpeed = currentPath.departureLineData?.routeSpeed ?? 0;
stopRows[i].arrivalTracks = currentPath.departureLineData?.routeTracks ?? 0;
} }
currentPath = timetablePath[++currentPathIndex]; currentPath = timetablePath[++currentPathIndex];
src/types/common.types.ts
+1
View File
@@ -119,4 +119,5 @@ export interface SceneryRoute {
routeLength: number; routeLength: number;
routeTracks: number; routeTracks: number;
hidden?: boolean; hidden?: boolean;
realLineNo?: number;
} }