From d1790cd41180834d4baa0c09386b064d55229467 Mon Sep 17 00:00:00 2001
From: Oliver Jowett <oliver@mutability.co.uk>
Date: Wed, 14 Sep 2016 18:25:21 +0100
Subject: [PATCH] Prefer static DB type descriptions over the ICAO descriptor
 table lookup.

---
 public_html/dbloader.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/public_html/dbloader.js b/public_html/dbloader.js
index 2d2a545..97f48e7 100644
--- a/public_html/dbloader.js
+++ b/public_html/dbloader.js
@@ -84,18 +84,20 @@ function getIcaoAircraftTypeData(aircraftData, defer) {
 }
 
 function lookupIcaoAircraftType(aircraftData, defer) {
-    if (_aircraft_type_cache !== null && "t" in aircraftData) {
-        var typeDesignator = aircraftData.t.toUpperCase();
-        if (typeDesignator in _aircraft_type_cache) {
-            var typeData = _aircraft_type_cache[typeDesignator];
-            if (typeData.desc != undefined && typeData.desc != null && typeData.desc.length == 3) {
-                aircraftData.desc = typeData.desc;
-            }
-            aircraftData.wtc = typeData.wtc;
+        if (_aircraft_type_cache !== null && "t" in aircraftData) {
+                var typeDesignator = aircraftData.t.toUpperCase();
+                if (typeDesignator in _aircraft_type_cache) {
+                        var typeData = _aircraft_type_cache[typeDesignator];
+                        if (typeData.desc != undefined && aircraftData.desc === undefined && typeData.desc != null && typeData.desc.length == 3) {
+                                aircraftData.desc = typeData.desc;
+                        }
+                        if (typeData.wtc != undefined && aircraftData.wtc === undefined) {
+                                aircraftData.wtc = typeData.wtc;
+                        }
+                }
         }
-    }
 
-    defer.resolve(aircraftData);
+        defer.resolve(aircraftData);
 }
 
 var _request_count = 0;