Merge remote-tracking branch 'upstream/main' into issue-5301

VATSIM-UK · May 5, 2024 · 3796c05 · 3796c05
2 parents 0c6f5cc + 50c6274
commit 3796c05
Show file tree

Hide file tree

Showing 67 changed files with 12 additions and 15 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -5,7 +5,8 @@
 4. AIRAC (2404) - Changed Mona (EGOQ) Tower frequency - thanks to @kristiankunc (Kristián Kunc)
 5. AIRAC (2404) - Changed Valley (EGOV) frequencies - thanks to @kristiankunc (Kristián Kunc)
 6. AIRAC (2404) - Updated Leuchars (EGQL) frequencies - thanks to @lucak1011 (Luca Kulaga)
-7. AIRAC(2405) - Changed Prestwick (EGPK) Runway designator 03/21 to 02/20 - thanks to @lucak1011 (Luca Kulaga)
+7. AIRAC (2405) - Changed Prestwick (EGPK) Runway designator 03/21 to 02/20 - thanks to @lucak1011 (Luca Kulaga)
+8. Enhancement - Re-structured 'Misc' folder - thanks to @PLM1995 (Peter Mooney)
 X. Procedure Change - Removed ENSV_E_CTR from sectors 10,11,15 and add ENOR_SC_CTR to top-down order - thanks to @khardern
 X. Bug - Remove EURN_FSS from top-down order of Stavanger low sectors - thanks to @khardern
 

diff --git a/...sitions_Area Positions 1 UK Permanent.txt → Area Positions/1 UK Permanent.txt b/...sitions_Area Positions 1 UK Permanent.txt → Area Positions/1 UK Permanent.txt
diff --git a/Misc/Positions_Area Positions 2 UK Event.txt → Area Positions/2 UK Event.txt b/Misc/Positions_Area Positions 2 UK Event.txt → Area Positions/2 UK Event.txt
diff --git a/.../Positions_Area Positions 3 UK Spares.txt → Area Positions/3 UK Spares.txt b/.../Positions_Area Positions 3 UK Spares.txt → Area Positions/3 UK Spares.txt
diff --git a/Misc/Positions_Area Positions 4 External.txt → Area Positions/4 External.txt b/Misc/Positions_Area Positions 4 External.txt → Area Positions/4 External.txt
diff --git a/Misc/Geo_City Transition Tracks.txt → Misc Geo/City Transition Tracks.txt b/Misc/Geo_City Transition Tracks.txt → Misc Geo/City Transition Tracks.txt
diff --git a/Misc/Geo_Coastline High Detail.txt → Misc Geo/Coastline High Detail.txt b/Misc/Geo_Coastline High Detail.txt → Misc Geo/Coastline High Detail.txt
diff --git a/Misc/Geo_GB_Coastline Medium Detail.txt → Misc Geo/GB_Coastline Medium Detail.txt b/Misc/Geo_GB_Coastline Medium Detail.txt → Misc Geo/GB_Coastline Medium Detail.txt
diff --git a/Misc/Geo_Long Eaton Shepshed Lanes.txt → Misc Geo/Long Eaton Shepshed Lanes.txt b/Misc/Geo_Long Eaton Shepshed Lanes.txt → Misc Geo/Long Eaton Shepshed Lanes.txt
diff --git a/Misc/Geo_Merseyside Coastline.txt → Misc Geo/Merseyside Coastline.txt b/Misc/Geo_Merseyside Coastline.txt → Misc Geo/Merseyside Coastline.txt
diff --git a/Misc/Geo_Motorways.txt → Misc Geo/Motorways.txt b/Misc/Geo_Motorways.txt → Misc Geo/Motorways.txt
diff --git a/Misc/Geo_Rivers.txt → Misc Geo/Rivers.txt b/Misc/Geo_Rivers.txt → Misc Geo/Rivers.txt
diff --git a/Misc/Geo_Tickless-Centrelines.txt → Misc Geo/Tickless-Centrelines.txt b/Misc/Geo_Tickless-Centrelines.txt → Misc Geo/Tickless-Centrelines.txt
diff --git a/Misc/Freetext_AARA.txt → Misc Other/Freetext_AARA.txt b/Misc/Freetext_AARA.txt → Misc Other/Freetext_AARA.txt
diff --git a/Misc/Freetext_Airspace Bases.txt → Misc Other/Freetext_Airspace Bases.txt b/Misc/Freetext_Airspace Bases.txt → Misc Other/Freetext_Airspace Bases.txt
diff --git a/Misc/Freetext_Solent Airspace Bases.txt → ... Other/Freetext_Solent Airspace Bases.txt b/Misc/Freetext_Solent Airspace Bases.txt → ... Other/Freetext_Solent Airspace Bases.txt
diff --git a/Misc/Freetext_UK HEMS.txt → Misc Other/Freetext_UK HEMS.txt b/Misc/Freetext_UK HEMS.txt → Misc Other/Freetext_UK HEMS.txt
diff --git a/Misc/Pre-Positions.txt → Misc Other/Pre-Positions.txt b/Misc/Pre-Positions.txt → Misc Other/Pre-Positions.txt
diff --git a/Misc/Radar Holes.txt → Misc Other/Radar Holes.txt b/Misc/Radar Holes.txt → Misc Other/Radar Holes.txt
diff --git a/Misc/Radar Sites.txt → Misc Other/Radar Sites.txt b/Misc/Radar Sites.txt → Misc Other/Radar Sites.txt
diff --git a/Misc/SID_Edinburgh Centreline.txt → Misc Other/SID_Edinburgh Centreline.txt b/Misc/SID_Edinburgh Centreline.txt → Misc Other/SID_Edinburgh Centreline.txt
diff --git a/Misc/SID_Military Corridors.txt → Misc Other/SID_Military Corridors.txt b/Misc/SID_Military Corridors.txt → Misc Other/SID_Military Corridors.txt
diff --git a/Misc/Regions_GB Landmass Medium Detail.txt → Misc Regions/GB Landmass Medium Detail.txt b/Misc/Regions_GB Landmass Medium Detail.txt → Misc Regions/GB Landmass Medium Detail.txt
diff --git a/Misc/Regions_Jersey.txt → Misc Regions/Jersey.txt b/Misc/Regions_Jersey.txt → Misc Regions/Jersey.txt
diff --git a/Misc/Regions_LTMA Airfield CAS.txt → Misc Regions/LTMA Airfield CAS.txt b/Misc/Regions_LTMA Airfield CAS.txt → Misc Regions/LTMA Airfield CAS.txt
diff --git a/Misc/Regions_Severn Buffers.txt → Misc Regions/Severn Buffers.txt b/Misc/Regions_Severn Buffers.txt → Misc Regions/Severn Buffers.txt
diff --git a/Misc/Regions_Southend RMA.txt → Misc Regions/Southend RMA.txt b/Misc/Regions_Southend RMA.txt → Misc Regions/Southend RMA.txt
diff --git a/.../Regions_Uncontrolled airspace (Grey).txt → ... Regions/Uncontrolled airspace (Grey).txt b/.../Regions_Uncontrolled airspace (Grey).txt → ... Regions/Uncontrolled airspace (Grey).txt
diff --git a/Misc/Regions_Uncontrolled airspace.txt → Misc Regions/Uncontrolled airspace.txt b/Misc/Regions_Uncontrolled airspace.txt → Misc Regions/Uncontrolled airspace.txt
diff --git a/Misc/STAR_AARA.txt → Radar Maps (Stars)/AARA.txt b/Misc/STAR_AARA.txt → Radar Maps (Stars)/AARA.txt
diff --git a/Misc/STAR_ASR.txt → Radar Maps (Stars)/ASR.txt b/Misc/STAR_ASR.txt → Radar Maps (Stars)/ASR.txt
diff --git a/Misc/STAR_BAKUR RFC Area.txt → Radar Maps (Stars)/BAKUR RFC Area.txt b/Misc/STAR_BAKUR RFC Area.txt → Radar Maps (Stars)/BAKUR RFC Area.txt
diff --git a/Misc/STAR_Bristol Buffer Zone.txt → Radar Maps (Stars)/Bristol Buffer Zone.txt b/Misc/STAR_Bristol Buffer Zone.txt → Radar Maps (Stars)/Bristol Buffer Zone.txt
diff --git a/Misc/STAR_Brussels Release Line.txt → Radar Maps (Stars)/Brussels Release Line.txt b/Misc/STAR_Brussels Release Line.txt → Radar Maps (Stars)/Brussels Release Line.txt
diff --git a/Misc/STAR_CPT Gate.txt → Radar Maps (Stars)/CPT Gate.txt b/Misc/STAR_CPT Gate.txt → Radar Maps (Stars)/CPT Gate.txt
diff --git a/Misc/STAR_DEXEN Buffer.txt → Radar Maps (Stars)/DEXEN Buffer.txt b/Misc/STAR_DEXEN Buffer.txt → Radar Maps (Stars)/DEXEN Buffer.txt
diff --git a/Misc/STAR_DIKRO Box.txt → Radar Maps (Stars)/DIKRO Box.txt b/Misc/STAR_DIKRO Box.txt → Radar Maps (Stars)/DIKRO Box.txt
diff --git a/Misc/STAR_DVR RFC Area.txt → Radar Maps (Stars)/DVR RFC Area.txt b/Misc/STAR_DVR RFC Area.txt → Radar Maps (Stars)/DVR RFC Area.txt
diff --git a/Misc/STAR_EGLL AMAN Range Ring.txt → Radar Maps (Stars)/EGLL AMAN Range Ring.txt b/Misc/STAR_EGLL AMAN Range Ring.txt → Radar Maps (Stars)/EGLL AMAN Range Ring.txt
diff --git a/Misc/STAR_EGNX SID Lines 09.txt → Radar Maps (Stars)/EGNX SID Lines 09.txt b/Misc/STAR_EGNX SID Lines 09.txt → Radar Maps (Stars)/EGNX SID Lines 09.txt
diff --git a/Misc/STAR_EGNX SID Lines 27.txt → Radar Maps (Stars)/EGNX SID Lines 27.txt b/Misc/STAR_EGNX SID Lines 27.txt → Radar Maps (Stars)/EGNX SID Lines 27.txt
diff --git a/Misc/STAR_EGPX FRA.txt → Radar Maps (Stars)/EGPX FRA.txt b/Misc/STAR_EGPX FRA.txt → Radar Maps (Stars)/EGPX FRA.txt
diff --git a/Misc/STAR_EXMOR Burnham Line.txt → Radar Maps (Stars)/EXMOR Burnham Line.txt b/Misc/STAR_EXMOR Burnham Line.txt → Radar Maps (Stars)/EXMOR Burnham Line.txt
diff --git a/Misc/STAR_Edinburgh-Glasgow Buffer.txt → ...Maps (Stars)/Edinburgh-Glasgow Buffer.txt b/Misc/STAR_Edinburgh-Glasgow Buffer.txt → ...Maps (Stars)/Edinburgh-Glasgow Buffer.txt
diff --git a/Misc/STAR_GD-FF CTA Line.txt → Radar Maps (Stars)/GD-FF CTA Line.txt b/Misc/STAR_GD-FF CTA Line.txt → Radar Maps (Stars)/GD-FF CTA Line.txt
diff --git a/Misc/STAR_HON Gate.txt → Radar Maps (Stars)/HON Gate.txt b/Misc/STAR_HON Gate.txt → Radar Maps (Stars)/HON Gate.txt
diff --git a/Misc/STAR_Jersey RFC Line.txt → Radar Maps (Stars)/Jersey RFC Line.txt b/Misc/STAR_Jersey RFC Line.txt → Radar Maps (Stars)/Jersey RFC Line.txt
diff --git a/Misc/STAR_KOKSY Buffer Zone.txt → Radar Maps (Stars)/KOKSY Buffer Zone.txt b/Misc/STAR_KOKSY Buffer Zone.txt → Radar Maps (Stars)/KOKSY Buffer Zone.txt
diff --git a/Misc/STAR_KOKSY Gate.txt → Radar Maps (Stars)/KOKSY Gate.txt b/Misc/STAR_KOKSY Gate.txt → Radar Maps (Stars)/KOKSY Gate.txt
diff --git a/Misc/STAR_LUVUM Box.txt → Radar Maps (Stars)/LUVUM Box.txt b/Misc/STAR_LUVUM Box.txt → Radar Maps (Stars)/LUVUM Box.txt
diff --git a/Misc/STAR_La Manche Release Area.txt → ...r Maps (Stars)/La Manche Release Area.txt b/Misc/STAR_La Manche Release Area.txt → ...r Maps (Stars)/La Manche Release Area.txt
diff --git a/Misc/STAR_Lands End RMZ.txt → Radar Maps (Stars)/Lands End RMZ.txt b/Misc/STAR_Lands End RMZ.txt → Radar Maps (Stars)/Lands End RMZ.txt
diff --git a/Misc/STAR_Luton-Stansted Buffer.txt → Radar Maps (Stars)/Luton-Stansted Buffer.txt b/Misc/STAR_Luton-Stansted Buffer.txt → Radar Maps (Stars)/Luton-Stansted Buffer.txt
diff --git a/Misc/STAR_Midlands Buffer Zone.txt → Radar Maps (Stars)/Midlands Buffer Zone.txt b/Misc/STAR_Midlands Buffer Zone.txt → Radar Maps (Stars)/Midlands Buffer Zone.txt
diff --git a/Misc/STAR_Midlands Gate.txt → Radar Maps (Stars)/Midlands Gate.txt b/Misc/STAR_Midlands Gate.txt → Radar Maps (Stars)/Midlands Gate.txt
diff --git a/Misc/STAR_NIMAT-ROTEV Buffer.txt → Radar Maps (Stars)/NIMAT-ROTEV Buffer.txt b/Misc/STAR_NIMAT-ROTEV Buffer.txt → Radar Maps (Stars)/NIMAT-ROTEV Buffer.txt
diff --git a/Misc/STAR_RAMOX Buffer.txt → Radar Maps (Stars)/RAMOX Buffer.txt b/Misc/STAR_RAMOX Buffer.txt → Radar Maps (Stars)/RAMOX Buffer.txt
diff --git a/Misc/STAR_REMSI Buffer.txt → Radar Maps (Stars)/REMSI Buffer.txt b/Misc/STAR_REMSI Buffer.txt → Radar Maps (Stars)/REMSI Buffer.txt
diff --git a/Misc/STAR_Reims Release Area.txt → Radar Maps (Stars)/Reims Release Area.txt b/Misc/STAR_Reims Release Area.txt → Radar Maps (Stars)/Reims Release Area.txt
diff --git a/Misc/STAR_SHM-OCK Line.txt → Radar Maps (Stars)/SHM-OCK Line.txt b/Misc/STAR_SHM-OCK Line.txt → Radar Maps (Stars)/SHM-OCK Line.txt
diff --git a/Misc/STAR_SODVU Box.txt → Radar Maps (Stars)/SODVU Box.txt b/Misc/STAR_SODVU Box.txt → Radar Maps (Stars)/SODVU Box.txt
diff --git a/Misc/STAR_SOLENT Forest Gate.txt → Radar Maps (Stars)/SOLENT Forest Gate.txt b/Misc/STAR_SOLENT Forest Gate.txt → Radar Maps (Stars)/SOLENT Forest Gate.txt
diff --git a/Misc/STAR_Talla-Galloway Buffer.txt → Radar Maps (Stars)/Talla-Galloway Buffer.txt b/Misc/STAR_Talla-Galloway Buffer.txt → Radar Maps (Stars)/Talla-Galloway Buffer.txt
diff --git a/Misc/STAR_Thames-Southend Buffer.txt → ...r Maps (Stars)/Thames-Southend Buffer.txt b/Misc/STAR_Thames-Southend Buffer.txt → ...r Maps (Stars)/Thames-Southend Buffer.txt
diff --git a/Misc/STAR_West_FRA.txt → Radar Maps (Stars)/West_FRA.txt b/Misc/STAR_West_FRA.txt → Radar Maps (Stars)/West_FRA.txt
diff --git a/Misc/STAR_X-Y Line.txt → Radar Maps (Stars)/X-Y Line.txt b/Misc/STAR_X-Y Line.txt → Radar Maps (Stars)/X-Y Line.txt
diff --git a/compiler.config.json b/compiler.config.json
@@ -278,9 +278,8 @@
             ],
             "positions": {
                 "type": "folder",
-                "folder": "Misc",
+                "folder": "Area Positions",
                 "recursive": true,
-                "pattern": "Positions_"
             }
         },
         "misc": {
@@ -331,7 +330,7 @@
             ],
             "freetext": {
                 "type": "folder",
-                "folder": "Misc",
+                "folder": "Misc Other",
                 "recursive": true,
                 "pattern": "Freetext_"
             },
@@ -356,7 +355,7 @@
             "pre_positions": {
                 "type": "files",
                 "files": [
-                    "Misc/Pre-Positions.txt"
+                    "Misc Other/Pre-Positions.txt"
                 ]
             },
             "fixes": [
@@ -386,13 +385,13 @@
             "radars": {
                 "type": "files",
                 "files": [
-                    "Misc/Radar Sites.txt"
+                    "Misc Other/Radar Sites.txt"
                 ]
             },
             "radar_holes": {
                 "type": "files",
                 "files": [
-                    "Misc/Radar Holes.txt"
+                    "Misc Other/Radar Holes.txt"
                 ]
             },
             "artcc_low": {
@@ -435,7 +434,7 @@
                 },
                 {
                 "type": "folder",
-                "folder": "Misc",
+                "folder": "Misc Other",
                 "recursive": true,
                 "pattern": "SID_"
                 }
@@ -448,25 +447,22 @@
                 },
                 {
                     "type": "folder",
-                    "folder": "Misc",
+                    "folder": "Radar Maps (Stars)",
                     "recursive": true,
-                    "pattern": "STAR_"
                 }
             ],
             "geo": {
                 "type": "folder",
-                "folder": "Misc",
+                "folder": "Misc Geo",
                 "recursive": true,
-                "pattern": "Geo_",
                 "exclude": [
-                    "Geo_Coastline High Detail.txt"
+                    "Coastline High Detail.txt"
                 ]
             },
             "regions": {
                 "type": "folder",
-                "folder": "Misc",
+                "folder": "Misc Regions",
                 "recursive": true,
-                "pattern": "Regions_"
             },
             "active_runways": {
                 "type": "files",