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

Addredding jketterl's comments.

This commit is contained in:
Marat Fayzullin 2023-09-18 19:40:19 -04:00
parent 984560ed5b
commit 0ca2f16bd0
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/lib/MapMarkers.js
View File

@ -300,7 +300,7 @@ FeatureMarker.prototype.getAnchorOffset = function() {
FeatureMarker.prototype.getInfoHTML = function(name, receiverMarker = null) { FeatureMarker.prototype.getInfoHTML = function(name, receiverMarker = null) {
var nameString = this.url? Marker.linkify(name, this.url) : name; var nameString = this.url? Marker.linkify(name, this.url) : name;
var commentString = this.comment? '<div align="center">' + this.comment + '</div>' : ''; var commentString = this.comment? '<p align="center">' + this.comment + '</p>' : '';
var detailsString = ''; var detailsString = '';
var scheduleString = ''; var scheduleString = '';
var distance = ''; var distance = '';
@ -335,8 +335,8 @@ FeatureMarker.prototype.getInfoHTML = function(name, receiverMarker = null) {
} }
if (!this.comment && this.status && this.updated) { if (!this.comment && this.status && this.updated) {
commentString = '<div align="center">' + this.status commentString = '<p align="center">' + this.status
+ ', last updated on ' + this.updated + '</div>'; + ', last updated on ' + this.updated + '</p>';
} else { } else {
if (this.status) { if (this.status) {
detailsString += Marker.makeListItem('Status', this.status); detailsString += Marker.makeListItem('Status', this.status);
@ -373,11 +373,11 @@ FeatureMarker.prototype.getInfoHTML = function(name, receiverMarker = null) {
} }
if (detailsString.length > 0) { if (detailsString.length > 0) {
detailsString = '<p>' + Marker.makeListTitle('Details') + detailsString + '</p>'; detailsString = '<div>' + Marker.makeListTitle('Details') + detailsString + '</div>';
} }
if (scheduleString.length > 0) { if (scheduleString.length > 0) {
scheduleString = '<p>' + Marker.makeListTitle('Schedule') + scheduleString + '</p>'; scheduleString = '<div>' + Marker.makeListTitle('Schedule') + scheduleString + '</div>';
} }
if (receiverMarker) { if (receiverMarker) {
@ -406,6 +406,7 @@ AprsMarker.prototype.update = function(update) {
this.hops = update.hops; this.hops = update.hops;
this.band = update.band; this.band = update.band;
this.comment = update.location.comment; this.comment = update.location.comment;
// APRS, AIS
this.weather = update.location.weather; this.weather = update.location.weather;
this.altitude = update.location.altitude; this.altitude = update.location.altitude;
this.height = update.location.height; this.height = update.location.height;
@ -413,6 +414,7 @@ AprsMarker.prototype.update = function(update) {
this.gain = update.location.gain; this.gain = update.location.gain;
this.device = update.location.device; this.device = update.location.device;
this.directivity = update.location.directivity; this.directivity = update.location.directivity;
// HFDL, ACARS, VDL2, ADSB
this.aircraft = update.location.aircraft; this.aircraft = update.location.aircraft;
this.destination = update.location.destination; this.destination = update.location.destination;
this.origin = update.location.origin; this.origin = update.location.origin;
@ -521,12 +523,12 @@ AprsMarker.prototype.getInfoHTML = function(name, receiverMarker = null) {
var distance = ''; var distance = '';
if (this.comment) { if (this.comment) {
commentString += '<p>' + Marker.makeListTitle('Comment') + '<div>' + commentString += '<div>' + Marker.makeListTitle('Comment') + '<div>' +
this.comment + '</div></p>'; this.comment + '</div></div>';
} }
if (this.weather) { if (this.weather) {
weatherString += '<p>' + Marker.makeListTitle('Weather'); weatherString += '<div>' + Marker.makeListTitle('Weather');
if (this.weather.temperature) { if (this.weather.temperature) {
weatherString += Marker.makeListItem('Temperature', this.weather.temperature.toFixed(1) + ' oC'); weatherString += Marker.makeListItem('Temperature', this.weather.temperature.toFixed(1) + ' oC');
@ -565,7 +567,7 @@ AprsMarker.prototype.getInfoHTML = function(name, receiverMarker = null) {
weatherString += Marker.makeListItem('Snow', this.weather.snowfall.toFixed(1) + ' cm'); weatherString += Marker.makeListItem('Snow', this.weather.snowfall.toFixed(1) + ' cm');
} }
weatherString += '</p>'; weatherString += '</div>';
} }
if (this.device) { if (this.device) {
@ -630,7 +632,7 @@ AprsMarker.prototype.getInfoHTML = function(name, receiverMarker = null) {
} }
if (detailsString.length > 0) { if (detailsString.length > 0) {
detailsString = '<p>' + Marker.makeListTitle('Details') + detailsString + '</p>'; detailsString = '<div>' + Marker.makeListTitle('Details') + detailsString + '</div>';
} }
if (receiverMarker) { if (receiverMarker) {
@ -674,7 +676,7 @@ AprsMarker.prototype.getInfoHTML = function(name, receiverMarker = null) {
} }
return '<h3>' + Marker.linkify(name, url, linkEntity) + distance + '</h3>' return '<h3>' + Marker.linkify(name, url, linkEntity) + distance + '</h3>'
+ '<div align="center">' + timeString + ' using ' + this.mode + '<p align="center">' + timeString + ' using ' + this.mode
+ ( this.band ? ' on ' + this.band : '' ) + '</div>' + ( this.band ? ' on ' + this.band : '' ) + '</p>'
+ commentString + weatherString + detailsString + hopsString; + commentString + weatherString + detailsString + hopsString;
}; };

2
owrx/controllers/template.py
View File

@ -43,7 +43,7 @@ class IndexController(WebpageController):
class MapController(WebpageController): class MapController(WebpageController):
def indexAction(self): def indexAction(self):
# TODO check if we have a google maps api key first? # TODO check if we have a google maps api key first?
self.serve_template("map-%s.html" % self.map_type(), **self.template_variables()) self.serve_template("map-{}.html".format(self.map_type()), **self.template_variables())
def header_variables(self): def header_variables(self):
# Invert map type for the "map" toolbar icon # Invert map type for the "map" toolbar icon