Fixes #915 - CTAs north of EGNT now H24 (#917)

* TopSky 2.5b15 * Make ADN-NATEB dependent on EGD514 * cl
VATSIM-UK · Nov 29, 2024 · 2bb3853 · 2bb3853
1 parent 8045949
commit 2bb3853
Show file tree

Hide file tree

Showing 13 changed files with 90 additions and 232 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -5,6 +5,8 @@
 4. Bug - TopSky DCL now automatically inserts primary frequency as next frequency - thanks to @luke11brown (Luke Brown)
 5. Enhancement - Added Farnborough (EGLL) profile & displays - thanks to @SamLefevre (Samuel Lefevre)
 6. Enhancement - Intergrate custom Southend features - thanks to @SamLefevre (Samuel Lefevre)
+7. Enhancement - Updated TopSky to latest beta (2.5b15) - thanks to @luke11brown (Luke Brown)
+8. AIRAC (2407) - Borders/Forth/Tay CTA between ADN-NATEB now H24 unless EGD514 active - thanks to @luke11brown (Luke Brown)
 
 # Changes from release 2024/10 to 2024/11
 1. Enhancement - Add various aliases to Heathrow (EGLL) profile - thanks to @kristiankunc (Kristián Kunc)

diff --git a/UK/Data/Plugin/TopSky_NERC/ICAO_Aircraft.json b/UK/Data/Plugin/TopSky_NERC/ICAO_Aircraft.json
diff --git a/UK/Data/Plugin/TopSky_NERC/TopSky.dll b/UK/Data/Plugin/TopSky_NERC/TopSky.dll
diff --git a/UK/Data/Plugin/TopSky_NERC/TopSkyMaps.txt b/UK/Data/Plugin/TopSky_NERC/TopSkyMaps.txt
@@ -1017,7 +1017,7 @@ LINE:N051.35.35.836:W000.14.08.875:N051.35.23.578:W000.14.13.254
 LINE:N051.35.23.578:W000.14.13.254:N051.35.06.761:W000.14.19.096
 LINE:N051.35.06.761:W000.14.19.096:N051.34.51.234:W000.14.13.769
 LINE:N051.34.51.234:W000.14.13.769:N051.34.39.658:W000.14.12.328
-LINE:N051.34.39.658:W000.14.12:328:N051.34.21:193:W000.13.48:224
+LINE:N051.34.39.658:W000.14.12:328:N051.34.21:193:W000.13.48.224
 LINE:N052.01.05.346:W000.12.26.214:N052.00.52.899:W000.12.20.989
 LINE:N052.00.52.899:W000.12.20.989:N052.00.42.251:W000.12.14.796
 LINE:N052.00.42.251:W000.12.14.796:N052.00.33.809:W000.12.08.239
@@ -1762,29 +1762,7 @@ COORD:N056.28.48.000:W002.05.56.000
 COORD:N056.43.25.000:W002.11.34.000
 COORD:N056.55.07.000:W002.19.52.000
 COORDPOLY:100
-//Inactive Jan - DST
-ACTIVE:0101:0329:1:1000:0000
-ACTIVE:0101:0329:2345:0000:0530
-ACTIVE:0101:0329:234:0900:0530
-ACTIVE:0101:0329:5:0900:1500
-//Inactive DST - May
-ACTIVE:0330:0430:1:0900:0000
-ACTIVE:0330:0430:2345:0000:0430
-ACTIVE:0330:0430:234:0800:0430
-ACTIVE:0330:0430:5:0800:1400
-//Inactive May - Sep (M-T 0900-1900)
-ACTIVE:0501:0930:1234:0900:1900
-ACTIVE:0501:0930:5:0900:1400
-//Inactive Oct - DST
-ACTIVE:1001:1026:1:0900:0000
-ACTIVE:1001:1026:2345:0000:0430
-ACTIVE:1001:1026:234:0800:0430
-ACTIVE:1001:1026:5:0800:1400
-//Inactive DST - Dec
-ACTIVE:1027:1231:1:1000:0000
-ACTIVE:1027:1231:2345:0000:0530
-ACTIVE:1027:1231:234:0900:0530
-ACTIVE:1027:1231:5:0900:1500
+ACTIVE:AREA:EGD514
 
 MAP:Tay/Borders CTA Conditional Airspace
 FOLDER:Conditional Airspace
@@ -1861,29 +1839,7 @@ TEXT:N056.20.52.901:W001.54.38.318:FL135
 TEXT:N055.57.05.463:W001.44.50.553:FL155
 TEXT:N055.21.24.306:W001.35.21.156:FL155
 //Active Jan - DST
-ACTIVE:0101:0329:1:0000:1000
-ACTIVE:0101:0329:2345:0530:0900
-ACTIVE:0101:0329:5:1500:0000
-ACTIVE:0101:0329:67:0000:0000
-//Active DST - May
-ACTIVE:0330:0430:1:0000:0900
-ACTIVE:0330:0430:2345:0430:0800
-ACTIVE:0330:0430:5:1400:0000
-ACTIVE:0330:0430:67:0000:0000
-//Active May - Sep (M-T 1900-0900)
-ACTIVE:0501:0930:1234:1900:0900
-ACTIVE:0501:0930:5:1400:0000
-ACTIVE:0501:0930:67:0000:0000
-//Active Oct - DST
-ACTIVE:1001:1026:1:0000:0900
-ACTIVE:1001:1026:2345:0430:0800
-ACTIVE:1001:1026:5:1400:0000
-ACTIVE:1001:1026:67:0000:0000
-//Active DST - Dec
-ACTIVE:1027:1231:1:0000:1000
-ACTIVE:1027:1231:2345:0530:0900
-ACTIVE:1027:1231:5:1500:0000
-ACTIVE:1027:1231:67:0000:0000
+ACTIVE:AREA:*:EGD514
 
 //Berry Head CTA (Time Restricted Airspace)
 

diff --git a/UK/Data/Plugin/TopSky_NODE/ICAO_Aircraft.json b/UK/Data/Plugin/TopSky_NODE/ICAO_Aircraft.json
diff --git a/UK/Data/Plugin/TopSky_NODE/TopSky.dll b/UK/Data/Plugin/TopSky_NODE/TopSky.dll
diff --git a/UK/Data/Plugin/TopSky_NODE/TopSkyMaps.txt b/UK/Data/Plugin/TopSky_NODE/TopSkyMaps.txt
@@ -1017,7 +1017,7 @@ LINE:N051.35.35.836:W000.14.08.875:N051.35.23.578:W000.14.13.254
 LINE:N051.35.23.578:W000.14.13.254:N051.35.06.761:W000.14.19.096
 LINE:N051.35.06.761:W000.14.19.096:N051.34.51.234:W000.14.13.769
 LINE:N051.34.51.234:W000.14.13.769:N051.34.39.658:W000.14.12.328
-LINE:N051.34.39.658:W000.14.12:328:N051.34.21:193:W000.13.48:224
+LINE:N051.34.39.658:W000.14.12:328:N051.34.21:193:W000.13.48.224
 LINE:N052.01.05.346:W000.12.26.214:N052.00.52.899:W000.12.20.989
 LINE:N052.00.52.899:W000.12.20.989:N052.00.42.251:W000.12.14.796
 LINE:N052.00.42.251:W000.12.14.796:N052.00.33.809:W000.12.08.239
@@ -1762,29 +1762,7 @@ COORD:N056.28.48.000:W002.05.56.000
 COORD:N056.43.25.000:W002.11.34.000
 COORD:N056.55.07.000:W002.19.52.000
 COORDPOLY:100
-//Inactive Jan - DST
-ACTIVE:0101:0329:1:1000:0000
-ACTIVE:0101:0329:2345:0000:0530
-ACTIVE:0101:0329:234:0900:0530
-ACTIVE:0101:0329:5:0900:1500
-//Inactive DST - May
-ACTIVE:0330:0430:1:0900:0000
-ACTIVE:0330:0430:2345:0000:0430
-ACTIVE:0330:0430:234:0800:0430
-ACTIVE:0330:0430:5:0800:1400
-//Inactive May - Sep (M-T 0900-1900)
-ACTIVE:0501:0930:1234:0900:1900
-ACTIVE:0501:0930:5:0900:1400
-//Inactive Oct - DST
-ACTIVE:1001:1026:1:0900:0000
-ACTIVE:1001:1026:2345:0000:0430
-ACTIVE:1001:1026:234:0800:0430
-ACTIVE:1001:1026:5:0800:1400
-//Inactive DST - Dec
-ACTIVE:1027:1231:1:1000:0000
-ACTIVE:1027:1231:2345:0000:0530
-ACTIVE:1027:1231:234:0900:0530
-ACTIVE:1027:1231:5:0900:1500
+ACTIVE:AREA:EGD514
 
 MAP:Tay/Borders CTA Conditional Airspace
 FOLDER:Conditional Airspace
@@ -1861,29 +1839,7 @@ TEXT:N056.20.52.901:W001.54.38.318:FL135
 TEXT:N055.57.05.463:W001.44.50.553:FL155
 TEXT:N055.21.24.306:W001.35.21.156:FL155
 //Active Jan - DST
-ACTIVE:0101:0329:1:0000:1000
-ACTIVE:0101:0329:2345:0530:0900
-ACTIVE:0101:0329:5:1500:0000
-ACTIVE:0101:0329:67:0000:0000
-//Active DST - May
-ACTIVE:0330:0430:1:0000:0900
-ACTIVE:0330:0430:2345:0430:0800
-ACTIVE:0330:0430:5:1400:0000
-ACTIVE:0330:0430:67:0000:0000
-//Active May - Sep (M-T 1900-0900)
-ACTIVE:0501:0930:1234:1900:0900
-ACTIVE:0501:0930:5:1400:0000
-ACTIVE:0501:0930:67:0000:0000
-//Active Oct - DST
-ACTIVE:1001:1026:1:0000:0900
-ACTIVE:1001:1026:2345:0430:0800
-ACTIVE:1001:1026:5:1400:0000
-ACTIVE:1001:1026:67:0000:0000
-//Active DST - Dec
-ACTIVE:1027:1231:1:0000:1000
-ACTIVE:1027:1231:2345:0530:0900
-ACTIVE:1027:1231:5:1500:0000
-ACTIVE:1027:1231:67:0000:0000
+ACTIVE:AREA:*:EGD514
 
 //Berry Head CTA (Time Restricted Airspace)