flightsimulatorplatfrom/OpenSquawk
1
0
Fork 0
mirror of https://github.com/OpenSquawk/OpenSquawk synced 2026-08-01 06:06:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(pm): accept any published frequency for a position (#43)

Browse Source 
The wrong-frequency gate now accepts any of the frequencies a logical
position publishes (e.g. EDDM has two Tower frequencies, 118.700 and
120.500); expectedFrequencyForState() still returns the primary for the
"contact X on <freq>" prompt. Falls back to the single expected value
when no frequency list resolves.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
leubeem
2026-06-29 06:21:48 +02:00
parent 31e58d1a2e
commit 2773f70ed8
1 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/pages/pm.vue
View File

@@ -1577,6 +1577,32 @@ function expectedFrequencyForState(): string | null {
return airportFreqMap.value[varKey] ?? ((vars as any).value[varKey] as string ?? null)
}
// All real frequencies published for a logical position. Some airports list
// several for the same role (e.g. EDDM has two Tower frequencies, 118.700 and
// 120.500) — the wrong-frequency gate accepts ANY of them, while
// expectedFrequencyForState() still returns the primary one for the prompt.
const airportFreqListMap = computed<Record<string, string[]>>(() => {
const result: Record<string, string[]> = {}
for (const entry of airportFrequencies.value) {
const key = frequencyTypeMap[entry.type]
if (key && entry.frequency) {
(result[key] ||= []).push(entry.frequency)
}
}
return result
})
function acceptedFrequenciesForState(): string[] {
const freqName = (currentState.value as any)?.frequency_name as string | undefined
if (!freqName) return []
const varKey = FREQ_NAME_TO_VAR[freqName.toLowerCase()]
if (!varKey) return []
const all = [...(airportFreqListMap.value[varKey] ?? [])]
const fromVars = (vars as any).value[varKey] as string | undefined
if (fromVars) all.push(fromVars)
return Array.from(new Set(all.map(normalizedFrequencyValue).filter(Boolean)))
}
const lastTransmission = ref('')
const lastTransmissionFaulty = ref(false)
const lastTransmissionFaultNote = ref('')
@@ -3228,9 +3254,16 @@ const handlePilotTransmission = async (message: string, source: 'text' | 'ptt' =
}
// --- Frequency check ---
// Reject the transmission if the pilot is on the wrong frequency.
// Reject the transmission if the pilot is on the wrong frequency. A position
// can publish several valid frequencies (e.g. two Tower freqs); accept any of
// them, and only fall back to the single expected value when no list resolves.
const expectedFreq = expectedFrequencyForState()
if (expectedFreq && frequencies.value.active !== expectedFreq) {
const acceptedFreqs = acceptedFrequenciesForState()
const activeNorm = normalizedFrequencyValue(frequencies.value.active)
const onValidFreq = acceptedFreqs.length
? acceptedFreqs.includes(activeNorm)
: frequencies.value.active === expectedFreq
if (expectedFreq && !onValidFreq) {
const callsign = (vars as any).value?.callsign ?? ''
const freqName = (currentState.value as any)?.frequency_name as string | undefined
// Tell the pilot exactly which frequency to switch to (and the position),