From ed3dc59f8732af880eae2a88a92e592e33545007 Mon Sep 17 00:00:00 2001
From: "DotWallop (Mats)" <79384776+DotWallop@users.noreply.github.com>
Date: Sun, 19 Jan 2025 15:20:54 +0100
Subject: [PATCH 1/6] 1.0.1-rc.3
---
CHANGELOG.md | 5 ++
src/assets/icons/aircraft/L101.svg | 11 +++
src/assets/icons/aircraft/SR71.svg | 11 +++
src/assets/icons/aircraft/b407.svg | 11 +++
src/assets/icons/aircraft/bn2p.svg | 11 +++
src/assets/icons/aircraft/cp10.svg | 11 +++
src/assets/icons/aircraft/dc86.svg | 11 +++
src/assets/icons/aircraft/e75s.svg | 11 +++
src/assets/icons/aircraft/rfal.svg | 11 +++
src/assets/icons/aircraft/spit.svg | 11 +++
src/assets/icons/aircraft/tl20.svg | 11 +++
src/assets/icons/aircraft/tris.svg | 11 +++
src/assets/icons/aircraft/v22.svg | 11 +++
src/assets/icons/aircraft/vamp.svg | 11 +++
src/assets/icons/aircraft/vulc.svg | 11 +++
src/utils/icons.ts | 111 ++++++++++++++++++++++++++++-
16 files changed, 269 insertions(+), 1 deletion(-)
create mode 100644 src/assets/icons/aircraft/L101.svg
create mode 100644 src/assets/icons/aircraft/SR71.svg
create mode 100644 src/assets/icons/aircraft/b407.svg
create mode 100644 src/assets/icons/aircraft/bn2p.svg
create mode 100644 src/assets/icons/aircraft/cp10.svg
create mode 100644 src/assets/icons/aircraft/dc86.svg
create mode 100644 src/assets/icons/aircraft/e75s.svg
create mode 100644 src/assets/icons/aircraft/rfal.svg
create mode 100644 src/assets/icons/aircraft/spit.svg
create mode 100644 src/assets/icons/aircraft/tl20.svg
create mode 100644 src/assets/icons/aircraft/tris.svg
create mode 100644 src/assets/icons/aircraft/v22.svg
create mode 100644 src/assets/icons/aircraft/vamp.svg
create mode 100644 src/assets/icons/aircraft/vulc.svg
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6eaacfd9..4861ea9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
# Changelog
+# [1.0.1-rc.3]
+
+- New icons from DotWallop (B407, BN2P, C525, CP10, DC86, E50P, E55P, E75S/L, L101, RFAL, SPIT, SR71, TL20, TRIS, V22, VAMP, VULC)
+- Corrected model matching (BAe 146/Avro RJ series, BCS3)
+
# [1.0.1-rc.2]
- Disabled v1 update popup
diff --git a/src/assets/icons/aircraft/L101.svg b/src/assets/icons/aircraft/L101.svg
new file mode 100644
index 00000000..8f544813
--- /dev/null
+++ b/src/assets/icons/aircraft/L101.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/SR71.svg b/src/assets/icons/aircraft/SR71.svg
new file mode 100644
index 00000000..4b5ad95c
--- /dev/null
+++ b/src/assets/icons/aircraft/SR71.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/b407.svg b/src/assets/icons/aircraft/b407.svg
new file mode 100644
index 00000000..369facd4
--- /dev/null
+++ b/src/assets/icons/aircraft/b407.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/bn2p.svg b/src/assets/icons/aircraft/bn2p.svg
new file mode 100644
index 00000000..35da5b2b
--- /dev/null
+++ b/src/assets/icons/aircraft/bn2p.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/cp10.svg b/src/assets/icons/aircraft/cp10.svg
new file mode 100644
index 00000000..615d2f3f
--- /dev/null
+++ b/src/assets/icons/aircraft/cp10.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/dc86.svg b/src/assets/icons/aircraft/dc86.svg
new file mode 100644
index 00000000..dc68c14e
--- /dev/null
+++ b/src/assets/icons/aircraft/dc86.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/e75s.svg b/src/assets/icons/aircraft/e75s.svg
new file mode 100644
index 00000000..9ae906be
--- /dev/null
+++ b/src/assets/icons/aircraft/e75s.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/rfal.svg b/src/assets/icons/aircraft/rfal.svg
new file mode 100644
index 00000000..bb7cd3ef
--- /dev/null
+++ b/src/assets/icons/aircraft/rfal.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/spit.svg b/src/assets/icons/aircraft/spit.svg
new file mode 100644
index 00000000..f9ab2d49
--- /dev/null
+++ b/src/assets/icons/aircraft/spit.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/tl20.svg b/src/assets/icons/aircraft/tl20.svg
new file mode 100644
index 00000000..a525c487
--- /dev/null
+++ b/src/assets/icons/aircraft/tl20.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/tris.svg b/src/assets/icons/aircraft/tris.svg
new file mode 100644
index 00000000..142d533d
--- /dev/null
+++ b/src/assets/icons/aircraft/tris.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/v22.svg b/src/assets/icons/aircraft/v22.svg
new file mode 100644
index 00000000..6f964579
--- /dev/null
+++ b/src/assets/icons/aircraft/v22.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/vamp.svg b/src/assets/icons/aircraft/vamp.svg
new file mode 100644
index 00000000..4f3b99e1
--- /dev/null
+++ b/src/assets/icons/aircraft/vamp.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/vulc.svg b/src/assets/icons/aircraft/vulc.svg
new file mode 100644
index 00000000..32992a86
--- /dev/null
+++ b/src/assets/icons/aircraft/vulc.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/utils/icons.ts b/src/utils/icons.ts
index 77d4642a..d826a49e 100644
--- a/src/utils/icons.ts
+++ b/src/utils/icons.ts
@@ -1,6 +1,23 @@
import type { VatsimPilot, VatsimShortenedAircraft } from '~/types/data/vatsim';
export type AircraftIcon =
+ | 'vulc'
+ | 'vamp'
+ | 'v22'
+ | 'tris'
+ | 'tl20'
+ | 'sr71'
+ | 'spit'
+ | 'rfal'
+ | 'l101'
+ | 'e75s'
+ | 'dc86'
+ | 'cp10'
+ | 'bn2p'
+ | 'b407'
+ | 'e55p'
+ | 'e50p'
+ | 'c525'
| 'pc24'
| 's12'
| 'pite'
@@ -198,6 +215,74 @@ type AircraftIcons = {
};
export const aircraftIcons: AircraftIcons = {
+ vulc: {
+ icon: 'vulc',
+ width: getAircraftSizeByCoef(0.51),
+ },
+ vamp: {
+ icon: 'vamp',
+ width: getAircraftSizeByCoef(0.19),
+ },
+ v22: {
+ icon: 'v22',
+ width: getAircraftSizeByCoef(0.43),
+ },
+ tris: {
+ icon: 'tris',
+ width: getAircraftSizeByCoef(0.25),
+ },
+ tl20: {
+ icon: 'tl20',
+ width: getAircraftSizeByCoef(0.15),
+ },
+ sr71: {
+ icon: 'sr71',
+ width: getAircraftSizeByCoef(0.28),
+ },
+ spit: {
+ icon: 'spit',
+ width: getAircraftSizeByCoef(0.19),
+ },
+ rfal: {
+ icon: 'rfal',
+ width: getAircraftSizeByCoef(0.18),
+ },
+ l101: {
+ icon: 'l101',
+ width: getAircraftSizeByCoef(0.79),
+ },
+ e75s: {
+ icon: 'e75s',
+ width: getAircraftSizeByCoef(0.43),
+ },
+ dc86: {
+ icon: 'dc86',
+ width: getAircraftSizeByCoef(0.72),
+ },
+ cp10: {
+ icon: 'cp10',
+ width: getAircraftSizeByCoef(0.13),
+ },
+ bn2p: {
+ icon: 'bn2p',
+ width: getAircraftSizeByCoef(0.25),
+ },
+ b407: {
+ icon: 'b407',
+ width: getAircraftSizeByCoef(0.18),
+ },
+ e55p: {
+ icon: 'e55p',
+ width: getAircraftSizeByCoef(0.27),
+ },
+ e50p: {
+ icon: 'e50p',
+ width: getAircraftSizeByCoef(0.21),
+ },
+ c525: {
+ icon: 'c525',
+ width: getAircraftSizeByCoef(0.24),
+ },
pc24: {
icon: 'pc24',
width: getAircraftSizeByCoef(0.30),
@@ -910,6 +995,14 @@ export function getAircraftIcon(aircraft: VatsimShortenedAircraft | VatsimPilot)
if (faa?.startsWith('P28')) return aircraftIcons.p28x;
switch (faa) {
+ case 'TRI':
+ return aircraftIcons.tris
+ case 'E750':
+ case 'E755':
+ case 'E75L':
+ return aircraftIcons.e75s;
+ case 'BCS3':
+ return aircraftIcons.bcs1;
case 'PITA':
return aircraftIcons.pite;
case 'A306':
@@ -1035,7 +1128,6 @@ export function getAircraftIcon(aircraft: VatsimShortenedAircraft | VatsimPilot)
case 'B214':
case 'B230':
case 'B222':
- case 'B407':
case 'B412':
case 'B427':
case 'B429':
@@ -1306,6 +1398,23 @@ export function getAircraftIcon(aircraft: VatsimShortenedAircraft | VatsimPilot)
case 'PITE':
case 'S12':
case 'PC24':
+ case 'C525':
+ case 'B407':
+ case 'BN2P':
+ case 'CP10':
+ case 'DC86':
+ case 'E50P':
+ case 'E55P':
+ case 'E75S':
+ case 'L101':
+ case 'RFAL':
+ case 'SPIT':
+ case 'SR71':
+ case 'TL20':
+ case 'TRIS':
+ case 'V22':
+ case 'VAMP':
+ case 'VULC':
return aircraftIcons[faa.toLowerCase() as AircraftIcon];
default:
return aircraftIcons.a320;
From 6004f25e60152a737763cad49f332fc851a55d71 Mon Sep 17 00:00:00 2001
From: "DotWallop (Mats)" <79384776+DotWallop@users.noreply.github.com>
Date: Sun, 19 Jan 2025 15:54:33 +0100
Subject: [PATCH 2/6] 1.0.1-rc.3
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 6daad6b4..64f51f73 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "vatsim-radar",
- "version": "1.0.1-rc.2",
+ "version": "1.0.1-rc.3",
"private": true,
"type": "module",
"scripts": {
From 8089ffb7240c236cad14436b4aeb6ee55e1ff3c9 Mon Sep 17 00:00:00 2001
From: Danila Rodichkin
Date: Sun, 19 Jan 2025 18:00:29 +0300
Subject: [PATCH 3/6] Rename SR71.svg to sr71.svg
---
src/assets/icons/aircraft/{SR71.svg => sr71.svg} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename src/assets/icons/aircraft/{SR71.svg => sr71.svg} (100%)
diff --git a/src/assets/icons/aircraft/SR71.svg b/src/assets/icons/aircraft/sr71.svg
similarity index 100%
rename from src/assets/icons/aircraft/SR71.svg
rename to src/assets/icons/aircraft/sr71.svg
From f9aff85f0adf92f3065f6b85b01c38099d4961df Mon Sep 17 00:00:00 2001
From: Danila Rodichkin
Date: Sun, 19 Jan 2025 18:00:57 +0300
Subject: [PATCH 4/6] Rename L101.svg to l101.svg
---
src/assets/icons/aircraft/{L101.svg => l101.svg} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename src/assets/icons/aircraft/{L101.svg => l101.svg} (100%)
diff --git a/src/assets/icons/aircraft/L101.svg b/src/assets/icons/aircraft/l101.svg
similarity index 100%
rename from src/assets/icons/aircraft/L101.svg
rename to src/assets/icons/aircraft/l101.svg
From 6f69f09e517c1cf61ed55e8fbd25687f36478be3 Mon Sep 17 00:00:00 2001
From: "DotWallop (Mats)" <79384776+DotWallop@users.noreply.github.com>
Date: Sun, 19 Jan 2025 16:10:04 +0100
Subject: [PATCH 5/6] 1.0.1-rc.3
---
src/assets/icons/aircraft/c525.svg | 11 +++++++++++
src/assets/icons/aircraft/e50p.svg | 11 +++++++++++
src/assets/icons/aircraft/e55p.svg | 11 +++++++++++
3 files changed, 33 insertions(+)
create mode 100644 src/assets/icons/aircraft/c525.svg
create mode 100644 src/assets/icons/aircraft/e50p.svg
create mode 100644 src/assets/icons/aircraft/e55p.svg
diff --git a/src/assets/icons/aircraft/c525.svg b/src/assets/icons/aircraft/c525.svg
new file mode 100644
index 00000000..a8786c54
--- /dev/null
+++ b/src/assets/icons/aircraft/c525.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/e50p.svg b/src/assets/icons/aircraft/e50p.svg
new file mode 100644
index 00000000..a7f6d9d2
--- /dev/null
+++ b/src/assets/icons/aircraft/e50p.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/assets/icons/aircraft/e55p.svg b/src/assets/icons/aircraft/e55p.svg
new file mode 100644
index 00000000..18142c33
--- /dev/null
+++ b/src/assets/icons/aircraft/e55p.svg
@@ -0,0 +1,11 @@
+
From 849a055a5eb4bc1cdc458ee823b7a9bd43870fe6 Mon Sep 17 00:00:00 2001
From: Danila Rodichkin
Date: Mon, 20 Jan 2025 22:06:39 +0300
Subject: [PATCH 6/6] Update CHANGELOG.md
---
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4861ea9e..bfa352ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
- New icons from DotWallop (B407, BN2P, C525, CP10, DC86, E50P, E55P, E75S/L, L101, RFAL, SPIT, SR71, TL20, TRIS, V22, VAMP, VULC)
- Corrected model matching (BAe 146/Avro RJ series, BCS3)
+- Fixed FSS errors in VATGlasses mode by Felix
# [1.0.1-rc.2]