Merge branch 'VATSIM-UK:main' into main

Author: luke11brown

.github/CHANGELOG.md

@@ -1,3 +1,85 @@
+# Changes from release 2024/06 to 2024/07
+1. AIRAC (2407) - Converted Brize Norton (EGVN) frequencies to 8.33kHz spacing - thanks to @danielbutton (Daniel Button)
+2. Procedure Change (2407) - Updated Cambridge (EGSC) and Ronaldsway (EGNS) frequencies - thanks to @PLM1995 (Peter Mooney)
+3. Enhancement - Changed Jersey Profile from Park Air to NOVA 9000 - thanks to @SamLefevre (Samuel Lefevre)
+4. Enhancement - TopSky updated to 2.5 beta 9 - thanks to @luke11brown (Luke Brown)
+5. Enhancement - Updated vSMR and added Heathrow (EGLL) Geofenced config - thanks to @AliceFord (Alice Ford)
+6. Enhancement - Added Glasgow radar lines - thanks to @luke11brown (Luke Brown)
+
+# Changes from release 2024/04 to 2024/06
+1. Bug - Fixed Heathrow profiles not loading the Heathrow Alias - thanks to @hazzas-99
+2. Bug - Updated VATCAN Event Bookings plugin and list configuration - thanks to @hazzas-99
+3. AIRAC (2404) - Changed Fairoaks (EGTF) Position from FISO to A/G - thanks to @hazzas-99
+4. Bug - Fixes in PC vATIS profile - thanks to @robbo599 (Lee Roberts)
+5. Bug - Fixed vATIS Manchester (EGCC) ATIS frequency and Jersey (EGJJ) TOWER frequency - thanks to @RedstonePilot (Ben Walker) 
+6. Enhancement - Merged Hawarden (EGNR) into Liverpool (EGGP) and Updated Gatwick (EGKK) ARPT_COND - thanks to @RedstonePilot (Ben Walker) 
+7. AIRAC (2404) - Updated military frequencies (EGOQ, EGOV, EGQL) - thanks to @kristiankunc (Kristián Kunc)
+8. AIRAC (2405) - Added D218 complex (Fairford) to TopSky danger areas - thanks to @luke11brown (Luke Brown)
+9. Bug - Fixed vATIS transition levels - thanks to @lewishh
+10. AIRAC (2405) - Prestwick (EGPK) Runway Designator Change - thanks to @lewishh
+11. Procedure Change (2405) - Redhill (EGKR) added to Gatwick profile - thanks to @luke11brown (Luke Brown)
+12. Enhancement - Custom EuroScope sounds added as default - thanks to @luke11brown (Luke Brown)
+13. Bug - Displayed all SCT2 (holding points & stand numbers) on all SMR style displays - thanks to @luke11brown (Luke Brown)
+14. Bug - Path to VCH plugin fixed on area profiles - thanks to @luke11brown (Luke Brown)
+15. AIRAC (2406) - EGKK SMAA Area C added to TopSky MSAW data - thanks to @luke11brown (Luke Brown)
+16. Enhancement - Added Route checker display to all SMR profiles - thanks to @luke11brown (Luke Brown)
+17. Enhancement - Added SRW display to all SMR profiles - thanks to @luke11brown (Luke Brown)
+18. Bug - Fix overlapping items on radar displays - thanks to @SamLefevre (Samuel Lefevre)
+19. Enhancement - Updated East Midlands Profile - thanks to @SamLefevre (Samuel Lefevre)
+
+# Changes from release 2024/03 to 2024/04
+1. Enhancement - Enabled Leeds Radar Gate on profiles - thanks to @SamLefevre (Samuel Lefevre)
+2. AIRAC (2404) - Amended Benbecula (EGPL) ATIS frequency - thanks to @ChrisXPP (Christoph Reule)
+3. Enhancement - Added VCH columns (hidden) to the relevant lists - thanks to @RedstonePilot (Ben Walker) 
+4. Bug - Fix typo in voice.txt EGHC_ATIS  - thanks to @RedstonePilot (Ben Walker)
+5. Enhancement - Added wallop aliases - thanks to @SamLefevre (Samuel Lefevre)
+6. Enhancement - Displayed all ATZs for AGCS/AFIS endorsed positions - thanks to @RedstonePilot (Ben Walker)
+7. Enhancement - Added ADC vAtis profiles - thanks to @RedstonePilot (Ben Walker)
+8. Bug - Fixed error in AC profiles settings paths - thanks to @hazzas-99
+9. Enhancement - Added R/T column to arrival lists - thanks to @hazzas-99
+10. Enhancement - Added iTEC profiles for Scottish AC - thanks to @SamLefevre (Samuel Lefevre)
+11. Enhancement - Changed from UniATIS to VATATIS - thanks to @SamLefevre (Samuel Lefevre)
+12. Enhancement - Various updates to Heathrow alias, voice and profiles in advance of CTP 24W - thanks to @hazzas-99
+
+# Changes from release 2024/01 to 2024/03
+1. Bug - Fix Edinburgh extended centreline - thanks to @SamLefevre (Samuel Lefevre)
+2. Enhancement (TopSky) - Added additional scale markers (graticules) and Clacton radar monitored routes - thanks to @hazzas-99
+3. Enhancement - Added vACDM plugin - thanks to @luke11brown (Luke Brown)
+4. AIRAC (2402) - D597 removed, D514 added - thanks to @luke11brown (Luke Brown)
+5. AIRAC (2403) - D305 activation schedule amended (by NOTAM only) - thanks to @luke11brown (Luke Brown)
+6. Bug - EGPA (Kirkwall) ATIS frequency fixed - thanks to @luke11brown (Luke Brown)
+7. Bug - Generic profiles missing file added  - thanks to @luke11brown (Luke Brown)
+8. Enhancement - Ground Status right click actions in lists amended - thanks to @luke11brown (Luke Brown)
+
+# Changes from release 2023/13 to 2024/01
+1. Bug - Corrected Denham (EGLD) Frequency - thanks to @AliceFord (Alice Ford)
+2. Bug - Corrected README \%appdata%\Roaming references - thanks to @Brett-Parker (Brett Parker)
+3. Procedure Change (2313) - Permanent Implementation of TC Midlands - thanks to @kye-taylor (Kye Taylor)
+4. Enhancement - Added pre-note column to startup list - thanks to @RedStonePilot (Ben Walker)
+5. Enhancement - Updated Heathrow profile and displays - thanks to @SamLefevre (Samuel Lefevre)
+6. Enhancement - Use EuroScope 3.2.7 Settings - thanks to @AliceFord (Alice Ford)
+7. Enhancement - Plugin version bump - thanks to @AliceFord (Alice Ford)
+8. AIRAC (2402) - Added EGHC_ATIS frequency - thanks to @RedstonePilot (Ben Walker)
+
+# Changes from release 2023/11 to 2023/13
+1. Procedure Change (2311) - Updated vATIS Profiles with 8.33 Frequencies - thanks to @hazzas-99
+2. Bug - Corrected Jersey Control frequency - thanks to @danielbutton (Daniel Button)
+3. Bug - Added missing voice frequencies - thanks to @AliceFord (Alice Ford) 
+4. Enhancement - Startup, taxi out and take off lists configured and utilised in all SMR displays - thanks to @luke11brown (Luke Brown)
+5. AIRAC (2312) - Added D324A/B (RAF Waddington) danger areas - thanks to @luke11brown (Luke Brown)
+6. Procedure Change (2313) - Changed East Midlands Radar (EGNX_APP) frequency - thanks to @PLM1995 (Peter Mooney)
+
+# Changes from release 2023/10 to 2023/11
+1. AIRAC (2311) - Area minimum altitudes updated - thanks to @luke11brown (Luke Brown)
+2. Bug - VFPC now loads into profiles automatically - thanks to luke11brown (Luke Brown)
+3. AIRAC (2311) - Exeter (EGTE) SMAA heights amended - thanks to @luke11brown (Luke Brown)
+4. Bug - removed colons from ATIS lines preventing display - thanks to @luke11brown (Luke Brown)
+5. Procedure Change (2311) - 8.33 Transition (ENR Phase 3) - Updated voice settings for UK enroute event positions - thanks to @hazzas-99
+6. Bug (TopSky) - Fixed coordination indicator in TopSky tags (displays releases from External ACCs) - thanks to @luke11brown (Luke Brown)
+7. Procedure Change (2311) - 8.33 Transition (AD Phase 3) - Updated voice settings for all UK AD positions - thanks to @KHardern (Kieran Hardern)
+8. Bug - Fixed Aberdeen (EGPD) and Glasgow (EGPF) GND facility type - thanks to @RedStonePilot (Ben Walker)
+9. Bug - Added missing AGCS / AFISO Frequencies - thanks to @AliceFord (Alice Ford)
+
 # Changes from release 2023/09 to 2023/10
 1. Bug - Fixed ATIS frequencies in Essex Profiles for 8.33 Trial - thanks to @kye-taylor (Kye Taylor)
 2. Bug - Corrected Liverpool Ground profile type - thanks to @PLM1995 (Peter Mooney)
@@ -30,7 +112,7 @@
 29. Enhancement - Change NODE symbology to have dotted lines on high level CTAs - thanks to @SamLefevre (Samuel Lefevre)
 30. Enhancement - Added Harwarden RMA to Liverpool profile - thanks to @SamLefevre (Samuel Lefevre)
 31. Enhancement - Change LTC displays to new tickless centrelines and disables GD/GW/FF CTA - thanks to @SamLefevre (Samuel Lefevre)
-X. Bug - Fixed QNH formatting in London Gatwick (EGKK/LGW) vATIS profile - thanks to @hazzas-99
+32. Bug - Fixed QNH formatting in London Gatwick (EGKK/LGW) vATIS profile - thanks to @hazzas-99
 
 # Changes from release 2023/08 to 2023/09
 1. Bug - vATIS files EGKK frequency corrected - thanks to @luke11brown (Luke Brown)

.github/workflows/auto_airac_actions.py

@@ -1,8 +1,3 @@
-"""
-UKCP Updater
-Chris Parkinson (@chssn)
-"""
-
 #!/usr/bin/env python3
 
 # Standard Libraries
@@ -20,36 +15,36 @@
 
 # Local Libraries
 
+
 class Airac:
     """Class for general functions relating to AIRAC"""
 
     def __init__(self):
         # First AIRAC date following the last cycle length modification
-        start_date = "2019-01-02"
+        start_date = "2021-01-28"
         self.base_date = datetime.date.fromisoformat(str(start_date))
         # Length of one AIRAC cycle
         self.cycle_days = 28
         # Today
         self.today_date = datetime.datetime.now().date()
 
-    def initialise(self, date_in:str=0) -> int:
+    def initialise(self, date_in=None) -> int:
         """Calculate the number of AIRAC cycles between any given date and the start date"""
         if date_in:
             input_date = datetime.date.fromisoformat(str(date_in))
         else:
             input_date = datetime.date.today()
 
-        # How many AIRAC cycles have occured since the start date
-        diff_cycles = (input_date - self.base_date) / datetime.timedelta(days=1)
+        start_of_year = datetime.date(input_date.year, 1, 1)
+        # How many AIRAC cycles have occurred since the start of the calendar year
+        diff_cycles = (input_date - start_of_year) / datetime.timedelta(days=1)
         # Round that number down to the nearest whole integer
         number_of_cycles = floor(diff_cycles / self.cycle_days)
-        logger.debug(f"{number_of_cycles} AIRAC cycles since {self.base_date}")
-
         return number_of_cycles
 
     def current_cycle(self) -> str:
         """Return the date of the current AIRAC cycle"""
-        def cycle(sub:int=0):
+        def cycle(sub=0):
             number_of_cycles = self.initialise() - sub
             number_of_days = number_of_cycles * self.cycle_days + 1
             current_cycle = self.base_date + datetime.timedelta(days=number_of_days)
@@ -59,18 +54,17 @@ def cycle(sub:int=0):
         if current_cycle > self.today_date:
             current_cycle = cycle(sub=1)
 
-        logger.info("Current AIRAC Cycle is: {}", current_cycle)
+        # Format month with leading zero if necessary
+        month_part = str(current_cycle.month).zfill(2)  # Zero padding for single-digit months
 
-        return str(current_cycle)
+        return f"{current_cycle.year}_{month_part}"
 
     def current_tag(self) -> str:
         """Returns the current tag for use with git"""
-        current_cycle = self.current_cycle()
-        # Split the current_cycle by '-' and return in format yyyy/mm
-        split_cc = str(current_cycle).split("-")
-        logger.debug(f"Current tag should be {split_cc[0]}/{split_cc[1]}")
-
-        return f"{split_cc[0]}/{split_cc[1]}"
+        current_cycle_count = self.initialise()
+        current_month = str(self.today_date.month).zfill(2)  # Add leading zero if necessary
+        current_tag = f"{self.today_date.year}/{current_month}"
+        return current_tag
 
 
 class CurrentInstallation:
@@ -131,7 +125,7 @@ def gng_data_update(self) -> None:
             "Accept-Encoding": "gzip, deflate",
             "Accept-Language": "en-GB,en-US;q=0.9,en;q=0.8",
             "Connection": "close"
-            }
+        }
         response = requests.get(zip_file, headers=headers, timeout=30)
         logger.debug(f"Response Status = {response.status_code}")
         if response.status_code == 200:
@@ -163,13 +157,13 @@ def gng_data_update(self) -> None:
             shutil.copy(
                 f"import/EGTT/{file}",
                 f"UK/Data/Datafiles/{file.split('/', maxsplit=1)[-1]}"
-                )
+            )
             if "ICAO_Airlines" in file:
                 # Copy the "ICAO_Airlines.txt" file into the vSMR folder
                 shutil.copy(
                     f"import/EGTT/{file}",
                     f"UK/Data/Plugin/vSMR/{file.split('/', maxsplit=1)[-1]}"
-                    )
+                )
             logger.success(f"Moved {file}")
 
         # Cleanup the import directory
@@ -258,10 +252,10 @@ def get_sector_file() -> str:
                     # Clean up old sector files
                     logger.debug(f"Sector file name{sector_fn}")
                     for e_type in ext:
-                        os.remove(
-                            (f"{self.ukcp_location}/Data/Sector/",
-                             f"{str(sector_fn[0]).split('.', maxsplit=1)[0]}.{e_type}"))
 
+                        path_to_remove = f"{self.ukcp_location}/Data/Sector/{str(sector_fn[0]).split('.', maxsplit=1)[0]}.{e_type}"
+                        os.remove(path_to_remove)
+                            
                     # Return the newly downloaded sector file
                     return str(f"{self.ukcp_location}/Data/Sector/UK_{airac_format}.sct")
                 return str(sector_file[0])

.github/workflows/auto_airac_actions.yml

@@ -43,4 +43,4 @@ jobs:
           branch: sf_${{ env.airac }}
           title: ${{ env.airac }} Sector File Update
           body: This pull request was automatically generated to update the sector file to AIRAC ${{ env.airac }}.
-          reviewers: chssn
+          reviewers: luke11brown

.github/workflows/compile_exe.yml

@@ -48,7 +48,7 @@ jobs:
         run: pip install pyinstaller
 
       - name: Run Python Script
-        run: pyinstaller --distpath ./UK/ --onefile -n LogonDetails.exe ./UK/LogonDetails.py
+        run: pyinstaller --distpath ./UK/ --onefile --icon=./.github/workflows/logo.ico -n LogonDetails.exe ./UK/LogonDetails.py
 
       - name: Commit exe File
         run: |

.github/workflows/logo.ico

@@ -4,24 +4,24 @@ Welcome to the UK Controller Pack repository. Thank you for your interest in con
 
 ## Contributor license agreement
 
-By submitting code as an individual you agree that VATSIM UK can use your ammendments, fixes, patches, changes, modifications, submissions and creations in the production of the UK Controller Pack and that the ownership of your submissions transfers to VATSIM UK in their entirety.
+By submitting code as an individual, you agree that VATSIM UK can use your amendments, fixes, patches, changes, modifications, submissions and creations in the production of the UK Controller Pack and that the ownership of your submissions transfers to VATSIM UK in their entirety.
 Helping others
 
 Please help other users wherever you can (everybody starts somewhere). If you require assistance (or wish to provide additional assistance) you can find our contributors in the VATSIM UK Discord.
 
-To access Discord, you can visit https://www.vatsim.uk/discord and follow the registration instructions. Once you've logged in, find the channel "#sector_file_development".
+To access Discord, you can visit https://www.vatsim.uk/discord and follow the registration instructions. Once you have logged in, find the channel "#sector_file_development".
 I want to contribute!
 
-If you wish to contribute to the UK Controller Pack, there's many ways in which you can help out.
+If you wish to contribute to the UK Controller Pack, there is many ways in which you can help out.
 ### Contributing to the data
 
 If you're just getting started with GitHub (and project contributions) then we suggest you take a look at issues marked with both the "up-for-grabs" and/or "good first issue" labels. These issues will be of reasonable size and challenge while not being as overly complex as others and a good introduction for anyone who wants to start contributing to the project. This was inspired by an article by Ken C. Dodds.
 
-If you're comfortable with contributing to Open Source projects on GitHub please ensure you read our expectations for issue tracking, feature proposals and merge requests.
+If you are comfortable with contributing to Open Source projects on GitHub please ensure you read our expectations for issue tracking, feature proposals and merge requests.
 
 If you require support with the Controller Pack or EuroScope, please utilise our Discord channels or the VATSIM UK Helpdesk. Issues regarding the features and functions of Euroscope or how to load the Controller Pack will not be handled. The issue tracker is for feature requests and bugs concerning the UK Controller Pack itself.
 
-When submitting an issue, there's a few guidelines we'd ask you to respect to make it easier to manage (and for others to understand):
+When submitting an issue, there is a few guidelines we'd ask you to respect to make it easier to manage (and for others to understand):
 - Search the issue tracker before you submit your issue - it may already be present.
 - When opening an issue, a template is provided for you. Please provide as much information as requested to ensure others are able to act upon the requests or bug report.
 - Please ensure you add screenshots or documentation references for bugs/changes so we can quickly ascertain if the request is suitable.
@@ -31,19 +31,19 @@ In order to be 'assigned' an issue, please comment on the issue itself - we can
 
 We welcome pull requests with fixes and improvements to the Controller Pack. The features we really would like public support on are marked with "up-for-grabs" but other improvements are also welcome - please ensure you read over the pull work-flow below.
 
-If you wish to add a new feature or you spot a bug that you wish to fix, please open an issue for it first on the UK Controller Pack issue tracker.
+If you wish to add a new feature or spot a bug that you wish to fix, please open an issue for it first on the UK Controller Pack issue tracker.
 
-The work-flow for submitting a new pull request is designed to be simple, but also to ensure consistency from all contributors:
+The workflow for submitting a new pull request is designed to be simple, but also to ensure consistency from all contributors:
 - Fork the project into your personal space on GitHub.com.
-- Create a new branch (with the name issue-issue_number, replacing issue_number with the issue number you're resolving).
+- Create a new branch (with the name issue-issue_number, replacing issue_number with the issue number you are resolving).
 - Commit your changes.
 - When writing commit messages, consider closing your issues via the commit message (by including "fix #22" or "fixes #22", for example ).
 - The issues will be referenced in the first instance and then closed once the MR is accepted.
 - Add your changes to the CHANGELOG.md file - this can be found in UK-Sector-File/.github/CHANGELOG.md.
 - Push the commit(s) to your fork.
-- Submit a pull request (PR) to the master branch.
+- Submit a pull request (PR) to the main branch.
 - The PR title should describe the change that has been made.
-- The PR description should confirm what changes have been made and how you know they're correct (with references).
+- The PR description should confirm what changes have been made and how you know they are correct (with references).
 - Please include any relevant screenshots to prove the changes work.
 - Ensure you link any relevant issues in the merge request (you can type hash and the issue ID, eg #275). Comment on those issues linking back to the PR (you can reference PRs in the same way as issues, using the format #pr-id).
 - Be prepared to answer any questions about your PR when it is reviewed for acceptance.
@@ -56,6 +56,6 @@ As contributors and maintainers of this project, we pledge to respect all people
 
 We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or favourite aircraft.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, issues and other contributions that are not aligned to this Code of Conduct.
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, issues, and other contributions that are not aligned to this Code of Conduct.
 
 This Code of Conduct applies both within this project space and public spaces when an individual is representing the project or its community.