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

Now reporting ship markers as coming from AIS.

This commit is contained in:
Marat Fayzullin 2023-02-26 12:31:48 -05:00
parent f09dea90de
commit 7a1a03e4b9
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/lib/MessagePanel.js
View File

@ -131,7 +131,7 @@ function PacketMessagePanel(el) {
PacketMessagePanel.prototype = new MessagePanel();
PacketMessagePanel.prototype.supportsMessage = function(message) {
return message['mode'] === 'APRS';
return (message['mode'] === 'APRS') || (message['mode'] === 'AIS');
};
PacketMessagePanel.prototype.render = function() {

9
owrx/aprs/__init__.py
View File

@ -190,15 +190,17 @@ class AprsParser(PickleModule):
# TODO how can we tell if this is an APRS frame at all?
aprsData = self.parseAprsData(data)
# the frontend uses this to distinguish messages from the different parsers
aprsData["mode"] = "AIS" if aprsData.get("source")=="AIS" else "APRS"
logger.debug("decoded APRS data: %s", aprsData)
self.updateMap(aprsData)
self.getMetric("total").inc()
if self.isDirect(aprsData):
self.getMetric("direct").inc()
# the frontend uses this to distinguis hessages from the different parsers
aprsData["mode"] = "APRS"
return aprsData
except Exception:
logger.exception("exception while parsing aprs data")
@ -213,7 +215,8 @@ class AprsParser(PickleModule):
source = mapData["item"]
elif mapData["type"] == "object":
source = mapData["object"]
Map.getSharedInstance().updateLocation(source, loc, "APRS", self.band)
# Map.getSharedInstance().updateLocation(source, loc, "APRS", self.band)
Map.getSharedInstance().updateLocation(source, loc, mapData["mode"], self.band)
def hasCompressedCoordinates(self, raw):
return raw[0] == "/" or raw[0] == "\\"