From 26171a69f3a6b00274cd84cbea2858757e755d7b Mon Sep 17 00:00:00 2001 From: "Stanislav Lechev [0xAF]" Date: Thu, 21 Sep 2023 00:37:14 +0300 Subject: [PATCH] bring back distance from receiver marker --- htdocs/lib/MapMarkers.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/lib/MapMarkers.js b/htdocs/lib/MapMarkers.js index 973deef1..f3100803 100644 --- a/htdocs/lib/MapMarkers.js +++ b/htdocs/lib/MapMarkers.js @@ -278,7 +278,7 @@ FeatureMarker.prototype.getAnchorOffset = function() { return [0, -this.symHeight/2]; }; -FeatureMarker.prototype.getInfoHTML = function(name) { +FeatureMarker.prototype.getInfoHTML = function(name, receiverMarker = null) { var nameString = this.url? Marker.linkify(name, this.url) : name; var commentString = this.comment? '

' + this.comment + '

' : ''; var detailsString = ''; @@ -325,6 +325,10 @@ FeatureMarker.prototype.getInfoHTML = function(name) { scheduleString = '
' + Marker.makeListTitle('Schedule') + scheduleString + '
'; } + if (receiverMarker) { + distance = ' at ' + Marker.distanceKm(receiverMarker.position, this.position) + ' km'; + } + return '

' + nameString + distance + '

' + commentString + detailsString + scheduleString; }; @@ -453,7 +457,7 @@ AprsMarker.prototype.getAnchorOffset = function() { return [0, -12]; }; -AprsMarker.prototype.getInfoHTML = function(name) { +AprsMarker.prototype.getInfoHTML = function(name, receiverMarker = null) { var timeString = moment(this.lastseen).fromNow(); var commentString = ''; var weatherString = ''; @@ -568,6 +572,10 @@ AprsMarker.prototype.getInfoHTML = function(name) { detailsString = '
' + Marker.makeListTitle('Details') + detailsString + '
'; } + if (receiverMarker) { + distance = ' at ' + Marker.distanceKm(receiverMarker.position, this.position) + ' km'; + } + if (this.hops && this.hops.length > 0) { var hops = this.hops.toString().split(','); hops.forEach(function(part, index, hops) {