diff --git a/index.html b/index.html index 8fdc588..6e4ec61 100644 --- a/index.html +++ b/index.html @@ -177,6 +177,13 @@

Settings

+
+ Hide chase cars from the map +
+ + +
+
Highlight selected vehicle
@@ -210,7 +217,7 @@

Overlays

Other


- Show Launch Sites + Hide Launch Sites
diff --git a/js/app.js b/js/app.js index 885d302..b8b45b5 100644 --- a/js/app.js +++ b/js/app.js @@ -746,6 +746,7 @@ $(window).ready(function() { "#sw_daylight", "#sw_hide_receivers", "#sw_hide_recoveries", + "#sw_hide_chase", "#sw_hide_timebox", "#sw_hilight_vehicle", '#sw_hide_horizon', @@ -811,6 +812,14 @@ $(window).ready(function() { refreshRecoveries(); } break; + case "opt_hide_chase": + if(on) { + clearTimeout(periodical_listeners); + deleteChase(); + } else { + refreshNewReceivers(true); + } + break; case "opt_hide_timebox": var elm = $("#timebox"); if(on) { @@ -844,9 +853,9 @@ $(window).ready(function() { case "opt_layers_launches": showLaunchSites(); if(on) { - map.addLayer(launches); - } else { map.removeLayer(launches); + } else { + map.addLayer(launches); } break; case "opt_interpolate": diff --git a/js/tracker.js b/js/tracker.js index f8ed65a..447f3d6 100644 --- a/js/tracker.js +++ b/js/tracker.js @@ -423,7 +423,9 @@ function clean_refresh(text, force, history_step) { clearTimeout(periodical_listeners); refresh(); - refreshNewReceivers(true); + if (!offline.get("opt_hide_chase")) { + refreshNewReceivers(true); + } return true; } @@ -513,7 +515,7 @@ function load() { map.addLayer(nite); } - if (offline.get("opt_layers_launches")) { + if (!offline.get("opt_layers_launches")) { showLaunchSites(); map.addLayer(launches); } @@ -2095,7 +2097,7 @@ function mapInfoBox_handle_prediction(event) { formatDate(new Date(parseInt(data.time) * 1000), true) + "\n\n" + "Altitude: " + altitude + "\n" + "Latitude: " + data.lat + "\n" + - "Longtitude: " + data.lon + "\n" + + "Longitude: " + data.lon + "\n" + "" ); mapInfoBox.setLatLng(event.latlng); @@ -3512,7 +3514,9 @@ function refreshSingleNew(serial) { } if (serial.includes("_chase")) { - refreshNewReceivers(false, serial.replace("_chase", "")); + if (!offline.get("opt_hide_chase")) { + refreshNewReceivers(false, serial.replace("_chase", "")); + } return; } @@ -3562,7 +3566,9 @@ function refreshPatreons() { function refreshReceivers() { if(offline.get('opt_hide_receivers')) { - refreshNewReceivers(true); + if (!offline.get("opt_hide_chase")) { + refreshNewReceivers(true); + } } else { data_str = "duration=1d"; @@ -3575,7 +3581,9 @@ function refreshReceivers() { updateReceivers(response); }, complete: function(request, textStatus) { - refreshNewReceivers(true); + if (!offline.get("opt_hide_chase")) { + refreshNewReceivers(true); + } } }); } @@ -3593,13 +3601,16 @@ function refreshNewReceivers(initial, serial) { data_str = "duration=1m"; } + $.ajax({ type: "GET", url: receivers_url, data: data_str, dataType: "json", success: function(response, textStatus) { - updateChase(response); + if (!offline.get("opt_hide_chase")) { + updateChase(response); + } }, complete: function(request, textStatus) { if (typeof serial === 'undefined') { @@ -3798,6 +3809,16 @@ function updateReceiverMarker(receiver) { } } +function deleteChase(r) { + var callsign; + for(callsign in vehicles) { + if (vehicles[callsign].vehicle_type == "car") { + vehicles[callsign].kill(); + } + } + car_index = 0; +} + function updateChase(r) { if(!r) return;