izawartka/td2-visualizer
izawartka/td2-visualizer
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved ElectrificationResolver

Browse Source 
*Updated ElectrificationResolver to use the new tracks connections logic
*Improved ElectrificationResolver status propagation for switches
*Fixed an issue where ElectrificationResolver would sometimes overwrite tracks having the CONFLICT status
This commit is contained in:
izawartka 2025-07-11 01:12:49 +02:00
parent db45de37b9
commit adb1a4078f
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/model/electrification-resolver.js
View File

@ -115,6 +115,9 @@ export default class ElectrificationResolver {
if (Constants.parser.skipElectrificationErrorsPropagation && status === ElectrificationStatus.CONFLICT) {
return;
}
if (track.electrificationStatus === ElectrificationStatus.CONFLICT) {
return;
}
const fse = status === ElectrificationStatus.ELECTRIFIED;
const fsne = status === ElectrificationStatus.NON_ELECTRIFIED;
@ -130,33 +133,28 @@ export default class ElectrificationResolver {
track.electrificationStatus = ElectrificationStatus.CONFLICT;
ElectrificationResolver._passWarn(
'electrificationConflict',
`Track ${track.id} has conflicting electrification status`
`Track ${track.id} has conflicting electrification status (=>${status})`
);
return;
}
const propagation = [
track.nextid,
track.previd
];
const propagation = track.connections.map(conn => conn.otherTrack);
const nextSkipIds = [track.id];
if (track.switch && !track.hasNEVP && track.switch.def[2].length > 2) {
propagation.push(
track.switch.trackA?.id,
track.switch.trackB?.id
);
if (track.switch) {
nextSkipIds.push(track.switch.trackA.id, track.switch.trackB.id);
}
const skipIds = [track.id, ...propagation];
propagation.forEach(nextTrack => {
if (skipTrackIds.includes(nextTrack.id)) return;
propagation.forEach(next => {
if (!next) return;
if (skipTrackIds.includes(next)) return;
const nextTrackId = scenery.getTrackIdByAlias(next);
if (!nextTrackId || skipTrackIds.includes(nextTrackId)) return;
const nextTrack = scenery.getObject('tracks', nextTrackId);
if (!nextTrack) return;
this._propagate(scenery, nextTrack, skipIds, track.electrificationStatus);
this._propagate(scenery, nextTrack, nextSkipIds, track.electrificationStatus);
});
// Additional propagation for double switches
if (!track.switch || track.switch.def?.[2]?.length <= 2 || track.hasNEVP) return;
const otherSwitchTrack = track.switch.trackA === track ? track.switch.trackB : track.switch.trackA;
this._propagate(scenery, otherSwitchTrack, [track.id, ...propagation.map(track => track.id)], track.electrificationStatus);
}
};