1
0
mirror of https://github.com/KubaPro010/fm-dx-webserver.git synced 2026-02-27 06:23:53 +01:00
This commit is contained in:
2026-02-24 22:28:04 +01:00
parent c0d1fee257
commit 42a20330af
2 changed files with 16 additions and 16 deletions

View File

@@ -182,7 +182,7 @@ function getStateForCoordinates(lat, lon) {
*/
function validPsCompare(rdsPs, stationPs) {
if (typeof stationPs !== 'string' || typeof rdsPs !== 'string') {
consoleCmd.logError(`Invalid TX values. stationPs: ${stationPs}, rdsPs: ${rdsPs}`);
consoleCmd.logDebug(`Invalid TX values. stationPs: ${stationPs}, rdsPs: ${rdsPs}`);
return false;
}
@@ -257,15 +257,6 @@ async function fetchTx(freq, piCode, rdsPs) {
stations: [station]
}));
if (filteredLocations.length > 1) {
const extraFilteredLocations = filteredLocations.map(locData => ({
...locData,
stations: locData.stations.filter(station => (station.ps.toLowerCase() === rdsPs.replace(/ /g, '_').toLowerCase()))
})).filter(locData => locData.stations.length > 0);
if (extraFilteredLocations.length > 0) filteredLocations = extraFilteredLocations;
}
// Only check PS if we have more than one match.
if (filteredLocations.length > 1) {
filteredLocations = filteredLocations.map(locData => ({
@@ -273,6 +264,15 @@ async function fetchTx(freq, piCode, rdsPs) {
stations: locData.stations.filter(station => validPsCompare(rdsPs, station.ps))
})).filter(locData => locData.stations.length > 0);
}
if (filteredLocations.length > 1) {
const extraFilteredLocations = filteredLocations.map(locData => ({
...locData,
stations: locData.stations.filter(station => (station.ps?.toLowerCase() === rdsPs.replace(/ /g, '_').toLowerCase()))
})).filter(locData => locData.stations.length > 0);
if (extraFilteredLocations.length > 0) filteredLocations = extraFilteredLocations;
}
for (let loc of filteredLocations) {
loc = Object.assign(loc, loc.stations[0]);