Browse Source

Rename SSR to ADSB

pull/67/head
squeaky otter 2 years ago
parent
commit
2732a89b34
Signed by: dashie GPG Key ID: C2D57B325840B755
  1. 1
      CHANGELOG.md
  2. 2
      LICENSE.other
  3. 3
      TODO
  4. 4
      docs/socketio_json_proto.md
  5. 4
      libPyAirwaves/structs.py
  6. 2
      static/js/airsuckLoad.js
  7. 2
      static/js/config.js
  8. 12
      static/js/vehicles/airADSB.js
  9. 2
      static/js/vehicles/vehicle.js
  10. 6
      templates/home.jinja2

1
CHANGELOG.md

@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- CORS are now forced to uses the config value
- Zoom controls migrated to the sidebar
- Moved version from header to help menu
- SSR renamed to ADSB
### Fixed

2
LICENSE.other

@ -16,6 +16,6 @@ Files imported from AirSuck (https://github.com/ThreeSixes/airSuck) (not exhaust
- static/js/core/sidebar.js
- static/js/core/messages.js
- static/js/core/map_init.js
- static/js/vehicles/airSSR.js
- static/js/vehicles/airADSB.js
- static/js/vehicles/airAIS.js
- static/js/vehicles/vehicle.js

3
TODO

@ -18,9 +18,6 @@ my idea is that at some point the marker isn't created because of lat/lon missin
- Expiration timer: grey-ish old markers before deletion
- F5, open sidebar, airAIS icon orange-ed, but displaying airSSR
doesn't seems to be a frequent issue...
- Better planes icons
- javascript cleanup needed

4
docs/socketio_json_proto.md

@ -9,7 +9,7 @@ SBS Reference: http://woodair.net/sbs/article/barebones42_socket_data.htm
| Field name | Description | Type | SBS Field | Example,value |
| ---------- | ----------- | ---- | --------- | ------------- |
| required |
|type|Incoming data type – airAIS or airSSR|string| |airAIS,airSSR
|type|Incoming data type – airAIS or airADSB|string| |airAIS,airADSB
|addr|Vehicle address – will be a ICAO aircraft address or MMSI|string|field 5|3C6426
|idInfo|Aircraft ID string|string|field 4|1
|aSquawk|Mode A squawk code. 4 character string representing four octal numbers.|string|field 18|
@ -67,7 +67,7 @@ This is currently untested.
| ---------- | ----------- | ---- |
|entryPoint|Connector component the data arrived in the stack from|string|
|dataOrigin|Data origin describes the software source of the data (dump1090/aisConn)|string|
|type|Incoming data type – airAIS or airSSR|string|
|type|Incoming data type – airAIS or airADSB|string|
|dts|Date/time stamp data hits system or is generated|str(datetime.utcnow())||
|src|Name of source host.|string|
|data|Raw data frame.|string|

4
libPyAirwaves/structs.py

@ -9,7 +9,7 @@ class DefaultType:
"""
def __init__(self):
# Incoming data type – airAIS or airSSR
# Incoming data type – airAIS or airADSB
self.type: str = None
@ -20,7 +20,7 @@ class AdsbType(DefaultType):
def __init__(self):
DefaultType.__init__(self)
self.type: str = "airSSR"
self.type: str = "airADSB"
# Vehicle address – will be a ICAO aircraft address or MMSI
self.addr: str = None

2
static/js/airsuckLoad.js

@ -19,7 +19,7 @@
* GLOBALS
**************************************************/
var sidebarLoaded = false;
var vehicleTypes = []; // Array for registering vehicle types (AIS, SSR)
var vehicleTypes = []; // Array for registering vehicle types (AIS, ADSB)
var vehicles = []; // Main array holding vehicles - replacing vehData array with vehicle objects
/***************************************************

2
static/js/config.js

@ -21,7 +21,7 @@ var debug = false; // Do we want to have debugging data onscreen and in the cons
/***************************************************
* CUSTOM VEHICLES TO INCLUDE - from the js/vehicles directory
**************************************************/
var loadCustomVehicles = ['airSSR.js', 'airAIS.js']; //order determines the sidebar arrangement
var loadCustomVehicles = ['airADSB.js', 'airAIS.js'];
/***************************************************
* VEHICLE ARRAYS AND RELATED

12
static/js/vehicles/airSSR.js → static/js/vehicles/airADSB.js

@ -14,23 +14,23 @@
/* jshint multistr: true */
// Register vehicle type
Logger.info('Registering vehicle type: SSR');
registerVehicleType('airSSR', 'SSR', 'fa-plane', function (msgJSON) {
Logger.info('Registering vehicle type: ADSB');
registerVehicleType('airADSB', 'ADSB', 'fa-plane', function (msgJSON) {
return new Aircraft(msgJSON);
});
/***************************************************
* SSR OBJECT DECLARATION
* ADSB OBJECT DECLARATION
**************************************************/
class Aircraft extends Vehicle {
constructor(msgJSON) {
// create the generic vehicle object
super(msgJSON, 'SSR');
// extend with SSR specific data
super(msgJSON, 'ADSB');
// extend with ADSB specific data
$.extend(true, this, msgJSON);
// add additional parameters
this.lastAltitudes = []; // Will contains the five last altitudes reported
this.domName = 'SSR';
this.domName = 'ADSB';
this.maxAge = 2 * (60 * 1000); // How long to retain an aircraft after losing contact (miliseconds)
// Icon variables
this.dirIcoPath = "m 0,0 -20,50 20,-20 20,20 -20,-50"; // Path we want to use for ADS-B targets we have direction data for.

2
static/js/vehicles/vehicle.js

@ -172,7 +172,7 @@ class Vehicle {
constructor(msgJSON, protocol) {
this.spinState = 0; // This is just for tracking the spinner animation state.
this.addr = msgJSON.addr;
this.protocol = protocol; // communications protocol used (AIS,SSR)
this.protocol = protocol; // communications protocol used (AIS,ADSB)
this.lastPos = "none";
this.lastLat = null;
this.lastLon = null;

6
templates/home.jinja2

@ -61,12 +61,12 @@
<!-- aircrafts pane -->
<div class="sidebar-pane" id="aircrafts">
<h1 class="sidebar-header">
Vehicles broadcasting over SSR
Vehicles broadcasting over ADSB
<span class="sidebar-close"><i class="fa fa-caret-right"></i></span>
</h1>
<div id="container-list-SSR" class="container-list-vehicles">
<table id="table-SSR" class="table table-sm vehicle-table">
<div id="container-list-ADSB" class="container-list-vehicles">
<table id="table-ADSB" class="table table-sm vehicle-table">
<thead>
<tr>
<th>ID</th>

Loading…
Cancel
Save