From c5c6cd98601bd69538d7c75da2fc3fde31786976 Mon Sep 17 00:00:00 2001 From: "Stanislav Lechev [0xAF]" Date: Tue, 19 Sep 2023 03:02:09 +0300 Subject: [PATCH] remove receivers and stations from feature markers --- htdocs/lib/MapMarkers.js | 40 +++------------------------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/htdocs/lib/MapMarkers.js b/htdocs/lib/MapMarkers.js index 5120c3ac..fc61b033 100644 --- a/htdocs/lib/MapMarkers.js +++ b/htdocs/lib/MapMarkers.js @@ -11,9 +11,6 @@ function MarkerManager() { // Colors used for marker types this.colors = { - 'KiwiSDR' : '#800000', - 'WebSDR' : '#000080', - 'OpenWebRX' : '#004000', 'HFDL' : '#004000', 'VDL2' : '#000080', 'ADSB' : '#800000', @@ -22,11 +19,6 @@ function MarkerManager() { // Symbols used for marker types this.symbols = { - 'KiwiSDR' : '◬', - 'WebSDR' : '◬', - 'OpenWebRX' : '◬', - 'Stations' : '⍑', //'◎', - 'Repeaters' : '⋈', 'APRS' : '⚐', 'AIS' : '⩯', 'HFDL' : '✈', @@ -37,11 +29,7 @@ function MarkerManager() { // Marker type shown/hidden status this.enabled = { - 'KiwiSDR' : false, - 'WebSDR' : false, - 'OpenWebRX' : false, - 'Stations' : false, - 'Repeaters' : false + 'APRS' : true }; } @@ -231,7 +219,6 @@ Marker.prototype.remove = function() { // // Feature Marker -// Represents static map features, such as stations and receivers. // Derived classes have to implement: // setMarkerOpacity() // @@ -245,14 +232,7 @@ FeatureMarker.prototype.update = function(update) { this.mode = update.mode; this.url = update.location.url; this.comment = update.location.comment; - // Receivers this.altitude = update.location.altitude; - this.device = update.location.device; - this.antenna = update.location.antenna; - // EIBI - this.schedule = update.location.schedule; - // Repeaters - this.freq = update.location.freq; this.status = update.location.status; this.updated = update.location.updated; this.mmode = update.location.mmode; @@ -298,7 +278,7 @@ FeatureMarker.prototype.getAnchorOffset = function() { return [0, -this.symHeight/2]; }; -FeatureMarker.prototype.getInfoHTML = function(name, receiverMarker = null) { +FeatureMarker.prototype.getInfoHTML = function(name) { var nameString = this.url? Marker.linkify(name, this.url) : name; var commentString = this.comment? '
' + this.comment + '
' : ''; var detailsString = ''; @@ -380,10 +360,6 @@ FeatureMarker.prototype.getInfoHTML = function(name, receiverMarker = null) { scheduleString = '

' + Marker.makeListTitle('Schedule') + scheduleString + '

'; } - if (receiverMarker) { - distance = ' at ' + Marker.distanceKm(receiverMarker.position, this.position) + ' km'; - } - return '

' + nameString + distance + '

' + commentString + detailsString + scheduleString; }; @@ -512,7 +488,7 @@ AprsMarker.prototype.getAnchorOffset = function() { return [0, -12]; }; -AprsMarker.prototype.getInfoHTML = function(name, receiverMarker = null) { +AprsMarker.prototype.getInfoHTML = function(name) { var timeString = moment(this.lastseen).fromNow(); var commentString = ''; var weatherString = ''; @@ -568,12 +544,6 @@ AprsMarker.prototype.getInfoHTML = function(name, receiverMarker = null) { weatherString += '

'; } - if (this.device) { - detailsString += Marker.makeListItem('Device', this.device.manufacturer? - this.device.device + ' by ' + this.device.manufacturer : this.device - ); - } - if (this.height) { detailsString += Marker.makeListItem('Height', this.height.toFixed(0) + ' m'); } @@ -633,10 +603,6 @@ AprsMarker.prototype.getInfoHTML = function(name, receiverMarker = null) { 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) {