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

Merge branch 'development'

Browse Source
This commit is contained in:
Spythere
2024-08-09 14:12:07 +02:00
parent 766b08bc15 cd1a4fa734
commit a17bf6c03f
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/SceneryView/SceneryTimetable.vue
+1 -1
View File
@@ -243,7 +243,7 @@ export default defineComponent({
return this.onlineScenery.scheduledTrains return this.onlineScenery.scheduledTrains
.filter( .filter(
(ct) => (ct) =>
ct.timetablePathElement.stationName == sceneryName && // ct.timetablePathElement.stationName == sceneryName &&
ct.train.region == this.mainStore.region.id && ct.train.region == this.mainStore.region.id &&
this.chosenCheckpoint && this.chosenCheckpoint &&
ct.checkpointStop.stopNameRAW.toLowerCase() == this.chosenCheckpoint.toLowerCase() ct.checkpointStop.stopNameRAW.toLowerCase() == this.chosenCheckpoint.toLowerCase()
src/store/mainStore.ts
+6 -2
View File
@@ -104,7 +104,7 @@ export const useMainStore = defineStore('mainStore', {
arrivalRouteExt: arrival, arrivalRouteExt: arrival,
departureRouteExt: departure, departureRouteExt: departure,
stationName: station.split(' ').slice(0, -1).join(' '), stationName: station.split(' ').slice(0, -1).join(' '),
stationHash: station.split(' ').slice(-1).join(' ') stationHash: station.split(' ').slice(-1).join(' ').replace('.sc', '')
}; };
}) })
} }
@@ -281,7 +281,11 @@ export const useMainStore = defineStore('mainStore', {
if (!scheduledTrains) return; if (!scheduledTrains) return;
scheduledTrains.forEach(({ train, checkpointStop, timetablePathElement, ...v }) => { scheduledTrains.forEach(({ train, checkpointStop, timetablePathElement, ...v }) => {
if (scenery.name != timetablePathElement.stationName) return; if (
scenery.name != timetablePathElement.stationName &&
scenery.hash != timetablePathElement.stationHash
)
return;
scenery.scheduledTrains.push({ train, checkpointStop, timetablePathElement, ...v }); scenery.scheduledTrains.push({ train, checkpointStop, timetablePathElement, ...v });