Merge remote-tracking branch 'upstream/main'

Mark Jessop · Mark Jessop · commit 173c1dd3b545 · 2024-01-10T16:28:47.000+10:30
diff --git a/js/format.js b/js/format.js
@@ -75,7 +75,7 @@ function formatData(data) {
                     }
                     for (let entry in data[key][i].uploaders) {
                         // This check should probably be done using a modulation field, but this still works I guess..
-                        if (data[key][i].software_name.includes("APRS")) {
+                        if ("software_name" in data[key][i] && data[key][i].software_name.includes("APRS")) {
                             aprsflag = true;
                             var stations = data[key][i].uploaders[entry].uploader_callsign.split(",");
                             for (let uploader in stations) {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ function formatData(data) {`
`75`	`75`	`}`
`76`	`76`	`for (let entry in data[key][i].uploaders) {`
`77`	`77`	`// This check should probably be done using a modulation field, but this still works I guess..`
`78`		`- if (data[key][i].software_name.includes("APRS")) {`
	`78`	`+ if ("software_name" in data[key][i] && data[key][i].software_name.includes("APRS")) {`
`79`	`79`	`aprsflag = true;`
`80`	`80`	`var stations = data[key][i].uploaders[entry].uploader_callsign.split(",");`
`81`	`81`	`for (let uploader in stations) {`