mirror of
https://github.com/Spythere/stacjownik.git
synced 2026-05-03 05:18:11 +00:00
Merge branch 'development'
This commit is contained in:
@@ -243,7 +243,7 @@ export default defineComponent({
|
||||
return this.onlineScenery.scheduledTrains
|
||||
.filter(
|
||||
(ct) =>
|
||||
ct.timetablePathElement.stationName == sceneryName &&
|
||||
// ct.timetablePathElement.stationName == sceneryName &&
|
||||
ct.train.region == this.mainStore.region.id &&
|
||||
this.chosenCheckpoint &&
|
||||
ct.checkpointStop.stopNameRAW.toLowerCase() == this.chosenCheckpoint.toLowerCase()
|
||||
|
||||
@@ -104,7 +104,7 @@ export const useMainStore = defineStore('mainStore', {
|
||||
arrivalRouteExt: arrival,
|
||||
departureRouteExt: departure,
|
||||
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;
|
||||
|
||||
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 });
|
||||
|
||||
|
||||
Reference in New Issue
Block a user