joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added altitude and device info.

Browse Source
This commit is contained in:
Marat Fayzullin 2022-11-29 21:26:51 -05:00
parent c36ec38fbd
commit 22a447f590
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/map.js
View File

@ -142,6 +142,8 @@ $(function(){
marker.band = update.band; marker.band = update.band;
marker.comment = update.location.comment; marker.comment = update.location.comment;
marker.weather = update.location.weather; marker.weather = update.location.weather;
marker.altitude = update.location.altitude;
marker.device = update.location.device;
if (expectedCallsign && expectedCallsign == update.callsign) { if (expectedCallsign && expectedCallsign == update.callsign) {
map.panTo(pos); map.panTo(pos);
@ -424,6 +426,7 @@ $(function(){
var timestring = moment(marker.lastseen).fromNow(); var timestring = moment(marker.lastseen).fromNow();
var commentString = ""; var commentString = "";
var weatherString = ""; var weatherString = "";
var detailsString = "";
var distance = ""; var distance = "";
if (marker.comment) { if (marker.comment) {
@ -453,8 +456,8 @@ $(function(){
); );
} }
if (marker.weather.wind.gusts && (marker.weather.wind.gusts>0)) { if (marker.weather.wind.gust && (marker.weather.wind.gust>0)) {
weatherString += makeListItem('Gusts', marker.weather.wind.gusts.toFixed(1) + ' km/h'); weatherString += makeListItem('Gusts', marker.weather.wind.gust.toFixed(1) + ' km/h');
} }
if (marker.weather.rain && (marker.weather.rain.day>0)) { if (marker.weather.rain && (marker.weather.rain.day>0)) {
@ -472,6 +475,23 @@ $(function(){
weatherString += '</p>'; weatherString += '</p>';
} }
if (marker.altitude || marker.device) {
detailsString += '<p>' + makeListTitle('Details');
if (marker.altitude) {
detailsString += makeListItem('Altitude', marker.altitude + ' m');
}
if (marker.device) {
detailsString += makeListItem('Device',
marker.device.device + " by " +
marker.device.manufacturer
);
}
detailsString += '</p>';
}
if (receiverMarker) { if (receiverMarker) {
distance = " at " + distanceKm(receiverMarker.position, marker.position) + " km"; distance = " at " + distanceKm(receiverMarker.position, marker.position) + " km";
} }
@ -479,7 +499,7 @@ $(function(){
infowindow.setContent( infowindow.setContent(
'<h3>' + linkifyCallsign(callsign) + distance + '</h3>' + '<h3>' + linkifyCallsign(callsign) + distance + '</h3>' +
'<div align="center">' + timestring + ' using ' + marker.mode + ( marker.band ? ' on ' + marker.band : '' ) + '</div>' + '<div align="center">' + timestring + ' using ' + marker.mode + ( marker.band ? ' on ' + marker.band : '' ) + '</div>' +
commentString + weatherString commentString + weatherString + detailsString
); );
infowindow.open(map, marker); infowindow.open(map, marker);

2
owrx/aprs/__init__.py
View File

@ -148,7 +148,7 @@ class AprsLocation(LatLngLocation):
def __dict__(self): def __dict__(self):
res = super(AprsLocation, self).__dict__() res = super(AprsLocation, self).__dict__()
for key in ["comment", "symbol", "course", "speed", "weather"]: for key in ["comment", "symbol", "course", "speed", "altitude", "weather", "device"]:
if key in self.data: if key in self.data:
res[key] = self.data[key] res[key] = self.data[key]
return res return res