cleanup

wiedehopf · Oct 26, 2020 · 07f7f80 · 07f7f80
1 parent 4a76b79
commit 07f7f80
Show file tree

Hide file tree

Showing 6 changed files with 133 additions and 295 deletions.
diff --git a/html/colors.css b/html/colors.css
@@ -6,9 +6,6 @@
 .other { background-color: #d8d8ff; }
 .tisb { background-color: #ffd8e6; }
 .unknown { background-color: #dcdcdc; }
-.squawk7500 { font-weight: bold; background-color: #ff5555; }
-.squawk7600 { font-weight: bold; background-color: #00ffff; }
-.squawk7700 { font-weight: bold; background-color: #ffff00; }
 .selected.vPosition { background-color: #88DDFF; }
 .selected.mlat { background-color: #F1DD83; }
 .selected.uat { background-color: #66FFA6; }

diff --git a/html/early.js b/html/early.js
@@ -1,5 +1,6 @@
 // This was functionality of script.js, moved it to here to start the downloading of track history earlier
 "use strict";
+
 let Dump1090Version = "unknown version";
 let RefreshInterval = 1000;
 let enable_uat = false;
@@ -29,7 +30,6 @@ let pTracks = false;
 let lastTraceGet = 0;
 let traceRate = 0;
 let _aircraft_type_cache = null;
-let dbLoadedAll = false;
 
 let databaseFolder = "db2";
 
@@ -123,7 +123,6 @@ try {
  let val;
  if (val = parseInt(search.get('heatmap'), 10))
  heatmap.max = val;
-
  }
 
  if (search.has('pTracks')) {

diff --git a/html/index.html b/html/index.html
@@ -214,7 +214,7 @@
  </tr>
  </table>
  </div>
- <button id="show_trace" type="button" class="greyButton" >History</button>
+ <button id="show_trace" type="button" class="greyButton">History</button>
  <div id="history_collapse" class="collapse">
  <div class="infoRowSpacer">
  </div>
@@ -794,87 +794,84 @@
  <div id="splitter" class="ui-resizable-handle ui-resizable-w"></div>
  <div id="sidebar_canvas">
 
-
  <div id="sidebar-table">
- <div id="dump1090_infoblock">
- <table style="width: 100%">
- <tr>
- <td>
- <button id="shrink_sidebar_button" class="shrink_sidebar hidden" title="Show Map"></button>
- </td>
- </tr>
-
- <tr id='adsbexchange_header' class="infoblock_row hidden">
- <td style="text-align: center">
- <div>
- <span class="largeText">Improve Coverage: <a class="largeText" target="_blank" href="https://adsbexchange.com/how-to-feed/">adsbexchange.com</a></span>
- </div>
- <div class="infoRowSpacer">
- </div>
- <div class="infoRowSpacer">
- </div>
- <div>
- <span class="largeText"><a class="largeText" target="_blank" href="https://adsbexchange.com/map-help/">FAQ / Help</a></span>
- </div>
- <div class="infoRowSpacer">
- </div>
- </td>
- </tr>
-
- <tr class="infoblock_heading">
- <td style="text-align: right">
- <a href="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/wiedehopf/tar1090#tar1090" id="dump1090_version" target="_blank">tar1090 on github</a>
- </td>
- </tr>
- <tr class="infoRowSpacer">
- <td></td>
- </tr>
- <tr>
- <td>
- <table style="width: 100%">
- <tr class="infoblock_heading">
- <td style="width: 50%"><span class="infoBlockTitleText">Total Aircraft:</span> <span id="dump1090_total_ac">n/a</span></td>
- <td id="dump1090_message_rate_td"><span class="infoBlockTitleText">Messages:</span> <span id="dump1090_message_rate">n/a</span>/sec</td>
- </tr>
- <tr class="infoblock_body">
- <td style="width: 50%"><span id="with_positions" class="infoBlockTitleText">With Positions:</span> <span id="dump1090_total_ac_positions">n/a</span></td>
- <td id="dump1090_total_history_td"><span class="infoBlockTitleText">History:</span> <span id="dump1090_total_history">n/a</span> positions</td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr class="infoRowSpacer">
- <td></td>
- </tr>
- <tr class="infoblock_heading">
- <td>
- <table id="jumpSearch" style="width: 100%">
- <tr>
- <td style="width: 50%">
- <form id="search_form">
- <span class="infoBlockTitleText">Search:</span>
- <br>
- <input id="search_input" name="searchBox" type="text" class="searchInput" maxlength="8">
- </form>
- </td>
- <td style="width: 50%">
- <form id="jump_form">
- <span class="infoBlockTitleText">Jump to airport:</span>
- <br>
- <input id="jump_input" name="jumpBox" type="text" class="searchInput" maxlength="4">
- </form>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr class="infoRowSpacer">
- <td></td>
- </tr>
- </table>
- </div> <!-- dump1090_infoblock -->
+ <table style="width: 100%">
+ <tr>
+ <td>
+ <button id="shrink_sidebar_button" class="shrink_sidebar hidden" title="Show Map"></button>
+ </td>
+ </tr>
+
+ <tr id='adsbexchange_header' class="infoblock_row hidden">
+ <td style="text-align: center">
+ <div>
+ <span class="largeText">Improve Coverage: <a class="largeText" target="_blank" href="https://adsbexchange.com/how-to-feed/">adsbexchange.com</a></span>
+ </div>
+ <div class="infoRowSpacer">
+ </div>
+ <div class="infoRowSpacer">
+ </div>
+ <div>
+ <span class="largeText"><a class="largeText" target="_blank" href="https://adsbexchange.com/map-help/">FAQ / Help</a></span>
+ </div>
+ <div class="infoRowSpacer">
+ </div>
+ </td>
+ </tr>
+
+ <tr class="infoblock_heading">
+ <td style="text-align: right">
+ <a href="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/wiedehopf/tar1090#tar1090" id="dump1090_version" target="_blank">tar1090 on github</a>
+ </td>
+ </tr>
+ <tr class="infoRowSpacer">
+ <td></td>
+ </tr>
+ <tr>
+ <td>
+ <table style="width: 100%">
+ <tr class="infoblock_heading">
+ <td style="width: 50%"><span class="infoBlockTitleText">Total Aircraft:</span> <span id="dump1090_total_ac">n/a</span></td>
+ <td id="dump1090_message_rate_td"><span class="infoBlockTitleText">Messages:</span> <span id="dump1090_message_rate">n/a</span>/sec</td>
+ </tr>
+ <tr class="infoblock_body">
+ <td style="width: 50%"><span id="with_positions" class="infoBlockTitleText">With Positions:</span> <span id="dump1090_total_ac_positions">n/a</span></td>
+ <td id="dump1090_total_history_td"><span class="infoBlockTitleText">History:</span> <span id="dump1090_total_history">n/a</span> positions</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+
+ <tr class="infoRowSpacer">
+ <td></td>
+ </tr>
+ <tr class="infoblock_heading">
+ <td>
+ <table id="jumpSearch" style="width: 100%">
+ <tr>
+ <td style="width: 50%">
+ <form id="search_form">
+ <span class="infoBlockTitleText">Search:</span>
+ <br>
+ <input id="search_input" name="searchBox" type="text" class="searchInput" maxlength="8">
+ </form>
+ </td>
+ <td style="width: 50%">
+ <form id="jump_form">
+ <span class="infoBlockTitleText">Jump to airport:</span>
+ <br>
+ <input id="jump_input" name="jumpBox" type="text" class="searchInput" maxlength="4">
+ </form>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+
+ <tr class="infoRowSpacer">
+ <td></td>
+ </tr>
+ </table>
 
  <button id="filterButton" type="button" class="collapseButton">Filters</button>
  <div class="collapse" id="filter_block">
@@ -1000,12 +997,6 @@
  </div> <!-- sidebar_container -->
  </div> <!-- layout_container -->
 
- <div id="SpecialSquawkWarning" class="hidden">
- <b>Squawk 7x00 is reported and shown.</b><br>
- This is most likely an error in receiving or decoding.<br>
- Please do not call the local authorities, they already know about it if it is a valid squawk.
- </div>
-
  <div id="update_error" class="hidden error_box">
  <b>Problem fetching data from the server!</b><br>
  <span id="update_error_detail"></span><br>

diff --git a/html/planeObject.js b/html/planeObject.js
@@ -570,10 +570,6 @@ PlaneObject.prototype.getDataSource = function() {
 };
 
 PlaneObject.prototype.getMarkerColor = function() {
- // Emergency squawks override everything else
- //if (this.squawk in SpecialSquawks)
- // return SpecialSquawks[this.squawk].markerColor;
-
  if (monochromeMarkers) {
  return monochromeMarkers;
  }
@@ -1954,6 +1950,7 @@ PlaneObject.prototype.altBad = function(newAlt, oldAlt, oldTime, data) {
  const fpm = (delta < 800) ? 0 : (60 * delta / (now - oldTime + 2));
  return fpm > max_fpm;
 }
+
 PlaneObject.prototype.getAircraftData = function() {
  let req = getAircraftData(this.icao);
 
@@ -2006,7 +2003,6 @@ PlaneObject.prototype.getAircraftData = function() {
  }.bind(this));
 }
 
-
 PlaneObject.prototype.reapTrail = function() {
  const oldSegs = this.track_linesegs;
  this.track_linesegs = [];
@@ -2438,8 +2434,8 @@ PlaneObject.prototype.cross180 = function(on_ground, is_leg) {
  ts: NaN,
  noLabel: true,
  });
-
 }
+
 PlaneObject.prototype.isNonIcao = function() {
  if (this.icao[0] == '~')
  return true;
@@ -2479,6 +2475,7 @@ PlaneObject.prototype.setTypeData = function() {
  if (typeData.wtc != null)
  this.wtc = typeData.wtc;
 }
+
 PlaneObject.prototype.checkForDB = function(t) {
  if (!t) {
  return;