Merge branch '2212draft' of https://github.com/vatSys/australia-dataset…

… into 2212draft
vatSys · Nov 30, 2022 · 393f125 · 393f125
2 parents 21759ed + c8973a5
commit 393f125
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 12 deletions.
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,CBA,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
@@ -78,7 +78,7 @@
         <Departure Values="YBCG">
           <Rules>
             <Default>
-              <AssignSector Order="BAC,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>
@@ -330,7 +330,7 @@
         <Departure Values="YPDN">
           <Rules>
             <Default>
-              <AssignSector Order="DAE,TRT"/>
+              <AssignSector Order="DAE,DAW,TRT"/>
             </Default>
           </Rules>
         </Departure>

diff --git a/MET.xml b/MET.xml
@@ -8,9 +8,9 @@
     <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/" />
-    <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>

diff --git a/Maps/SECTOR_FREQS.xml b/Maps/SECTOR_FREQS.xml
@@ -44,7 +44,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="GVE 133.8">-245100.000+1483800.000</Point>
+      <Point Name="CVN 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>
@@ -69,7 +69,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="CVN 133.8">-290800.000+1173200.000</Point>
+      <Point Name="GVE 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/Radars.xml b/Radars.xml
@@ -572,4 +572,78 @@
     <Lat>-32.795</Lat>
     <Long>151.834444444444</Long>
   </Radar>
+  <!--
+  Shared Indonesia Data
+  -->
+  <Radar Name="Merauke" Type="ADSB" Elevation="36" MaxRange="250">
+    <Lat>-8.51769</Lat>
+    <Long>140.41450</Long>
+  </Radar>
+  <Radar Name="Timika" Type="ADSB" Elevation="92" MaxRange="250">
+    <Lat>-4.53391</Lat>
+    <Long>136.88863</Long>
+  </Radar>
+  <Radar Name="Saumlaki" Type="ADSB" Elevation="223" MaxRange="250">
+    <Lat>-7.98819</Lat>
+    <Long>131.30682</Long>
+  </Radar>
+  <Radar Name="Kupang" Type="ADSB" Elevation="334" MaxRange="250">
+    <Lat>-10.16723</Lat>
+    <Long>123.67067</Long>
+  </Radar>
+  <Radar Name="Waingapu" Type="ADSB" Elevation="26" MaxRange="250">
+    <Lat>-9.66969</Lat>
+    <Long>120.30008</Long>
+  </Radar>
+  <Radar Name="Kintamani" Type="ADSB" Elevation="4721" MaxRange="250">
+    <Lat>-8.25056</Lat>
+    <Long>115.33301</Long>
+  </Radar>
+  <Radar Name="Alor" Type="ADSB" Elevation="23" MaxRange="250">
+    <Lat>-8.13483</Lat>
+    <Long>124.59743</Long>
+  </Radar>
+  <Radar Name="Semarang" Type="ADSB" Elevation="13" MaxRange="250">
+    <Lat>-6.97799</Lat>
+    <Long>110.37279</Long>
+  </Radar>
+  <!--
+  Shared PNG Data
+  -->
+  <Radar Name="MORSEBY PNG" Type="PRI" Elevation="140" MaxRange="80">
+    <Lat>-9.44388055555556</Lat>
+    <Long>147.226391666667</Long>
+  </Radar>
+  <Radar Name="MORSEBY PNG" Type="SSR_ModeS" Elevation="140" MaxRange="250">
+    <Lat>-9.44388055555556</Lat>
+    <Long>147.226391666667</Long>
+  </Radar>
+  <Radar Name="Mt Nauwein PNG" Type="ADSB" Elevation="4700" MaxRange="250">
+    <Lat>-6.52627777777778</Lat>
+    <Long>146.093055555556</Long>
+  </Radar>
+  <Radar Name="Mt Mission PNG" Type="ADSB" Elevation="350" MaxRange="250">
+    <Lat>-4.5</Lat>
+    <Long>142.5</Long>
+  </Radar>
+  <Radar Name="Mt Konokalang PNG" Type="ADSB" Elevation="5000" MaxRange="250">
+    <Lat>-4.41666666666667</Lat>
+    <Long>152.833333333333</Long>
+  </Radar>
+  <Radar Name="Mt Dimodimo PNG" Type="ADSB" Elevation="2700" MaxRange="250">
+    <Lat>-6.5</Lat>
+    <Long>142.833333333333</Long>
+  </Radar>
+  <Radar Name="Lorengau PNG" Type="ADSB" Elevation="450" MaxRange="250">
+    <Lat>-2.05</Lat>
+    <Long>145.283333333333</Long>
+  </Radar>
+  <Radar Name="Mt Robinson PNG" Type="ADSB" Elevation="450" MaxRange="250">
+    <Lat>-4.9</Lat>
+    <Long>141.15</Long>
+  </Radar>
+  <Radar Name="Burns Peak PNG" Type="ADSB" Elevation="800" MaxRange="250">
+    <Lat>-9.45532222222222</Lat>
+    <Long>147.164572222222</Long>
+  </Radar>
 </Radars>
diff --git a/Sectors.xml b/Sectors.xml
@@ -314,7 +314,7 @@
     <ResponsibleSectors>AAE</ResponsibleSectors>
   </Sector>
   <Sector FullName="Adelaide Departures" Frequency="118.200" Callsign="AD_DEP" Name="AAE">
-    <Volumes>ADD</Volumes>
+    <Volumes>ADA</Volumes>
   </Sector>
   <Sector FullName="Amberley Approach" Frequency="126.200" Callsign="AM_APP" Name="AMA">
     <Volumes>AMBAPP</Volumes>
@@ -339,7 +339,7 @@
   <Sector FullName="Brisbane Finals" Frequency="119.250" Callsign="BN-F_APP" Name="BN-FA" />
   <Sector FullName="Cairns Approach" Frequency="118.400" Callsign="CS_APP" Name="CS1">
     <Volumes>CSA</Volumes>
-    <ResponsibleSectors>CSD</ResponsibleSectors>
+    <ResponsibleSectors>CS2</ResponsibleSectors>
   </Sector>
   <Sector FullName="Cairns Departures" Frequency="126.100" Callsign="CS_DEP" Name="CS2">
     <Volumes>CSA</Volumes>
@@ -358,6 +358,7 @@
     <Volumes>RKA</Volumes>
   </Sector>
   <Sector FullName="Darwin Approach (East)" Frequency="125.200" Callsign="DN_APP" Name="DAE">
+    <ResponsibleSectors>DAW</ResponsibleSectors>
     <Volumes>DNA</Volumes>
   </Sector>
   <Sector FullName="Darwin Approach (West)" Frequency="134.100" Callsign="DN-W_APP" Name="DAW">

diff --git a/Volumes.xml b/Volumes.xml
@@ -4944,9 +4944,6 @@
   <Volume Name="ADA" LowerLimit="0" UpperLimit="24500">
     <Boundaries>AD_TMA_FULL</Boundaries>
   </Volume>
-  <Volume Name="ADD" LowerLimit="0" UpperLimit="24500">
-    <Boundaries>AD_TMA_FULL</Boundaries>
-  </Volume>
   <Volume Name="ADTWR" LowerLimit="0" UpperLimit="1500">
     <Boundaries>ADELAIDE_CONTROL_ZONE_(C)</Boundaries>
   </Volume>