Merge branch 'release/v0.5.2'

fratsloos · Aug 27, 2022 · 377a099 · 377a099
2 parents a03267e + 5209f54
commit 377a099
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 50 deletions.
diff --git a/dist/fr24_card.js b/dist/fr24_card.js
diff --git a/readme.md b/readme.md
diff --git a/src/javascript/config/columns.json b/src/javascript/config/columns.json
@@ -51,7 +51,11 @@
   },
   "age": {
     "styles": ["align-right"],
-    "weight": 3,
+    "weight": 2,
+    "popup": true
+  },
+  "aircraft_type": {
+    "weight": 2,
     "popup": true
   }
 }
diff --git a/src/javascript/fr24_card.js b/src/javascript/fr24_card.js
@@ -216,6 +216,10 @@ class Fr24Card extends HTMLElement {
     const states =
       this._hass.states[this._config.entity].attributes[this._config.attribute];
 
+    if (typeof states === "undefined") {
+      return;
+    }
+
     // If no distance service, disable the column
     this._availableColumns.distance.show = true;
     if (this._distance.isSetUp() === false) {
@@ -283,6 +287,11 @@ class Fr24Card extends HTMLElement {
    * Renders the HTML table with the aircrafts in it
    */
   _renderTable() {
+    // Check for data
+    if (this._aircrafts.length === 0) {
+      throw new Error("No data found, check configuration and JSON output");
+    }
+
     // Create a new table
     const table = new Table();
     const needsUnits = this._config.units_in_table === true;

diff --git a/src/javascript/helpers/aircraft.js b/src/javascript/helpers/aircraft.js
@@ -23,11 +23,11 @@ export default class Aircraft {
     this.lat = state.lat ?? null;
     this.lon = state.lon ?? null;
     this.seen = state.seen ?? 100;
+    this.aircraft_type = state.t ?? null;
 
     // ICAO data
     const icao = new ICAO();
     const country = icao.country.find(this.hex);
-    const registration = icao.registration.lookup(this.hex);
 
     // Set flag based on ICAO data
     this.flag =
@@ -36,8 +36,16 @@ export default class Aircraft {
         : null;
     this.country = country !== null ? country.country : null;
 
-    // Set registration based on ICAO data
-    this.registration = registration;
+    // Registration, either from JSON or calculated
+    const hasRegistration = typeof state.r !== "undefined" && state.r !== "";
+    if (hasRegistration) {
+      this.registration = state.r;
+    } else {
+      const registration = icao.registration.lookup(this.hex);
+
+      // Set registration based on ICAO data
+      this.registration = registration;
+    }
 
     // Calculate distance if distance service is setup
     this.distance = distance.isSetUp()

diff --git a/src/javascript/lang/de.json b/src/javascript/lang/de.json
@@ -10,7 +10,8 @@
       "speed": "Geschwindigkeit",
       "distance": "Entfernung",
       "track": "Pfad",
-      "age": "Letzte Nachricht"
+      "age": "Letzte Nachricht",
+      "aircraft_type": "Typ"
     },
     "data": {
       "not_available": "N/V"

diff --git a/src/javascript/lang/en.json b/src/javascript/lang/en.json
@@ -10,7 +10,8 @@
       "speed": "Speed",
       "distance": "Distance",
       "track": "Track",
-      "age": "Last message"
+      "age": "Last message",
+      "aircraft_type": "Type"
     },
     "data": {
       "not_available": "N/A"

diff --git a/src/javascript/lang/nl.json b/src/javascript/lang/nl.json
@@ -10,7 +10,8 @@
       "speed": "Snelheid",
       "distance": "Afstand",
       "track": "Richting",
-      "age": "Laatste bericht"
+      "age": "Laatste bericht",
+      "aircraft_type": "Type"
     },
     "data": {
       "not_available": "Nb"

diff --git a/src/javascript/lang/sl.json b/src/javascript/lang/sl.json
@@ -10,7 +10,8 @@
       "speed": "Hitrost",
       "distance": "Razdalja",
       "track": "Smer",
-      "age": "Zaznano pred"
+      "age": "Zaznano pred",
+      "aircraft_type": "Vrsta"
     },
     "data": {
       "not_available": "N/A"