MS0NTR-Radio-Club
/
dump1090-fa
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display a count of active filters

This commit is contained in:
eric1tran 2021-02-09 04:33:50 +00:00
parent c2e1c1f6d5
commit d5184efa6e
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public_html/config.js
View File

@ -125,3 +125,8 @@ BingMapsAPIKey = null;
// This is not polished yet (and so is disabled by default), // This is not polished yet (and so is disabled by default),
// currently it's just a data dump of the new fields with no UX work. // currently it's just a data dump of the new fields with no UX work.
ExtendedData = false; ExtendedData = false;
DefaultMaxAltitudeFilter = 65000
DefaultMinAltitudeFilter = 0
DefaultMaxSpeedFilter = 1000
DefaultMinSpeedFilter = 0

2
public_html/index.html
View File

@ -220,7 +220,7 @@
</div> <!-- dump1090_infoblock --> </div> <!-- dump1090_infoblock -->
<div class="config_button_row"> <div class="config_button_row">
<button id="filter_button" class="config_button">Filters</button> <button id="filter_button" class="config_button">Filters (<span id="active_filter_count">0</span>)</button>
<button id="column_select_button" class="config_button">Select Columns</button> <button id="column_select_button" class="config_button">Select Columns</button>
</div> </div>

18
public_html/script.js
View File

@ -52,6 +52,8 @@ var NBSP='\u00a0';
var layers; var layers;
var layerGroup; var layerGroup;
var ActiveFilterCount = 0;
var altitude_slider = null; var altitude_slider = null;
var speed_slider = null; var speed_slider = null;
@ -306,8 +308,8 @@ function initialize() {
start: [0, 65000], start: [0, 65000],
connect: true, connect: true,
range: { range: {
'min': 0, 'min': DefaultMinAltitudeFilter,
'max': 65000 'max': DefaultMaxAltitudeFilter
}, },
step: 25, step: 25,
format: { format: {
@ -342,8 +344,8 @@ function initialize() {
start: [0, 1000], start: [0, 1000],
connect: true, connect: true,
range: { range: {
'min': 0, 'min': DefaultMinSpeedFilter,
'max': 1000 'max': DefaultMaxSpeedFilter
}, },
step: 5, step: 5,
format: { format: {
@ -1168,6 +1170,7 @@ function refreshSelected() {
$('#dump1090_total_ac').text(TrackedAircraft); $('#dump1090_total_ac').text(TrackedAircraft);
$('#dump1090_total_ac_positions').text(TrackedAircraftPositions); $('#dump1090_total_ac_positions').text(TrackedAircraftPositions);
$('#dump1090_total_history').text(TrackedHistorySize); $('#dump1090_total_history').text(TrackedHistorySize);
$('#active_filter_count').text(ActiveFilterCount);
if (MessageRate !== null) { if (MessageRate !== null) {
$('#dump1090_message_rate').text(MessageRate.toFixed(1)); $('#dump1090_message_rate').text(MessageRate.toFixed(1));
@ -2193,6 +2196,13 @@ function updatePlaneFilter() {
PlaneFilter.aircraftTypeCode = aircraftTypeCode; PlaneFilter.aircraftTypeCode = aircraftTypeCode;
PlaneFilter.aircraftIdent = aircraftIdent; PlaneFilter.aircraftIdent = aircraftIdent;
var altitudeFilterSet = (PlaneFilter.minAltitude == DefaultMinAltitudeFilter && PlaneFilter.maxAltitude == DefaultMaxAltitudeFilter) ? 0 : 1;
var speedFilterSet = (PlaneFilter.minSpeedFilter == DefaultMinSpeedFilter && PlaneFilter.maxSpeedFilter == DefaultMaxSpeedFilter) ? 0 : 1;
var aircraftTypeFilterSet = (PlaneFilter.aircraftTypeCode == undefined) ? 0 : 1;
var aircraftIdentFilterSet = (PlaneFilter.aircraftIdent == undefined) ? 0 : 1;
ActiveFilterCount = altitudeFilterSet + speedFilterSet + aircraftTypeFilterSet + aircraftIdentFilterSet;
} }
function refreshDataSourceFilters () { function refreshDataSourceFilters () {