Merge pull request #48 from vatSys/2301draft

2301
vatSys · Jan 25, 2023 · 8f7865e · 8f7865e
2 parents 2965a7e + 31fe940
commit 8f7865e
Show file tree

Hide file tree

Showing 7 changed files with 758 additions and 788 deletions.
diff --git a/Airspace.xml b/Airspace.xml
diff --git a/Maps/SECTOR_FREQS.xml b/Maps/SECTOR_FREQS.xml
@@ -43,7 +43,7 @@
       <Point Name="WRA 132.9">-272024.000+1372305.000</Point>
       <Point Name="ESP 123.95">-354427.000+1215735.000</Point>
       <Point Name="LEA 122.4">-303453.000+1142531.000</Point>
-      <Point Name="CVN 133.8">-245100.000+1483800.000</Point>
+      <Point Name="GVE 133.8">-245100.000+1483800.000</Point>
       <Point Name="CRS 135.8">-305600.000+1185800.000</Point>
       <Point Name="HYD 118.2">-323100.000+1185300.000</Point>
       <Point Name="JAR 120.3">-341200.000+1163000.000</Point>
@@ -68,7 +68,7 @@
       <Point Name="KIY 133.4">-174400.000+1251900.000</Point>
       <Point Name="STR 134.4">-183000.000+1342600.000</Point>
       <Point Name="MDE 133.0">-300718.000+1484202.000</Point>
-      <Point Name="GVE 133.8">-290800.000+1173200.000</Point>
+      <Point Name="CVN 133.8">-290800.000+1173200.000</Point>
       <Point Name="CNK 123.4">-323353.316+1505441.400</Point>
       <Point Name="MNN 130.1">-315422.644+1520919.296</Point>
       <Point Name="MLD 132.35">-313900.000+1522700.000</Point>

diff --git a/Positions.xml b/Positions.xml
@@ -876,7 +876,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YMAY" Visible="true" />
       </Strips>
-      <CFL QuickLevel="4500">
+      <CFL QuickLevel="7000">
         <AdditionalLevels>3400,5400</AdditionalLevels>
       </CFL>
       <ArrivalLists>
@@ -911,7 +911,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YBAS" Visible="true" />
       </Strips>
-      <CFL QuickLevel="4500">
+      <CFL QuickLevel="7000">
         <AdditionalLevels>5200</AdditionalLevels>
       </CFL>
       <ArrivalLists>
@@ -942,7 +942,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YBRM" Visible="true" />
       </Strips>
-      <CFL QuickLevel="5500">
+      <CFL QuickLevel="5000">
         <AdditionalLevels>2100</AdditionalLevels>
       </CFL>
       <ArrivalLists>
@@ -978,7 +978,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YCFS" Visible="true" />
       </Strips>
-      <CFL QuickLevel="4500">
+      <CFL QuickLevel="7000">
         <AdditionalLevels>3300</AdditionalLevels>
       </CFL>
       <ArrivalLists>
@@ -1008,7 +1008,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YBHM" Visible="true" />
       </Strips>
-      <CFL QuickLevel="4500">
+      <CFL QuickLevel="5000">
         <AdditionalLevels>2800,3900</AdditionalLevels>
       </CFL>
       <ArrivalLists>
@@ -1039,7 +1039,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YBSU" Visible="true" />
       </Strips>
-      <CFL QuickLevel="4500">
+      <CFL QuickLevel="5000">
         <AdditionalLevels>1900,2800,4100</AdditionalLevels>
       </CFL>
       <ArrivalLists>
@@ -1076,7 +1076,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YPKA" Visible="true" />
       </Strips>
-      <CFL QuickLevel="5500">
+      <CFL QuickLevel="5000">
         <AdditionalLevels>2200</AdditionalLevels>
       </CFL>
       <ArrivalLists>
@@ -1140,7 +1140,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YSTW" Visible="true" />
       </Strips>
-      <CFL QuickLevel="4500">
+      <CFL QuickLevel="7000">
         <AdditionalLevels>4300</AdditionalLevels>
       </CFL>
       <ArrivalLists>
@@ -1242,7 +1242,6 @@
       </ATIS>
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YPAD" Visible="true" />
-        <Window Type="ADEP" Beacon="YPPF" Visible="true" />
       </Strips>
       <CFL QuickLevel="24000">
         <AdditionalLevels>1600,1800,2100,2800,3100,3200,3300,3800</AdditionalLevels>
@@ -1329,22 +1328,20 @@
         <Map Name="ALL_CTA" />
         <Map Name="Melbourne/ML_COAST" />
         <Map Name="Melbourne/ML_TCU" />
-        <Map Name="Melbourne/ML_RWY16A27D" />
+        <Map Name="Melbourne/ML_RWY16" />
         <Map Name="Melbourne/AV_RWY18" />
         <Map Name="Melbourne/EN_RWY17" />
+        <Map Name="Melbourne/EN_RWY26" />
+        <Map Name="Melbourne/EN_RWY35" />
       </Maps>
       <ATIS>
         <Editor Airport="YMML" Frequency="118.0" />
         <Window Airport="YMML" />
         <Window Airport="YMAV" />
-        <Window Airport="YMEN" />
-        <Window Airport="YMMB" />
       </ATIS>
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YMML" Visible="true" />
         <Window Type="ADEP" Beacon="YMAV" Visible="true" />
-        <Window Type="ADEP" Beacon="YMEN" Visible="true" />
-        <Window Type="ADEP" Beacon="YMMB" Visible="true" />
       </Strips>
       <CFL QuickLevel="24000">
         <AdditionalLevels>1600,1900,2300,2600,2700,2900,3100,3700,3300,4100,4700</AdditionalLevels>
@@ -1397,7 +1394,6 @@
       </ATIS>
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YSSY" Visible="true" />
-        <Window Type="ADEP" Beacon="YSBK" Visible="true" />
       </Strips>
       <CFL QuickLevel="28000">
         <AdditionalLevels>1600,1800,2100,2200,2700,3700</AdditionalLevels>
@@ -1463,7 +1459,6 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YBBN" Visible="true" />
         <Window Type="ADEP" Beacon="YBCG" Visible="true" />
-        <Window Type="ADEP" Beacon="YBAF" Visible="true" />
       </Strips>
       <CFL QuickLevel="18000">
         <AdditionalLevels>1700,1800,1900,2400,2900,3400,3800,4400,5100</AdditionalLevels>
@@ -1509,7 +1504,7 @@
         <Map Name="ALL_CTA" />
         <Map Name="Canberra/CB_COAST" />
         <Map Name="Canberra/CB_TCU" />
-        <Map Name="Canberra/CB_RWY3530" />
+        <Map Name="Canberra/CB_RWY1712" />
       </Maps>
       <ATIS>
         <Editor Airport="YSCB" Frequency="127.45" />
@@ -1544,15 +1539,14 @@
         <Map Name="ALL_CTA" />
         <Map Name="Perth/PH_COAST" />
         <Map Name="Perth/PH_TCU" />
-        <Map Name="Perth/PH_RWY2124" />
+        <Map Name="Perth/PH_RWY0306" />
       </Maps>
       <ATIS>
         <Editor Airport="YPPH" Frequency="123.8" />
         <Window Airport="YPPH" />
       </ATIS>
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YPPH" Visible="true" />
-        <Window Type="ADEP" Beacon="YPJT" Visible="true" />
       </Strips>
       <CFL QuickLevel="18000">
         <AdditionalLevels>1900,2700,2800,3100,3300</AdditionalLevels>
@@ -1843,7 +1837,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YBMK" Visible="true" />
       </Strips>
-      <CFL QuickLevel="14000">
+      <CFL QuickLevel="15000">
         <AdditionalLevels>3100,4700</AdditionalLevels>
       </CFL>
       <ArrivalLists>
@@ -1873,7 +1867,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YBRK" Visible="true" />
       </Strips>
-      <CFL QuickLevel="14000">
+      <CFL QuickLevel="15000">
         <AdditionalLevels>3200</AdditionalLevels>
       </CFL>
       <ArrivalLists>
@@ -1906,7 +1900,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YBAF" Visible="true" />
       </Strips>
-      <CFL QuickLevel="1000" />
+      <CFL QuickLevel="4000" />
       <ArrivalLists>
         <Airport Name="YBAF" />
       </ArrivalLists>
@@ -2011,7 +2005,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YMHB" Visible="true" />
       </Strips>
-      <CFL QuickLevel="4500">
+      <CFL QuickLevel="8000">
         <AdditionalLevels>3900,4200,5600</AdditionalLevels>
       </CFL>
       <ArrivalLists>
@@ -2082,7 +2076,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YMLT" Visible="true" />
       </Strips>
-      <CFL QuickLevel="4500">
+      <CFL QuickLevel="8000">
         <AdditionalLevels>3200,5800,6300</AdditionalLevels>
       </CFL>
       <ArrivalLists>
@@ -2113,7 +2107,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YBMK" Visible="true" />
       </Strips>
-      <CFL QuickLevel="4500">
+      <CFL QuickLevel="6000">
       </CFL>
       <ArrivalLists>
         <Airport Name="YBMK" />
@@ -2184,7 +2178,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YPPF" Visible="true" />
       </Strips>
-      <CFL QuickLevel="4000" />
+      <CFL QuickLevel="3000" />
       <ArrivalLists>
         <Airport Name="YPPF" />
       </ArrivalLists>
@@ -2219,7 +2213,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YBRK" Visible="true" />
       </Strips>
-      <CFL QuickLevel="4500">
+      <CFL QuickLevel="6000">
       </CFL>
       <ArrivalLists>
         <Airport Name="YBRK" />
@@ -2340,7 +2334,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YMAV" Visible="true" />
       </Strips>
-      <CFL QuickLevel="5000" />
+      <CFL QuickLevel="4000" />
       <ArrivalLists>
         <Airport Name="YMAV" />
       </ArrivalLists>
@@ -2418,7 +2412,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YMEN" Visible="true" />
       </Strips>
-      <CFL QuickLevel="5000" />
+      <CFL QuickLevel="3000" />
       <ArrivalLists>
         <Airport Name="YMEN" />
       </ArrivalLists>
@@ -3037,7 +3031,7 @@
       <Strips Mode="Beacon" Sort="Alpha">
         <Window Type="ADEP" Beacon="YBCG" Visible="true" />
       </Strips>
-      <CFL QuickLevel="5000" />
+      <CFL QuickLevel="6000" />
       <ArrivalLists>
         <Airport Name="YBCG" />
       </ArrivalLists>

diff --git a/Profile.xml b/Profile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Profile Name="Australia" FullName="Eurocat Australia (YMMM/YBBB)">
-	<Version AIRAC="2213" Revision="b" PublishDate="20230122" UpdateURL="https://vatsys.sawbe.com/downloads/data/Australia" />
+	<Version AIRAC="2301" Revision="a" PublishDate="20230126" UpdateURL="https://vatsys.sawbe.com/downloads/data/Australia" />
 	<Servers>
 		<VATSIMStatus url="https://status.vatsim.net/" />
 		<GRIB url="https://sawbe.com/GRIB/" />

diff --git a/Radars.xml b/Radars.xml
@@ -572,7 +572,7 @@
     <Lat>-32.795</Lat>
     <Long>151.834444444444</Long>
   </Radar>
-  <!--
+   <!--
   Shared Indonesia Data
   -->
   <Radar Name="Merauke" Type="ADSB" Elevation="36" MaxRange="250">

diff --git a/RestrictedAreas.xml b/RestrictedAreas.xml
@@ -5098,9 +5098,6 @@
 -125212.314+1420233.690/
 -125225.000+1420338.000/
 -131724.000+1420058.000</Area>
-    <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R604A SCHERGER" AltitudeFloor="4000" AltitudeCeiling="12500" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-131724.000+1420058.000/
@@ -5124,9 +5121,6 @@
 -131649.442+1421222.198/
 -131726.000+1420514.000/
 -131724.000+1420058.000</Area>
-    <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R604B SCHERGER" AltitudeFloor="12500" AltitudeCeiling="24500" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-131724.000+1420058.000/
@@ -5150,9 +5144,6 @@
 -131649.442+1421222.198/
 -131726.000+1420514.000/
 -131724.000+1420058.000</Area>
-    <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R605A SCHERGER" AltitudeFloor="4000" AltitudeCeiling="12500" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-115728.000+1420929.000/
@@ -5176,9 +5167,6 @@
 -115802.369+1415807.995/
 -115726.000+1420514.000/
 -115728.000+1420929.000</Area>
-    <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R605B SCHERGER" AltitudeFloor="12500" AltitudeCeiling="24500" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-115728.000+1420929.000/
@@ -5202,9 +5190,6 @@
 -115802.369+1415807.995/
 -115726.000+1420514.000/
 -115728.000+1420929.000</Area>
-    <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R605C SCHERGER" AltitudeFloor="24500" AltitudeCeiling="60000" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-115728.000+1420929.000/
@@ -5228,9 +5213,6 @@
 -115802.369+1415807.995/
 -115726.000+1420514.000/
 -115728.000+1420929.000</Area>
-    <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R607A SCHERGER" AltitudeFloor="12500" AltitudeCeiling="24500" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-143718.000+1415222.000/
@@ -5274,9 +5256,6 @@
 -131649.442+1415805.802/
 -131724.000+1420058.000/
 -143718.000+1415222.000</Area>
-    <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R607B SCHERGER" AltitudeFloor="24500" AltitudeCeiling="60000" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-143718.000+1415222.000/
@@ -5320,9 +5299,6 @@
 -131649.442+1415805.802/
 -131724.000+1420058.000/
 -143718.000+1415222.000</Area>
-    <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R608 LONGREACH" AltitudeFloor="0" AltitudeCeiling="8200" DAIWEnabled="true" LinePattern="Solid">
       <Area>-233431.000+1440843.000/