Merge pull request #41 from vatSys/2212draft

2212
vatSys · Nov 30, 2022 · 4b2c60e · 4b2c60e
2 parents 4a59079 + 393f125
commit 4b2c60e
Show file tree

Hide file tree

Showing 91 changed files with 2,661 additions and 2,781 deletions.
diff --git a/Airspace.xml b/Airspace.xml
diff --git a/AlertParameters.xml b/AlertParameters.xml
@@ -5,7 +5,7 @@
       <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>ADA,ADD,AVCTR,AVCTA,BNA,CBE,CBW,BAG_NORTH,BAG_SOUTH,CSA,DNA,MLA,PHA,SYA,WLMAPP,WLMAPPE,WLMAPPFG</Volumes>
+      <Volumes>ADA,BNA,CBA,BAG_NORTH,BAG_SOUTH,CSA,DNA,MLA,PHA,SYA,WLMAPP,WLMAPPE,WLMAPPFG</Volumes>
 	  <InhibitionAreas>
   		<InhibitionArea Name="YSSY" LowerLevel="0" UpperLevel="3000">
         -334244.4699+1510848.9368/

diff --git a/DefaultJurisdiction.xml b/DefaultJurisdiction.xml
@@ -31,7 +31,7 @@
         <Departure Values="YBAS">
           <Rules>
             <Default>
-              <AssignSector Order="ASP"/>
+              <AssignSector Order="AS ADC,ASP"/>
             </Default>
           </Rules>
         </Departure>
@@ -78,7 +78,7 @@
         <Departure Values="YBCG">
           <Rules>
             <Default>
-              <AssignSector Order="BAG,BAS,BDS,BDN,BAN"/>
+              <AssignSector Order="BAC,BAS,BDS,BDN,BAN,GOL"/>
             </Default>
           </Rules>
         </Departure>
@@ -89,7 +89,7 @@
         <Departure Values="YBCS">
           <Rules>
             <Default>
-              <AssignSector Order="CSD,CSA"/>
+              <AssignSector Order="CS1,CS2"/>
             </Default>
           </Rules>
         </Departure>
@@ -100,7 +100,7 @@
         <Departure Values="YBHM">
           <Rules>
             <Default>
-              <AssignSector Order="SWY"/>
+              <AssignSector Order="HM ADC,SWY"/>
             </Default>
           </Rules>
         </Departure>
@@ -111,7 +111,7 @@
         <Departure Values="YBMK">
           <Rules>
             <Default>
-              <AssignSector Order="SWY"/>
+              <AssignSector Order="MK ADC,MKA,SWY"/>
             </Default>
           </Rules>
         </Departure>
@@ -133,7 +133,7 @@
         <Departure Values="YBRK">
           <Rules>
             <Default>
-              <AssignSector Order="KPL"/>
+              <AssignSector Order="RK ADC,RKA,KPL"/>
             </Default>
           </Rules>
         </Departure>
@@ -144,7 +144,7 @@
         <Departure Values="YBRM">
           <Rules>
             <Default>
-              <AssignSector Order="KIY"/>
+              <AssignSector Order="BRM ADC,KIY"/>
             </Default>
           </Rules>
         </Departure>
@@ -155,7 +155,7 @@
         <Departure Values="YBSU">
           <Rules>
             <Default>
-              <AssignSector Order="BUR"/>
+              <AssignSector Order="NSA"/>
             </Default>
           </Rules>
         </Departure>
@@ -177,7 +177,7 @@
         <Departure Values="YCFS">
           <Rules>
             <Default>
-              <AssignSector Order="GRN"/>
+              <AssignSector Order="CFS ADC,INL"/>
             </Default>
           </Rules>
         </Departure>
@@ -188,7 +188,7 @@
         <Departure Values="YGIG">
           <Rules>
             <Default>
-              <AssignSector Order="PHA"/>
+              <AssignSector Order="PEA,PHD,PHA"/>
             </Default>
           </Rules>
         </Departure>
@@ -199,7 +199,7 @@
         <Departure Values="YMAV">
           <Rules>
             <Default>
-              <AssignSector Order="MDS"/>
+              <AssignSector Order="MDS,MAE,ELW"/>
             </Default>
           </Rules>
         </Departure>
@@ -210,7 +210,7 @@
         <Departure Values="YMAY">
           <Rules>
             <Default>
-              <AssignSector Order="HUM"/>
+              <AssignSector Order="AY ADC,BLA"/>
             </Default>
           </Rules>
         </Departure>
@@ -330,7 +330,7 @@
         <Departure Values="YPDN">
           <Rules>
             <Default>
-              <AssignSector Order="DNA"/>
+              <AssignSector Order="DAE,DAW,TRT"/>
             </Default>
           </Rules>
         </Departure>
@@ -446,7 +446,7 @@
         <Departure Values="YSNW">
           <Rules>
             <Default>
-              <AssignSector Order="NWA.WOL"/>
+              <AssignSector Order="NWA,WOL"/>
             </Default>
           </Rules>
         </Departure>
@@ -502,7 +502,7 @@
         <Departure Values="YSTW">
           <Rules>
             <Default>
-              <AssignSector Order="MDE"/>
+              <AssignSector Order="TW ADC,ARL"/>
             </Default>
           </Rules>
         </Departure>
@@ -513,7 +513,7 @@
         <Departure Values="YWLM">
           <Rules>
             <Default>
-              <AssignSector Order="WLM,MDE"/>
+              <AssignSector Order="WLM,MLD"/>
             </Default>
           </Rules>
         </Departure>

diff --git a/MET.xml b/MET.xml
@@ -8,9 +8,10 @@
     <AreaQNH url="http://reg.bom.gov.au/products/reg/QNH.shtml#aus" Username="bomw0007" Password="aviation" />
     <WXRadars url="http://www.bom.gov.au/australia/radar/" />
     <BOM url="http://www.bom.gov.au/aviation/" />
-    <NAIPS url="https://www.airservicesaustralia.com/naips/Account/LogOn" />
-    <AIP url="https://www.airservicesaustralia.com/aip/aip.asp" />
-    <ATCAssist url="http://atc.vatpac.org" />
     <TFMS url="https://maestro.vatpac.org" />
+    <SimATC url="https://sim-atc.com/?vatsys=true" />
+    <SepCalc url="https://www.worldflight.com.au/files/sepcalc1.html" />
+    <SOPs url="https://sops.vatpac.org" />
+    <SkyVector url="https://skyvector.com" />
   </Browsers>
 </MET>