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

fix javascript issues

Browse Source
This commit is contained in:
Jakob Ketterl 2019-07-09 17:32:49 +02:00
parent ad9855a791
commit 438efa655f
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/map.js
View File

@ -6,8 +6,8 @@
var query = window.location.search.replace(/^\?/, '').split('&').map(function(v){ var query = window.location.search.replace(/^\?/, '').split('&').map(function(v){
var s = v.split('='); var s = v.split('=');
r = {} var r = {};
r[s[0]] = s.slice(1).join('=') r[s[0]] = s.slice(1).join('=');
return r; return r;
}).reduce(function(a, b){ }).reduce(function(a, b){
return a.assign(b); return a.assign(b);
@ -33,8 +33,8 @@
// reasonable default; will be overriden by server // reasonable default; will be overriden by server
var retention_time = 2 * 60 * 60 * 1000; var retention_time = 2 * 60 * 60 * 1000;
strokeOpacity = 0.8; var strokeOpacity = 0.8;
fillOpacity = 0.35; var fillOpacity = 0.35;
var processUpdates = function(updates) { var processUpdates = function(updates) {
if (!map) { if (!map) {
@ -45,7 +45,7 @@
switch (update.location.type) { switch (update.location.type) {
case 'latlon': case 'latlon':
var pos = new google.maps.LatLng(update.location.lat, update.location.lon) var pos = new google.maps.LatLng(update.location.lat, update.location.lon);
var marker; var marker;
if (markers[update.callsign]) { if (markers[update.callsign]) {
marker = markers[update.callsign]; marker = markers[update.callsign];
@ -104,7 +104,7 @@
break; break;
} }
}); });
} };
ws.onmessage = function(e){ ws.onmessage = function(e){
if (typeof e.data != 'string') { if (typeof e.data != 'string') {
@ -116,7 +116,7 @@
return return
} }
try { try {
json = JSON.parse(e.data); var json = JSON.parse(e.data);
switch (json.type) { switch (json.type) {
case "config": case "config":
var config = json.value; var config = json.value;
@ -135,10 +135,10 @@
}); });
}); });
retention_time = config.map_position_retention_time * 1000; retention_time = config.map_position_retention_time * 1000;
break break;
case "update": case "update":
processUpdates(json.value); processUpdates(json.value);
break break;
} }
} catch (e) { } catch (e) {
// don't lose exception // don't lose exception
@ -177,7 +177,7 @@
); );
infowindow.setPosition(pos); infowindow.setPosition(pos);
infowindow.open(map); infowindow.open(map);
} };
var getScale = function(lastseen) { var getScale = function(lastseen) {
var age = new Date().getTime() - lastseen; var age = new Date().getTime() - lastseen;
@ -186,7 +186,7 @@
scale = (retention_time - age) / (retention_time / 2); scale = (retention_time - age) / (retention_time / 2);
} }
return Math.max(0, Math.min(1, scale)); return Math.max(0, Math.min(1, scale));
} };
var getRectangleOpacityOptions = function(lastseen) { var getRectangleOpacityOptions = function(lastseen) {
var scale = getScale(lastseen); var scale = getScale(lastseen);
@ -194,14 +194,14 @@
strokeOpacity: strokeOpacity * scale, strokeOpacity: strokeOpacity * scale,
fillOpacity: fillOpacity * scale fillOpacity: fillOpacity * scale
}; };
} };
var getMarkerOpacityOptions = function(lastseen) { var getMarkerOpacityOptions = function(lastseen) {
var scale = getScale(lastseen); var scale = getScale(lastseen);
return { return {
opacity: scale opacity: scale
}; };
} };
// fade out / remove positions after time // fade out / remove positions after time
setInterval(function(){ setInterval(function(){