Merge branch 'main' of https://github.com/NoobishSVK/fm-dx-webserver

server/datahandler.js

@@ -352,9 +352,31 @@ function handleData(wss, receivedData, rdsWss) {
           modifiedData += errorsNew.toString(16).padStart(2, '0');
         }
 
-        rdsWss.clients.forEach((client) => { // Send to /rds endpoint via WebSocket
+		rdsWss.clients.forEach((client) => {
-          client.send(modifiedData);
+			let dataString = modifiedData.toString();
-        });
+			let lastTwoChars = dataString.slice(-2);
+			let lastByteValue = parseInt(lastTwoChars, 16);
+
+			let truncatedString = dataString.slice(0, -2);
+
+			if ((lastByteValue & 0x03) !== 0) {
+				truncatedString = truncatedString.slice(0, 4) + '----' + truncatedString.slice(8);
+			}
+
+			if ((lastByteValue & 0x30) !== 0) {
+				truncatedString = truncatedString.slice(0, 8) + '----' + truncatedString.slice(12);
+			}
+
+			if ((lastByteValue & 0x0C) !== 0) {
+				truncatedString = truncatedString.slice(0, 12) + '----';
+			}
+
+			let newDataString = "G:\r\n" + truncatedString + "\r\n\r\n";
+
+			let finalBuffer = Buffer.from(newDataString, 'utf-8');
+
+			client.send(finalBuffer);
+		});
 
         rdsparser.parse_string(rds, modifiedData);
         legacyRdsPiBuffer = null;

server/tx_search.js

@@ -98,7 +98,7 @@ function checkEs() {
 
     if (now - esSwitchCache.lastCheck < esFetchInterval) {
         esSwitch = esSwitchCache.esSwitch;
-    } else {
+    } else if (serverConfig.identification.lat > 20) {
         esSwitchCache.lastCheck = now;
         fetch(url)
         .then(response => response.json())