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

Tracks connection test improvements

Browse Source 
*Cleaned up tracks connection test code
*Fixed tracks connection test throwing useless warnings with switch tracks (it now may not show some actual warnings but that's not a big case)
This commit is contained in:
izawartka 2025-06-20 22:18:52 +02:00
parent 3be5cd0291
commit 3bc94ce3cf
1 changed files with 42 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/model/tracks-connection-test.js
View File

@ -2,74 +2,51 @@ import SceneryParserLog from './scenery-parser-log';
const connectionThresholdDistanceSq = 0.05;
function trackEndConnectionTest(scenery, track, isPrev) {
const vNext = isPrev ? track.previd : track.nextid;
if (!vNext) return;
const vEndPos = isPrev ? track.points.start : track.points.end;
const vNextTrackId = scenery.getTrackIdByAlias(vNext);
const vNextTrack = scenery.getObject('tracks', vNextTrackId);
if (!vNextTrack) {
SceneryParserLog.warn('tracksConnectionTest', `Track ${track.id} has non-existing ${isPrev ? 'previous' : 'next'} track: ${isPrev ? track.previd : track.nextid} (${vNextTrackId})`);
return;
}
const [vNextTrackNext, vNextTrackPrev] = isPrev ? [vNextTrack.previd, vNextTrack.nextid] : [vNextTrack.nextid, vNextTrack.previd];
const vNextTrackNextId = scenery.getTrackIdByAlias(vNextTrackNext);
const vNextTrackPrevId = scenery.getTrackIdByAlias(vNextTrackPrev);
const directlyConnected = track.aliases.includes(vNextTrackPrevId) || vNextTrackPrevId === track.id;
const reverseConnected = track.aliases.includes(vNextTrackNextId) || vNextTrackNextId === track.id;
const isSwitchBTrackPrev = isPrev && track.id.at(-1) === 'B';
if (directlyConnected) {
const vNextTrackStartPos = isPrev ? vNextTrack.points.end : vNextTrack.points.start;
const distSq = vEndPos.distanceSq(vNextTrackStartPos);
if (distSq > connectionThresholdDistanceSq) {
SceneryParserLog.warn('tracksConnectionTest', `Track ${track.id} with ${isPrev ? 'start' : 'end'} position ${vEndPos.toString()} is too far from the ${isPrev ? 'previous' : 'next'} track ${vNextTrackId} with ${isPrev ? 'end' : 'start'} position ${vNextTrackStartPos.toString()}. Distance: ${Math.sqrt(distSq).toFixed(3)}`);
return;
}
} else if (reverseConnected) {
const vNextTrackEndPos = isPrev ? vNextTrack.points.start : vNextTrack.points.end;
const distSq = vEndPos.distanceSq(vNextTrackEndPos);
if (distSq > connectionThresholdDistanceSq) {
SceneryParserLog.warn('tracksConnectionTest', `Track ${track.id} with ${isPrev ? 'start' : 'end'} position ${vEndPos.toString()} is too far from the ${isPrev ? 'previous' : 'next'} track ${vNextTrackId} with ${isPrev ? 'start' : 'end'} position ${vNextTrackEndPos.toString()}. Distance: ${Math.sqrt(distSq).toFixed(3)}`);
return;
}
} else if(!isSwitchBTrackPrev) {
SceneryParserLog.warn('tracksConnectionTest', `Track ${track.id} ${isPrev ? 'previous' : 'next'} track ${vNextTrackId} does not match its ${isPrev ? 'next' : 'previous'} track id: ${vNextTrackNext} (${vNextTrackNextId}), ${vNextTrackPrev} (${vNextTrackPrevId})`);
return;
}
}
export function tracksConnectionTest(scenery) {
const tracks = scenery.objects['tracks'] || [];
Object.values(tracks).forEach(track => {
const trackStartPos = track.points.start;
const trackEndPos = track.points.end;
const aliases = track.aliases;
if (track.nextid) {
const nextTrackId = scenery.getTrackIdByAlias(track.nextid);
const nextTrack = scenery.getObject('tracks', nextTrackId);
if(!nextTrack) {
SceneryParserLog.warn('tracksConnectionTest', `Track ${track.id} has non-existing next track: ${track.nextid} (${nextTrackId})`);
} else {
const nextTrackPrevTrackId = scenery.getTrackIdByAlias(nextTrack.previd);
const nextTrackNextTrackId = scenery.getTrackIdByAlias(nextTrack.nextid);
const directlyConnected = aliases.includes(nextTrackPrevTrackId) || nextTrackPrevTrackId === track.id;
const reverseConnected = aliases.includes(nextTrackNextTrackId) || nextTrackNextTrackId === track.id;
const connectionError = !directlyConnected && !reverseConnected;
if (connectionError) {
SceneryParserLog.warn('tracksConnectionTest', `Track ${track.id} next track ${nextTrackId} does not match its previous or next track id: ${nextTrack.previd} (${nextTrackPrevTrackId}), ${nextTrack.nextid} (${nextTrackNextTrackId})`);
} else if (directlyConnected) {
const nextTrackStartPos = nextTrack.points.start;
const distSq = trackEndPos.distanceSq(nextTrackStartPos);
if (distSq > connectionThresholdDistanceSq) {
SceneryParserLog.warn('tracksConnectionTest', `Track ${track.id} with end position ${trackEndPos.toString()} is too far from the next track ${nextTrackId} with start position ${nextTrackStartPos.toString()}. Distance: ${Math.sqrt(distSq).toFixed(3)}`);
}
} else if (reverseConnected) {
const nextTrackEndPos = nextTrack.points.end;
const distSq = trackEndPos.distanceSq(nextTrackEndPos);
if (distSq > connectionThresholdDistanceSq) {
SceneryParserLog.warn('tracksConnectionTest', `Track ${track.id} with end position ${trackEndPos.toString()} is too far from the next track ${nextTrackId} with end position ${nextTrackEndPos.toString()}. Distance: ${Math.sqrt(distSq).toFixed(3)}`);
}
}
}
}
if (track.previd) {
const prevTrackId = scenery.getTrackIdByAlias(track.previd);
const prevTrack = scenery.getObject('tracks', prevTrackId);
if(!prevTrack) {
SceneryParserLog.warn('tracksConnectionTest', `Track ${track.id} has non-existing previous track: ${track.previd} (${prevTrackId})`);
} else {
const prevTrackNextTrackId = scenery.getTrackIdByAlias(prevTrack.nextid);
const prevTrackPrevTrackId = scenery.getTrackIdByAlias(prevTrack.previd);
const directlyConnected = track.aliases.includes(prevTrackNextTrackId) || prevTrackNextTrackId === track.id;
const reverseConnected = track.aliases.includes(prevTrackPrevTrackId) || prevTrackPrevTrackId === track.id;
const connectionError = !directlyConnected && !reverseConnected;
if (connectionError) {
SceneryParserLog.warn('tracksConnectionTest', `Track ${track.id} previous track ${prevTrackId} does not match its next or previous track id: ${prevTrack.nextid} (${prevTrackNextTrackId}), ${prevTrack.previd} (${prevTrackPrevTrackId})`);
} else if (directlyConnected) {
const prevTrackEndPos = prevTrack.points.end;
const distSq = trackStartPos.distanceSq(prevTrackEndPos);
if (distSq > connectionThresholdDistanceSq) {
SceneryParserLog.warn('tracksConnectionTest', `Track ${track.id} with start position ${trackStartPos.toString()} is too far from the previous track ${prevTrackId} with end position ${prevTrackEndPos.toString()}. Distance: ${Math.sqrt(distSq).toFixed(3)}`);
}
} else if (reverseConnected) {
const prevTrackStartPos = prevTrack.points.start;
const distSq = trackStartPos.distanceSq(prevTrackStartPos);
if (distSq > connectionThresholdDistanceSq) {
SceneryParserLog.warn('tracksConnectionTest', `Track ${track.id} with start position ${trackStartPos.toString()} is too far from the previous track ${prevTrackId} with start position ${prevTrackStartPos.toString()}. Distance: ${Math.sqrt(distSq).toFixed(3)}`);
}
}
}
}
trackEndConnectionTest(scenery, track, false);
trackEndConnectionTest(scenery, track, true);
});
}