ua1zbe
/
openwebrxplus
mirror of https://github.com/luarvique/openwebrx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improving code.

This commit is contained in:
Marat Fayzullin 2023-02-26 11:51:33 -05:00
parent 28f424a318
commit f09dea90de
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/map.js
View File

@ -521,12 +521,19 @@ $(function(){
detailsString += makeListItem('Direction', marker.directivity);
}
if (marker.speed) {
detailsString += makeListItem('Speed', marker.speed.toFixed(1) + " km/h");
}
if (marker.course) {
detailsString += makeListItem('Course', degToCompass(marker.course));
// Combine course and speed if both present
if (marker.course && marker.speed) {
detailsString += makeListItem('Course',
degToCompass(marker.course) + " " +
marker.speed.toFixed(1) + " km/h"
);
} else {
if (marker.course) {
detailsString += makeListItem('Course', degToCompass(marker.course));
}
if (marker.speed) {
detailsString += makeListItem('Speed', marker.speed.toFixed(1) + " km/h");
}
}
if (detailsString.length > 0) {

16
owrx/aprs/__init__.py
View File

@ -473,11 +473,11 @@ class AprsParser(PickleModule):
# Only parsing "AIVDM" messages
result = { "type": "nmea", "nmea_type": information[3:8] }
if information[0:8] != "DA!AIVDM":
if information[3:8] != "AIVDM":
return result
data = information.split(",")
msg = ""
out = b""
buf = 0
cnt = 0
@ -491,19 +491,19 @@ class AprsParser(PickleModule):
else:
buf = buf<<6
# Print a new byte once we have got 8 bits
# Output a new byte once we have got 8 bits
cnt += 6
if cnt>=8:
msg += " %02X" % (buf >> (cnt-8))
out += bytes([buf >> (cnt-8)])
buf &= (1 << (cnt-8)) - 1
cnt -= 8
# Print final bits
# Output final bits
if cnt>0:
msg += " %02X" % buf
out += bytes([buf])
# Skip the initial space
result["message"] = msg[1:]
# For now, just pring data in hex
result["message"] = " ".join(["%02X" % x for x in out])
return result