From c558ebb9440a2778283c02683f3747a76ae02291 Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 15:32:56 -0400 Subject: [PATCH 01/19] alphabetizing ATR42/72 --- src/lib/data/aircraft.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index dffa43d..3290e5a 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -1,4 +1,14 @@ export const AIRCRAFT = [ + { + name: 'Aerospatiale/Alenia ATR 42', + icao: 'AT43', + wtc: 'M', + }, + { + name: 'Aerospatiale/Alenia ATR 72', + icao: 'AT72', + wtc: 'M', + }, { name: 'Fokker 100', icao: 'F100', @@ -359,16 +369,6 @@ export const AIRCRAFT = [ icao: 'RJ1H', wtc: 'M', }, - { - name: 'Aerospatiale/Alenia ATR 42', - icao: 'AT43', - wtc: 'M', - }, - { - name: 'Aerospatiale/Alenia ATR 72', - icao: 'AT72', - wtc: 'M', - }, { name: 'British Aerospace ATP', icao: 'ATP', From 37df7a76ea4095a84c32f911e8c311b4d02f1af9 Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 15:43:35 -0400 Subject: [PATCH 02/19] alphabetized Airbus, added missing airbus models --- src/lib/data/aircraft.ts | 196 +++++++++++++++++++++++---------------- 1 file changed, 116 insertions(+), 80 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index 3290e5a..8e4c9ae 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -9,6 +9,122 @@ export const AIRCRAFT = [ icao: 'AT72', wtc: 'M', }, + { + name: 'Airbus A300-100/200', + icao: 'A30B', + wtc: 'H', + }, + { + name: 'Airbus A300-600', + icao: 'A306', + wtc: 'H', + }, + { + name: 'Airbus A220-100', + icao: 'BCS1', + wtc: 'M', + }, + { + name: 'Airbus A220-300', + icao: 'BCS3', + wtc: 'M', + }, + { + name: 'Airbus A310', + icao: 'A310', + wtc: 'H', + }, + { + name: 'Airbus A318', + icao: 'A318', + wtc: 'M', + }, + { + name: 'Airbus A319', + icao: 'A319', + wtc: 'M', + }, + { + name: 'Airbus A319', + icao: 'A19N', + wtc: 'M', + }, + { + name: 'Airbus A320', + icao: 'A320', + wtc: 'M', + }, + { + name: 'Airbus A320neo', + icao: 'A20N', + wtc: 'M', + }, + { + name: 'Airbus A321', + icao: 'A321', + wtc: 'M', + }, + { + name: 'Airbus A321neo', + icao: 'A21N', + wtc: 'M', + }, + + { + name: 'Airbus A330', + icao: 'A330', + wtc: 'H', + }, + { + name: 'Airbus A330-200', + icao: 'A332', + wtc: 'H', + }, + { + name: 'Airbus A330-300', + icao: 'A333', + wtc: 'H', + }, + { + name: 'Airbus A340', + icao: 'A340', + wtc: 'H', + }, + { + name: 'Airbus A340-200', + icao: 'A342', + wtc: 'H', + }, + { + name: 'Airbus A340-300', + icao: 'A343', + wtc: 'H', + }, + { + name: 'Airbus A340-500', + icao: 'A345', + wtc: 'H', + }, + { + name: 'Airbus A340-600', + icao: 'A346', + wtc: 'H', + }, + { + name: 'Airbus A350-900', + icao: 'A359', + wtc: 'H', + }, + { + name: 'Airbus A350-1000', + icao: 'A359', + wtc: 'H', + }, + { + name: 'Airbus A380', + icao: 'A388', + wtc: 'J', + }, { name: 'Fokker 100', icao: 'F100', @@ -79,71 +195,6 @@ export const AIRCRAFT = [ icao: 'E295', wtc: 'M', }, - { - name: 'Airbus A220', - icao: 'BCS1', - wtc: 'M', - }, - { - name: 'Airbus A220', - icao: 'BCS3', - wtc: 'M', - }, - { - name: 'Airbus A310', - icao: 'A310', - wtc: 'H', - }, - { - name: 'Airbus A318', - icao: 'A318', - wtc: 'M', - }, - { - name: 'Airbus A319', - icao: 'A319', - wtc: 'M', - }, - { - name: 'Airbus A320', - icao: 'A320', - wtc: 'M', - }, - { - name: 'Airbus A320neo', - icao: 'A20N', - wtc: 'M', - }, - { - name: 'Airbus A321', - icao: 'A321', - wtc: 'M', - }, - { - name: 'Airbus A330', - icao: 'A330', - wtc: 'H', - }, - { - name: 'Airbus A330-300', - icao: 'A333', - wtc: 'H', - }, - { - name: 'Airbus A340', - icao: 'A340', - wtc: 'H', - }, - { - name: 'Airbus A350', - icao: 'A359', - wtc: 'H', - }, - { - name: 'Airbus A380', - icao: 'A388', - wtc: 'J', - }, { name: 'Boeing 707', icao: 'B703', @@ -319,16 +370,6 @@ export const AIRCRAFT = [ icao: 'A148', wtc: 'M', }, - { - name: 'Airbus A300', - icao: 'A30B', - wtc: 'H', - }, - { - name: 'Airbus A300-600', - icao: 'A306', - wtc: 'H', - }, { name: 'Gulfstream/Rockwell (Aero) Commander', icao: 'AC68', @@ -404,11 +445,6 @@ export const AIRCRAFT = [ icao: 'A350', wtc: 'H', }, - { - name: 'Airbus A380', - icao: 'A380', - wtc: 'J', - }, { name: 'Boeing 747', icao: 'B747', From 9928ad8bb2dbb1af0e35d3eafb4e1c8bfd64e0cb Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 15:45:18 -0400 Subject: [PATCH 03/19] re-classifying AN-225 as a Jumbo aircraft --- src/lib/data/aircraft.ts | 74 ++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index 8e4c9ae..2daf9d4 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -117,14 +117,49 @@ export const AIRCRAFT = [ }, { name: 'Airbus A350-1000', - icao: 'A359', + icao: 'A35K', wtc: 'H', }, { - name: 'Airbus A380', + name: 'Airbus A380-800', icao: 'A388', wtc: 'J', }, + { + name: 'Antonov AN-30', + icao: 'AN30', + wtc: 'L', + }, + { + name: 'Antonov AN-32', + icao: 'AN32', + wtc: 'L', + }, + { + name: 'Antonov AN-38', + icao: 'AN38', + wtc: 'L', + }, + { + name: 'Antonov AN-140', + icao: 'A140', + wtc: 'M', + }, + { + name: 'Antonov AN-124', + icao: 'A124', + wtc: 'H', + }, + { + name: 'Antonov AN-225', + icao: 'A225', + wtc: 'J', + }, + { + name: 'Antonov AN-148', + icao: 'A148', + wtc: 'M', + }, { name: 'Fokker 100', icao: 'F100', @@ -335,41 +370,6 @@ export const AIRCRAFT = [ icao: 'AN28', wtc: 'L', }, - { - name: 'Antonov AN-30', - icao: 'AN30', - wtc: 'L', - }, - { - name: 'Antonov AN-32', - icao: 'AN32', - wtc: 'L', - }, - { - name: 'Antonov AN-38', - icao: 'AN38', - wtc: 'L', - }, - { - name: 'Antonov AN-140', - icao: 'A140', - wtc: 'M', - }, - { - name: 'Antonov AN-124', - icao: 'A124', - wtc: 'H', - }, - { - name: 'Antonov AN-225', - icao: 'A225', - wtc: 'H', - }, - { - name: 'Antonov AN-148', - icao: 'A148', - wtc: 'M', - }, { name: 'Gulfstream/Rockwell (Aero) Commander', icao: 'AC68', From 61adfb1ec1858fff60ce107dc3e723614e111f6c Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 15:56:12 -0400 Subject: [PATCH 04/19] add missing ATR models --- src/lib/data/aircraft.ts | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index 2daf9d4..5697cf5 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -1,14 +1,44 @@ export const AIRCRAFT = [ { - name: 'Aerospatiale/Alenia ATR 42', + name: 'ATR-42-300', icao: 'AT43', wtc: 'M', }, { - name: 'Aerospatiale/Alenia ATR 72', + name: 'ATR-42-400', + icao: 'AT44', + wtc: 'M', + }, + { + name: 'ATR-42-500', + icao: 'AT45', + wtc: 'M', + }, + { + name: 'ATR-42-600', + icao: 'AT46', + wtc: 'M', + }, + { + name: 'ATR-72-200', icao: 'AT72', wtc: 'M', }, + { + name: 'ATR-72-210', + icao: 'AT73', + wtc: 'M', + }, + { + name: 'ATR-72-500', + icao: 'AT75', + wtc: 'M', + }, + { + name: 'ATR-72-600', + icao: 'AT75', + wtc: 'M', + }, { name: 'Airbus A300-100/200', icao: 'A30B', From 51576533ede774db4e6f3893ffc4d04d056f0e91 Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 16:00:50 -0400 Subject: [PATCH 05/19] sorting Antonov aircraft --- src/lib/data/aircraft.ts | 70 ++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index 5697cf5..8213451 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -155,6 +155,31 @@ export const AIRCRAFT = [ icao: 'A388', wtc: 'J', }, + { + name: 'Antonov AN-12', + icao: 'AN12', + wtc: 'M', + }, + { + name: 'Antonov AN-22', + icao: 'AN22', + wtc: 'L', + }, + { + name: 'Antonov AN-24', + icao: 'AN24', + wtc: 'M', + }, + { + name: 'Antonov AN-26', + icao: 'AN26', + wtc: 'L', + }, + { + name: 'Antonov AN-28', + icao: 'AN28', + wtc: 'L', + }, { name: 'Antonov AN-30', icao: 'AN30', @@ -171,8 +196,8 @@ export const AIRCRAFT = [ wtc: 'L', }, { - name: 'Antonov AN-140', - icao: 'A140', + name: 'Antonov AN-72', + icao: 'AN72', wtc: 'M', }, { @@ -181,15 +206,20 @@ export const AIRCRAFT = [ wtc: 'H', }, { - name: 'Antonov AN-225', - icao: 'A225', - wtc: 'J', + name: 'Antonov AN-140', + icao: 'A140', + wtc: 'M', }, { name: 'Antonov AN-148', icao: 'A148', wtc: 'M', }, + { + name: 'Antonov AN-225', + icao: 'A225', + wtc: 'J', + }, { name: 'Fokker 100', icao: 'F100', @@ -385,21 +415,6 @@ export const AIRCRAFT = [ icao: 'B3XM', wtc: 'M', }, - { - name: 'Antonov AN-22', - icao: 'AN22', - wtc: 'L', - }, - { - name: 'Antonov AN-26', - icao: 'AN26', - wtc: 'L', - }, - { - name: 'Antonov AN-28', - icao: 'AN28', - wtc: 'L', - }, { name: 'Gulfstream/Rockwell (Aero) Commander', icao: 'AC68', @@ -420,21 +435,6 @@ export const AIRCRAFT = [ icao: 'LOAD', wtc: 'M', }, - { - name: 'Antonov AN-24', - icao: 'AN24', - wtc: 'M', - }, - { - name: 'Antonov AN-72', - icao: 'AN72', - wtc: 'M', - }, - { - name: 'Antonov AN-12', - icao: 'AN12', - wtc: 'M', - }, { name: 'Avro RJ', icao: 'RJ1H', From 90d3379f2e92b1a124c8d46f65fea99d4ff48f3a Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 16:03:40 -0400 Subject: [PATCH 06/19] messed up A sorting, moved agusta --- src/lib/data/aircraft.ts | 86 ++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index 8213451..e428868 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -1,43 +1,8 @@ export const AIRCRAFT = [ { - name: 'ATR-42-300', - icao: 'AT43', - wtc: 'M', - }, - { - name: 'ATR-42-400', - icao: 'AT44', - wtc: 'M', - }, - { - name: 'ATR-42-500', - icao: 'AT45', - wtc: 'M', - }, - { - name: 'ATR-42-600', - icao: 'AT46', - wtc: 'M', - }, - { - name: 'ATR-72-200', - icao: 'AT72', - wtc: 'M', - }, - { - name: 'ATR-72-210', - icao: 'AT73', - wtc: 'M', - }, - { - name: 'ATR-72-500', - icao: 'AT75', - wtc: 'M', - }, - { - name: 'ATR-72-600', - icao: 'AT75', - wtc: 'M', + name: 'Agusta A109', + icao: 'A109', + wtc: 'L', }, { name: 'Airbus A300-100/200', @@ -155,6 +120,46 @@ export const AIRCRAFT = [ icao: 'A388', wtc: 'J', }, + { + name: 'ATR-42-300', + icao: 'AT43', + wtc: 'M', + }, + { + name: 'ATR-42-400', + icao: 'AT44', + wtc: 'M', + }, + { + name: 'ATR-42-500', + icao: 'AT45', + wtc: 'M', + }, + { + name: 'ATR-42-600', + icao: 'AT46', + wtc: 'M', + }, + { + name: 'ATR-72-200', + icao: 'AT72', + wtc: 'M', + }, + { + name: 'ATR-72-210', + icao: 'AT73', + wtc: 'M', + }, + { + name: 'ATR-72-500', + icao: 'AT75', + wtc: 'M', + }, + { + name: 'ATR-72-600', + icao: 'AT75', + wtc: 'M', + }, { name: 'Antonov AN-12', icao: 'AN12', @@ -425,11 +430,6 @@ export const AIRCRAFT = [ icao: 'AC90', wtc: 'L', }, - { - name: 'Agusta A109', - icao: 'A109', - wtc: 'L', - }, { name: 'Ayres LM-200 Loadmaster', icao: 'LOAD', From fdd352650a45b9385a911441a0663f0f16aaf07a Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 16:06:36 -0400 Subject: [PATCH 07/19] moving ayres and avro, added Avro RJ70 and Avro RJ85 --- src/lib/data/aircraft.ts | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index e428868..c9b75f3 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -225,6 +225,26 @@ export const AIRCRAFT = [ icao: 'A225', wtc: 'J', }, + { + name: 'Avro RJ 70', + icao: 'RJ1H', + wtc: 'M', + }, + { + name: 'Avro RJ 85', + icao: 'RJ1H', + wtc: 'M', + }, + { + name: 'Avro RJ 100', + icao: 'RJ1H', + wtc: 'M', + }, + { + name: 'Ayres LM-200 Loadmaster', + icao: 'LOAD', + wtc: 'M', + }, { name: 'Fokker 100', icao: 'F100', @@ -430,16 +450,6 @@ export const AIRCRAFT = [ icao: 'AC90', wtc: 'L', }, - { - name: 'Ayres LM-200 Loadmaster', - icao: 'LOAD', - wtc: 'M', - }, - { - name: 'Avro RJ', - icao: 'RJ1H', - wtc: 'M', - }, { name: 'British Aerospace ATP', icao: 'ATP', From 6f76da0c83ade1f569d7696bc816026524cab2db Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 16:08:46 -0400 Subject: [PATCH 08/19] moving ayres and avro, added Avro RJ70 and Avro RJ85 --- src/lib/data/aircraft.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index c9b75f3..600c3b6 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -226,17 +226,17 @@ export const AIRCRAFT = [ wtc: 'J', }, { - name: 'Avro RJ 70', - icao: 'RJ1H', + name: 'Avro RJ70', + icao: 'RJ70', wtc: 'M', }, { - name: 'Avro RJ 85', - icao: 'RJ1H', + name: 'Avro RJ85', + icao: 'RJ85', wtc: 'M', }, { - name: 'Avro RJ 100', + name: 'Avro RJ100', icao: 'RJ1H', wtc: 'M', }, From 798653578830c876c8e140b15dcb41f2a572bdc7 Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 16:11:19 -0400 Subject: [PATCH 09/19] sorting BAE146, updating names with the type designation --- src/lib/data/aircraft.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index 600c3b6..7a6c283 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -241,28 +241,28 @@ export const AIRCRAFT = [ wtc: 'M', }, { - name: 'Ayres LM-200 Loadmaster', - icao: 'LOAD', + name: 'BAe-146-100', + icao: 'B461', wtc: 'M', }, { - name: 'Fokker 100', - icao: 'F100', + name: 'BAe-146-200', + icao: 'B462', wtc: 'M', }, { - name: 'BAe 146', - icao: 'B461', + name: 'BAe-146-300', + icao: 'B463', wtc: 'M', }, { - name: 'BAe 146', - icao: 'B462', + name: 'Ayres LM-200 Loadmaster', + icao: 'LOAD', wtc: 'M', }, { - name: 'BAe 146', - icao: 'B463', + name: 'Fokker 100', + icao: 'F100', wtc: 'M', }, { From f428f258e3a7ea09912c3f352beced4729f168d3 Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 16:11:51 -0400 Subject: [PATCH 10/19] messed up sorting --- src/lib/data/aircraft.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index 7a6c283..6be7a27 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -240,6 +240,11 @@ export const AIRCRAFT = [ icao: 'RJ1H', wtc: 'M', }, + { + name: 'Ayres LM-200 Loadmaster', + icao: 'LOAD', + wtc: 'M', + }, { name: 'BAe-146-100', icao: 'B461', @@ -255,11 +260,6 @@ export const AIRCRAFT = [ icao: 'B463', wtc: 'M', }, - { - name: 'Ayres LM-200 Loadmaster', - icao: 'LOAD', - wtc: 'M', - }, { name: 'Fokker 100', icao: 'F100', From 5a8a3e51fadbae6312af812ce89c56d021de8799 Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 16:22:21 -0400 Subject: [PATCH 11/19] sorted Boeing Aircraft and added missing models --- src/lib/data/aircraft.ts | 163 ++++++++++++++++++++++++++------------- 1 file changed, 109 insertions(+), 54 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index 6be7a27..b91bfc2 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -260,16 +260,6 @@ export const AIRCRAFT = [ icao: 'B463', wtc: 'M', }, - { - name: 'Fokker 100', - icao: 'F100', - wtc: 'M', - }, - { - name: 'Canadair Regional Jet CRJ-900', - icao: 'CRJ9', - wtc: 'M', - }, { name: 'Bombardier DHC-8-100 Dash 8', icao: 'DH8A', @@ -291,80 +281,115 @@ export const AIRCRAFT = [ wtc: 'M', }, { - name: 'Embraer E170', - icao: 'E170', - wtc: 'M', + name: 'Boeing 707-100', + icao: 'B701', + wtc: 'H', }, { - name: 'Embraer E175 (short wing)', - icao: 'E75S', + name: 'Boeing 707-300', + icao: 'B703', + wtc: 'H', + }, + { + name: 'Boeing 717-200', + icao: 'B712', wtc: 'M', }, { - name: 'Embraer E175 (long wing)', - icao: 'E75L', + name: 'Boeing 727-100', + icao: 'B721', wtc: 'M', }, { - name: 'Embraer E190', - icao: 'E290', + name: 'Boeing 727-200', + icao: 'B722', wtc: 'M', }, { - name: 'Embraer E195', - icao: 'E295', + name: 'Boeing 737-200', + icao: 'B732', wtc: 'M', }, { - name: 'Boeing 707', - icao: 'B703', - wtc: 'H', + name: 'Boeing 737-300', + icao: 'B733', + wtc: 'M', }, { - name: 'Boeing 717', - icao: 'B712', + name: 'Boeing 737-400', + icao: 'B734', wtc: 'M', }, { - name: 'Boeing 727', - icao: 'B721', + name: 'Boeing 737-500', + icao: 'B735', wtc: 'M', }, { - name: 'Boeing 727', - icao: 'B722', + name: 'Boeing 737-600', + icao: 'B736', wtc: 'M', }, { - name: 'Boeing 737', + name: 'Boeing 737-700', icao: 'B737', wtc: 'M', }, { - name: 'Boeing 737', + name: 'Boeing 737-800', icao: 'B738', wtc: 'M', }, { - name: 'Boeing 747', + name: 'Boeing 737-900', + icao: 'B739', + wtc: 'M', + }, + { + name: 'Boeing 737 MAX 7', + icao: 'B37M', + wtc: 'M', + }, + { + name: 'Boeing 737 MAX 8', + icao: 'B38M', + wtc: 'M', + }, + { + name: 'Boeing 737 MAX 9', + icao: 'B39M', + wtc: 'M', + }, + { + name: 'Boeing 737 MAX 10', + icao: 'B3XM', + wtc: 'M', + }, + { + name: 'Boeing 747-100', icao: 'B741', wtc: 'H', }, { - name: 'Boeing 747', + name: 'Boeing 747-200', icao: 'B742', wtc: 'H', }, { - name: 'Boeing 747', + name: 'Boeing 747-300', icao: 'B743', wtc: 'H', }, { - name: 'Boeing 747', + name: 'Boeing 747-400', icao: 'B744', wtc: 'H', }, + { + name: 'Boeing 747-8', + icao: 'B748', + wtc: 'H', + }, { name: 'Boeing 747SP', icao: 'N74S', @@ -376,68 +401,98 @@ export const AIRCRAFT = [ wtc: 'H', }, { - name: 'Boeing 757', + name: 'Boeing 757-200', icao: 'B752', wtc: 'H', }, { - name: 'Boeing 757', + name: 'Boeing 757-300', icao: 'B753', wtc: 'H', }, { - name: 'Boeing 767', + name: 'Boeing 767-200', icao: 'B762', wtc: 'H', }, { - name: 'Boeing 767', + name: 'Boeing 767-300', icao: 'B763', wtc: 'H', }, { - name: 'Boeing 777', + name: 'Boeing 767-400', + icao: 'B763', + wtc: 'H', + }, + { + name: 'Boeing 777-200/ER', icao: 'B772', wtc: 'H', }, { - name: 'Boeing 777', + name: 'Boeing 777-200LR', + icao: 'B77L', + wtc: 'H', + }, + { + name: 'Boeing 777-300', icao: 'B773', wtc: 'H', }, { - name: 'Boeing 787', - icao: 'B78X', + name: 'Boeing 777-300ER', + icao: 'B77W', wtc: 'H', }, { - name: 'Boeing 787', + name: 'Boeing 787-8', icao: 'B788', wtc: 'H', }, { - name: 'Boeing 787', + name: 'Boeing 787-9', icao: 'B789', wtc: 'H', }, { - name: 'Boeing 737 MAX', - icao: 'B37M', + name: 'Boeing 787-10', + icao: 'B78X', + wtc: 'H', + }, + { + name: 'Fokker 100', + icao: 'F100', wtc: 'M', }, { - name: 'Boeing 737 MAX', - icao: 'B38M', + name: 'Canadair Regional Jet CRJ-900', + icao: 'CRJ9', + wtc: 'M', + }, + { + name: 'Embraer E170', + icao: 'E170', wtc: 'M', }, { - name: 'Boeing 737 MAX', - icao: 'B39M', + name: 'Embraer E175 (short wing)', + icao: 'E75S', wtc: 'M', }, { - name: 'Boeing 737 MAX', - icao: 'B3XM', + name: 'Embraer E175 (long wing)', + icao: 'E75L', + wtc: 'M', + }, + { + name: 'Embraer E190', + icao: 'E290', + wtc: 'M', + }, + { + name: 'Embraer E195', + icao: 'E295', wtc: 'M', }, { From cdf82d310f464f58e0575a6fa497842858f334da Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 16:30:01 -0400 Subject: [PATCH 12/19] removing RJX since this type is not in the ICAO list of aircraft --- src/lib/data/aircraft.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index b91bfc2..27f5573 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -510,11 +510,6 @@ export const AIRCRAFT = [ icao: 'ATP', wtc: 'M', }, - { - name: 'Avro RJX', - icao: 'RX1H', - wtc: 'M', - }, { name: 'Embraer EMB-120', icao: 'EMB1', From 617cbcdb4c6194b8ec13fd3f4d2a894ba89b5d1b Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 16:30:40 -0400 Subject: [PATCH 13/19] removing duplicate antonovs --- src/lib/data/aircraft.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index 27f5573..ff31834 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -555,16 +555,6 @@ export const AIRCRAFT = [ icao: 'B787', wtc: 'H', }, - { - name: 'Antonov AN-124', - icao: 'AN124', - wtc: 'H', - }, - { - name: 'Antonov AN-225', - icao: 'AN225', - wtc: 'H', - }, { name: 'Cessna 172', icao: 'C172', From 09e16e5347faf38c395c258de351eb9eed80d3a1 Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 16:31:33 -0400 Subject: [PATCH 14/19] moving Beechcraft --- src/lib/data/aircraft.ts | 60 ++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index ff31834..cdf179a 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -260,6 +260,36 @@ export const AIRCRAFT = [ icao: 'B463', wtc: 'M', }, + { + name: 'Beechcraft Baron', + icao: 'BE58', + wtc: 'L', + }, + { + name: 'Beechcraft King Air 90', + icao: 'BE9L', + wtc: 'L', + }, + { + name: 'Beechcraft King Air 200', + icao: 'BE20', + wtc: 'L', + }, + { + name: 'Beechcraft King Air 350', + icao: 'BE30', + wtc: 'L', + }, + { + name: 'Beechcraft Super King Air 350', + icao: 'BE35', + wtc: 'L', + }, + { + name: 'Beechcraft 1900', + icao: 'BE19', + wtc: 'M', + }, { name: 'Bombardier DHC-8-100 Dash 8', icao: 'DH8A', @@ -615,34 +645,4 @@ export const AIRCRAFT = [ icao: 'C680', wtc: 'L', }, - { - name: 'Beechcraft Baron', - icao: 'BE58', - wtc: 'L', - }, - { - name: 'Beechcraft King Air 90', - icao: 'BE9L', - wtc: 'L', - }, - { - name: 'Beechcraft King Air 200', - icao: 'BE20', - wtc: 'L', - }, - { - name: 'Beechcraft King Air 350', - icao: 'BE30', - wtc: 'L', - }, - { - name: 'Beechcraft Super King Air 350', - icao: 'BE35', - wtc: 'L', - }, - { - name: 'Beechcraft 1900', - icao: 'BE19', - wtc: 'M', - }, ] as const; From 3990f9578cdfb4d8e2d2a87e77f838f38555db73 Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 16:34:22 -0400 Subject: [PATCH 15/19] sorting CRJ's, adding CRJ-100/200/550/700/1000 --- src/lib/data/aircraft.ts | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index cdf179a..167182e 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -491,15 +491,35 @@ export const AIRCRAFT = [ wtc: 'H', }, { - name: 'Fokker 100', - icao: 'F100', - wtc: 'M', + name: 'Canadair Regional Jet CRJ-100', + icao: 'CRJ1', + wtc: 'M', + }, + { + name: 'Canadair Regional Jet CRJ-200', + icao: 'CRJ2', + wtc: 'M', + }, + { + name: 'Canadair Regional Jet CRJ-550/700', + icao: 'CRJ7', + wtc: 'M', }, { name: 'Canadair Regional Jet CRJ-900', icao: 'CRJ9', wtc: 'M', }, + { + name: 'Canadair Regional Jet CRJ-1000', + icao: 'CRJX', + wtc: 'M', + }, + { + name: 'Fokker 100', + icao: 'F100', + wtc: 'M', + }, { name: 'Embraer E170', icao: 'E170', From 228e820d0f386edf2a0e44e6ff27b56e923b3552 Mon Sep 17 00:00:00 2001 From: Chris Pryazhentsev Date: Fri, 13 Sep 2024 17:44:43 -0400 Subject: [PATCH 16/19] adding A300-600 --- src/lib/data/aircraft.ts | 161 ++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 96 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index 167182e..43ac24b 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -24,6 +24,11 @@ export const AIRCRAFT = [ icao: 'BCS3', wtc: 'M', }, + { + name: 'Airbus A300-600', + icao: 'A306', + wtc: 'H', + }, { name: 'Airbus A310', icao: 'A310', @@ -64,12 +69,6 @@ export const AIRCRAFT = [ icao: 'A21N', wtc: 'M', }, - - { - name: 'Airbus A330', - icao: 'A330', - wtc: 'H', - }, { name: 'Airbus A330-200', icao: 'A332', @@ -490,6 +489,11 @@ export const AIRCRAFT = [ icao: 'B78X', wtc: 'H', }, + { + name: 'British Aerospace ATP', + icao: 'ATP', + wtc: 'M', + }, { name: 'Canadair Regional Jet CRJ-100', icao: 'CRJ1', @@ -515,96 +519,6 @@ export const AIRCRAFT = [ icao: 'CRJX', wtc: 'M', }, - { - name: 'Fokker 100', - icao: 'F100', - wtc: 'M', - }, - { - name: 'Embraer E170', - icao: 'E170', - wtc: 'M', - }, - { - name: 'Embraer E175 (short wing)', - icao: 'E75S', - wtc: 'M', - }, - { - name: 'Embraer E175 (long wing)', - icao: 'E75L', - wtc: 'M', - }, - { - name: 'Embraer E190', - icao: 'E290', - wtc: 'M', - }, - { - name: 'Embraer E195', - icao: 'E295', - wtc: 'M', - }, - { - name: 'Gulfstream/Rockwell (Aero) Commander', - icao: 'AC68', - wtc: 'L', - }, - { - name: 'Gulfstream/Rockwell (Aero) Turbo Commander', - icao: 'AC90', - wtc: 'L', - }, - { - name: 'British Aerospace ATP', - icao: 'ATP', - wtc: 'M', - }, - { - name: 'Embraer EMB-120', - icao: 'EMB1', - wtc: 'M', - }, - { - name: 'Embraer EMB-145', - icao: 'EMB4', - wtc: 'M', - }, - { - name: 'Embraer EMB-170', - icao: 'EMB7', - wtc: 'M', - }, - { - name: 'Embraer EMB-190', - icao: 'EMB9', - wtc: 'M', - }, - { - name: 'Airbus A350', - icao: 'A350', - wtc: 'H', - }, - { - name: 'Boeing 747', - icao: 'B747', - wtc: 'H', - }, - { - name: 'Boeing 767', - icao: 'B767', - wtc: 'H', - }, - { - name: 'Boeing 777', - icao: 'B777', - wtc: 'H', - }, - { - name: 'Boeing 787', - icao: 'B787', - wtc: 'H', - }, { name: 'Cessna 172', icao: 'C172', @@ -665,4 +579,59 @@ export const AIRCRAFT = [ icao: 'C680', wtc: 'L', }, + { + name: 'Embraer EMB-120 Brasilia', + icao: 'E120', + wtc: 'M', + }, + { + name: 'Embraer ERJ-135', + icao: 'E135', + wtc: 'M', + }, + { + name: 'Embraer ERJ-145', + icao: 'E145', + wtc: 'M', + }, + { + name: 'Embraer ERJ-170', + icao: 'E170', + wtc: 'M', + }, + { + name: 'Embraer ERJ-175', + icao: 'E175', + wtc: 'M', + }, + { + name: 'Embraer ERJ-190', + icao: 'EMB9', + wtc: 'M', + }, + { + name: 'Embraer E190 E2', + icao: 'E290', + wtc: 'M', + }, + { + name: 'Embraer E195 E2', + icao: 'E295', + wtc: 'M', + }, + { + name: 'Fokker 100', + icao: 'F100', + wtc: 'M', + }, + { + name: 'Gulfstream/Rockwell (Aero) Commander', + icao: 'AC68', + wtc: 'L', + }, + { + name: 'Gulfstream/Rockwell (Aero) Turbo Commander', + icao: 'AC90', + wtc: 'L', + }, ] as const; From 5bd58acb1f9d216a885629c419e1e3f080b0fffb Mon Sep 17 00:00:00 2001 From: Johan Ohly Date: Sun, 6 Oct 2024 20:28:09 +0200 Subject: [PATCH 17/19] fix: replace invalid ICAO E175 with E75S and E75L --- src/lib/data/aircraft.ts | 63 ++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index 43ac24b..d630fe6 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -290,24 +290,24 @@ export const AIRCRAFT = [ wtc: 'M', }, { - name: 'Bombardier DHC-8-100 Dash 8', - icao: 'DH8A', - wtc: 'M', + name: 'Bombardier DHC-8-100 Dash 8', + icao: 'DH8A', + wtc: 'M', }, { - name: 'Bombardier DHC-8-200 Dash 8', - icao: 'DH8B', - wtc: 'M', + name: 'Bombardier DHC-8-200 Dash 8', + icao: 'DH8B', + wtc: 'M', }, { - name: 'Bombardier DHC-8-300 Dash 8', - icao: 'DH8C', - wtc: 'M', + name: 'Bombardier DHC-8-300 Dash 8', + icao: 'DH8C', + wtc: 'M', }, { - name: 'Bombardier DHC-8-400 Dash 8', - icao: 'DH8D', - wtc: 'M', + name: 'Bombardier DHC-8-400 Dash 8', + icao: 'DH8D', + wtc: 'M', }, { name: 'Boeing 707-100', @@ -495,29 +495,29 @@ export const AIRCRAFT = [ wtc: 'M', }, { - name: 'Canadair Regional Jet CRJ-100', - icao: 'CRJ1', - wtc: 'M', + name: 'Canadair Regional Jet CRJ-100', + icao: 'CRJ1', + wtc: 'M', }, { - name: 'Canadair Regional Jet CRJ-200', - icao: 'CRJ2', - wtc: 'M', + name: 'Canadair Regional Jet CRJ-200', + icao: 'CRJ2', + wtc: 'M', }, { - name: 'Canadair Regional Jet CRJ-550/700', - icao: 'CRJ7', - wtc: 'M', + name: 'Canadair Regional Jet CRJ-550/700', + icao: 'CRJ7', + wtc: 'M', }, { - name: 'Canadair Regional Jet CRJ-900', - icao: 'CRJ9', - wtc: 'M', + name: 'Canadair Regional Jet CRJ-900', + icao: 'CRJ9', + wtc: 'M', }, { - name: 'Canadair Regional Jet CRJ-1000', - icao: 'CRJX', - wtc: 'M', + name: 'Canadair Regional Jet CRJ-1000', + icao: 'CRJX', + wtc: 'M', }, { name: 'Cessna 172', @@ -600,8 +600,13 @@ export const AIRCRAFT = [ wtc: 'M', }, { - name: 'Embraer ERJ-175', - icao: 'E175', + name: 'Embraer E175 (short wing)', + icao: 'E75S', + wtc: 'M', + }, + { + name: 'Embraer E175 (long wing)', + icao: 'E75L', wtc: 'M', }, { From 8fb633997d16c826a6e12c303b707c8a8655f11f Mon Sep 17 00:00:00 2001 From: Johan Ohly Date: Sun, 6 Oct 2024 20:32:00 +0200 Subject: [PATCH 18/19] fix: remove duplicate entries --- src/lib/data/aircraft.ts | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts index d630fe6..1bb0d63 100644 --- a/src/lib/data/aircraft.ts +++ b/src/lib/data/aircraft.ts @@ -24,11 +24,6 @@ export const AIRCRAFT = [ icao: 'BCS3', wtc: 'M', }, - { - name: 'Airbus A300-600', - icao: 'A306', - wtc: 'H', - }, { name: 'Airbus A310', icao: 'A310', @@ -154,11 +149,6 @@ export const AIRCRAFT = [ icao: 'AT75', wtc: 'M', }, - { - name: 'ATR-72-600', - icao: 'AT75', - wtc: 'M', - }, { name: 'Antonov AN-12', icao: 'AN12', @@ -451,7 +441,7 @@ export const AIRCRAFT = [ }, { name: 'Boeing 767-400', - icao: 'B763', + icao: 'B764', wtc: 'H', }, { From df2e939f4aa5e4e2803eeb78a8d9f1dd9bca063c Mon Sep 17 00:00:00 2001 From: Johan Ohly Date: Sun, 6 Oct 2024 20:57:45 +0200 Subject: [PATCH 19/19] fix: migrate "invalid" ICAO aircraft type codes to valid equivalents --- .../migration.sql | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 prisma/migrations/20241006184406_icao_aircraft_codes/migration.sql diff --git a/prisma/migrations/20241006184406_icao_aircraft_codes/migration.sql b/prisma/migrations/20241006184406_icao_aircraft_codes/migration.sql new file mode 100644 index 0000000..e4a398f --- /dev/null +++ b/prisma/migrations/20241006184406_icao_aircraft_codes/migration.sql @@ -0,0 +1,19 @@ +UPDATE flight +SET aircraft = CASE aircraft + WHEN 'A330' THEN 'A333' + WHEN 'EMB1' THEN 'E120' + WHEN 'EMB4' THEN 'E145' + WHEN 'EMB7' THEN 'E170' + WHEN 'A350' THEN 'A359' + WHEN 'A380' THEN 'A388' + WHEN 'B737' THEN 'B738' + WHEN 'B747' THEN 'B744' + WHEN 'B767' THEN 'B763' + WHEN 'B777' THEN 'B772' + WHEN 'B787' THEN 'B789' + WHEN 'AN124' THEN 'A124' + WHEN 'AN225' THEN 'A225' + ELSE aircraft + END +WHERE aircraft IN + ('A330', 'EMB1', 'EMB4', 'EMB7', 'A350', 'A380', 'B737', 'B747', 'B767', 'B777', 'B787', 'AN124', 'AN225');