Merge pull request #126 from vatSys/2409draft

2409draft
vatSys · Sep 5, 2024 · 390ec71 · 390ec71
2 parents e90b83e + 685a768
commit 390ec71
Show file tree

Hide file tree

Showing 14 changed files with 793 additions and 674 deletions.
diff --git a/Airspace.xml b/Airspace.xml
diff --git a/AlertParameters.xml b/AlertParameters.xml
@@ -26,13 +26,13 @@
       <Vertical LowerLevel="0" UpperLevel="28000" Height="600" HeightWithRVSM="600"/>
       <Vertical LowerLevel="28001" UpperLevel="41000" Height="1600" HeightWithRVSM="600"/>
       <Vertical LowerLevel="41001" UpperLevel="99999" Height="1600" HeightWithRVSM="1600"/>
-      <Volumes>ARA,ARL,ASP,ASW,AUG,BAR,BIK,BIK_SY_TMA_CAP,BLA,BLA_CB_TMA_CAP,BKE,BUR,BUR_BN_TMA_CAP,COL,CRS,CVN,DOS,ELW,ELW_ML_TMA_CAP,ESP,FLD,FORE,FORW,GEL,INL,GTH,GVE,HWE,HYD,IND,INE,INS,ISA,JAR,KAT,KEN,KEN_CS_TMA_CAP,KIY,KPL,LEA,MDE,MEK,MLD,MUN,MTK,MZI,NEW,NFFF,NZCM,NZZO,OCN,OLW,OXL,PAR,PIY,PIY_PH_TMA_CAP,POT,SNO,STR,SDY,SDY_BN_TMA_CAP,SWY,HUO,HUO_TMA_CAP,TBD,TBD_TMA_CAP,TBP,TRT,TSN,WAR,WEG,WOL,WOL_CB_TMA_CAP,WON,WRA,YWE,GUN,GUN_CB_TMA_CAP,GOLD_COAST_A,GOLD_COAST_B,GOLD_COAST_C,GOLD_COAST_D,GOLD_COAST_E,GOLD_COAST_F,GRAFTON_E,NSA,NSA_BN_TMA_CAP,MNN,CNK</Volumes>
+      <Volumes>ARA,ARL,ASP,ASW,AUG,BAR,BIK,BIK_SY_TMA_CAP,BLA,BLA_CB_TMA_CAP,BKE,BUR,BUR_BN_TMA_CAP,COL,CRS,CVN,DOS,ELW,ELW_ML_TMA_CAP,ESP,FLD,GEL,INL,GTH,GVE,HWE,HYD,IND,INE,INS,ISA,JAR,KAT,KEN,KEN_CS_TMA_CAP,KIY,KPL,LEA,MDE,MEK,MLD,MUN,MTK,MZI,NEW,NFFF,NZCM,NZZO,OCN,OLW,OXL,PAR,PIY,PIY_PH_TMA_CAP,POT,SNO,STR,SDY,SDY_BN_TMA_CAP,SWY,HUO,HUO_TMA_CAP,TBD,TBD_TMA_CAP,TBP,TRT,TSN,WAR,WEG,WOL,WOL_CB_TMA_CAP,WON,WRA,YWE,GUN,GUN_CB_TMA_CAP,GOLD_COAST_A,GOLD_COAST_B,GOLD_COAST_C,GOLD_COAST_D,GOLD_COAST_E,GOLD_COAST_F,GRAFTON_E,NSA,NSA_BN_TMA_CAP,MNN,CNK</Volumes>
     </STCA>
     <MTCA Name="ENR" LateralNM="5.0" SecondsLookahead="300" AlertPriority="3">
       <Vertical LowerLevel="18000" UpperLevel="28000" Height="600" HeightWithRVSM="600"/>
       <Vertical LowerLevel="28001" UpperLevel="41000" Height="1600" HeightWithRVSM="600"/>
       <Vertical LowerLevel="41001" UpperLevel="99999" Height="1600" HeightWithRVSM="1600"/>
-      <Volumes>ARA,ARL,ASP,ASW,AUG,BAR,BIK,BIK_SY_TMA_CAP,BLA,BLA_CB_TMA_CAP,BKE,BUR,BUR_BN_TMA_CAP,COL,CRS,CVN,DOS,ELW,ELW_ML_TMA_CAP,ESP,FLD,FORE,FORW,GEL,INL,GTH,GVE,HWE,HYD,IND,INE,INS,ISA,JAR,KAT,KEN,KEN_CS_TMA_CAP,KIY,KPL,LEA,MDE,MEK,MLD,MUN,MTK,MZI,NEW,NFFF,NZCM,NZZO,OCN,OLW,OXL,PAR,PIY,PIY_PH_TMA_CAP,POT,SNO,STR,SDY,SDY_BN_TMA_CAP,SWY,HUO,HUO_TMA_CAP,TBD,TBD_TMA_CAP,TBP,TRT,TSN,WAR,WEG,WOL,WOL_CB_TMA_CAP,WON,WRA,YWE,GUN,GUN_CB_TMA_CAP,GOLD_COAST_A,GOLD_COAST_B,GOLD_COAST_C,GOLD_COAST_D,GOLD_COAST_E,GOLD_COAST_F,GRAFTON_E,NSA,NSA_BN_TMA_CAP,MNN,CNK</Volumes>
+      <Volumes>ARA,ARL,ASP,ASW,AUG,BAR,BIK,BIK_SY_TMA_CAP,BLA,BLA_CB_TMA_CAP,BKE,BUR,BUR_BN_TMA_CAP,COL,CRS,CVN,DOS,ELW,ELW_ML_TMA_CAP,ESP,FLD,GEL,INL,GTH,GVE,HWE,HYD,IND,INE,INS,ISA,JAR,KAT,KEN,KEN_CS_TMA_CAP,KIY,KPL,LEA,MDE,MEK,MLD,MUN,MTK,MZI,NEW,NFFF,NZCM,NZZO,OCN,OLW,OXL,PAR,PIY,PIY_PH_TMA_CAP,POT,SNO,STR,SDY,SDY_BN_TMA_CAP,SWY,HUO,HUO_TMA_CAP,TBD,TBD_TMA_CAP,TBP,TRT,TSN,WAR,WEG,WOL,WOL_CB_TMA_CAP,WON,WRA,YWE,GUN,GUN_CB_TMA_CAP,GOLD_COAST_A,GOLD_COAST_B,GOLD_COAST_C,GOLD_COAST_D,GOLD_COAST_E,GOLD_COAST_F,GRAFTON_E,NSA,NSA_BN_TMA_CAP,MNN,CNK</Volumes>
     </MTCA>
   </ConflictAlerts>
   <EMG SSRCode="7700" AlertPriority="2"/>

diff --git a/Labels.xml b/Labels.xml
@@ -11,6 +11,9 @@
     <DataLine>
       <Item Type="LABEL_ITEM_LEVEL" Colour="" RightClick="Label_Move" />
     </DataLine>
+    <DataLine>
+      <Item Type="LABEL_ITEM_CPDLCAIR" />
+    </DataLine>
   </Label>
   <Label Type="Quicktag" MaximumWidth="11" LabelRectangle="Default">
     <DataLine>
@@ -30,6 +33,9 @@
     <DataLine>
       <Item Type="LABEL_ITEM_OPDATA" BackgroundColour="" Colour="" LeftClick="Label_OpData_Popup" MiddleClick="" RightClick="" />
     </DataLine>
+    <DataLine>
+      <Item Type="LABEL_ITEM_CPDLCAIR" />
+    </DataLine>
   </Label>
   <Label Type="Normal" MaximumWidth="11" LabelRectangle="Default">
     <DataLine Visibility="Hidden">
@@ -108,6 +114,9 @@
     <DataLine>
       <Item Type="LABEL_ITEM_OPDATA" BackgroundColour="" Colour="" LeftClick="Label_OpData_Popup" MiddleClick="" RightClick="Label_Toggle_1" />
     </DataLine>
+    <DataLine>
+      <Item Type="LABEL_ITEM_CPDLCAIR" />
+    </DataLine>
   </Label>
   <Label Type="GroundAir" MaximumWidth="11" LabelRectangle="None">
     <DataLine>

diff --git a/Maps/ALL_AIRPORTS.xml b/Maps/ALL_AIRPORTS.xml
@@ -339,6 +339,7 @@
       <Point>YWLG</Point>
       <Point>YWLM</Point>
       <Point>YWLU</Point>
+      <Point>YWMO</Point>
       <Point>YWRN</Point>
       <Point>YWSL</Point>
       <Point>YWTN</Point>
@@ -692,6 +693,7 @@
       <Point>YWLG</Point>
       <Point>YWLM</Point>
       <Point>YWLU</Point>
+      <Point>YWMO</Point>
       <Point>YWRN</Point>
       <Point>YWSL</Point>
       <Point>YWTN</Point>
@@ -3384,6 +3386,7 @@
       <Point>YDDI</Point>
       <Point>YDDP</Point>
       <Point>YDDY</Point>
+      <Point>YDER</Point>
       <Point>YDGI</Point>
       <Point>YDGR</Point>
       <Point>YDGT</Point>
@@ -4370,7 +4373,6 @@
       <Point>YXKE</Point>
       <Point>YXKL</Point>
       <Point>YXKP</Point>
-      <Point>YXKU</Point>
       <Point>YXLA</Point>
       <Point>YXLH</Point>
       <Point>YXLI</Point>
@@ -4393,7 +4395,6 @@
       <Point>YXON</Point>
       <Point>YXOR</Point>
       <Point>YXOW</Point>
-      <Point>YXOX</Point>
       <Point>YXPA</Point>
       <Point>YXPI</Point>
       <Point>YXPN</Point>
@@ -4415,7 +4416,6 @@
       <Point>YXUB</Point>
       <Point>YXUD</Point>
       <Point>YXUG</Point>
-      <Point>YXUL</Point>
       <Point>YXUN</Point>
       <Point>YXUS</Point>
       <Point>YXWH</Point>
@@ -4730,6 +4730,7 @@
       <Point>YDDI</Point>
       <Point>YDDP</Point>
       <Point>YDDY</Point>
+      <Point>YDER</Point>
       <Point>YDGI</Point>
       <Point>YDGR</Point>
       <Point>YDGT</Point>
@@ -5716,7 +5717,6 @@
       <Point>YXKE</Point>
       <Point>YXKL</Point>
       <Point>YXKP</Point>
-      <Point>YXKU</Point>
       <Point>YXLA</Point>
       <Point>YXLH</Point>
       <Point>YXLI</Point>
@@ -5739,7 +5739,6 @@
       <Point>YXON</Point>
       <Point>YXOR</Point>
       <Point>YXOW</Point>
-      <Point>YXOX</Point>
       <Point>YXPA</Point>
       <Point>YXPI</Point>
       <Point>YXPN</Point>
@@ -5761,7 +5760,6 @@
       <Point>YXUB</Point>
       <Point>YXUD</Point>
       <Point>YXUG</Point>
-      <Point>YXUL</Point>
       <Point>YXUN</Point>
       <Point>YXUS</Point>
       <Point>YXWH</Point>