Merge pull request #155 from vatSys/2411bdraft

Removal of WF sectors
vatSys · Nov 14, 2024 · bc668ff · bc668ff
2 parents 1b218cb + c5c1e6e
commit bc668ff
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 36 deletions.
diff --git a/Maps/ALL_SECTORS.xml b/Maps/ALL_SECTORS.xml
@@ -16,7 +16,7 @@
 -174000.000+1630000.000/
 -165817.000+1623945.000/
 -140000.000+1611500.000</Line>
-    <!--<Line Name="ARA">
+    <Line Name="ARA">
 -072338.000+1334000.000/
 -070000.000+1350000.000/
 -073654.000+1360000.000/
@@ -72,8 +72,8 @@
 -100127.000+1313932.000/
 -094839.000+1313025.000/
 -081924.000+1302716.000/
--072338.000+1334000.000</Line>-->
-    <Line Name="ARA_WF">
+-072338.000+1334000.000</Line>
+    <!--<Line Name="ARA_WF">
 -07.393889+133.666667/
 -07.000000+135.000000/
 -07.615000+136.000000/
@@ -139,7 +139,7 @@
 -13.469445+139.061111/
 -10.946945+139.204445/
 -09.591945+139.262778/
--09.833333+139.666667</Line>
+-09.833333+139.666667</Line>-->
     <Line Name="ASH">
 -14.136945+115.142222/
 -12.000000+114.500000/
@@ -1044,7 +1044,7 @@
 -422100.000+1410000.000/
 -371038.000+1250454.000/
 -350427.000+1250010.000</Line>
-<Line Name="FOW">
+<!--<Line Name="FOW">
     -284701.000+1275000.000/
     -305211.800+1300000.000/
     -381524.000+1300000.000/
@@ -1056,7 +1056,7 @@
     -305100.000+1233737.000/
     -293000.000+1250000.000/
     -284701.000+1275000.000
-</Line>
+</Line>-->
     <Line Name="GEL">
 -300000.000+1124356.000/
 -273000.000+1122001.000/

diff --git a/Maps/SECTOR_FREQS.xml b/Maps/SECTOR_FREQS.xml
@@ -61,8 +61,6 @@
       <Point Name="KPL 125.9">-240200.000+1524200.000</Point>
       <Point Name="SDY 134.3">-271100.000+1550900.000</Point>
       <Point Name="ARA 133.7">-122105.018+1384036.707</Point>
-      <!--WORLDFLIGHT-->
-      <Point Name="ARE 127.6">-122214.1213+1403350.5481</Point>
       <Point Name="WEG 132.45">-250600.000+1425900.000</Point>
       <Point Name="TBP 120.55">-182412.000+1491259.000</Point>
       <Point Name="BAR 123.8">-145700.000+1453500.000</Point>
@@ -75,7 +73,6 @@
       <Point Name="MNN 130.1">-314908.724+1521016.356</Point>
       <Point Name="MLD 132.35">-330354.396+1514429.040</Point>
       <Point Name="OCN 128.6">-343230.000+1540905.000</Point>
-      <Point Name="FOW 131.7">-361710.000+1271849.000</Point>
       <Point Name="TRS 133.2">-143648.489+1334603.061</Point>
       <Point Name="ASH 133.2">-152604.5149+1214654.2853</Point>
     </Label>

diff --git a/Positions.xml b/Positions.xml
@@ -85,8 +85,6 @@
         <Sector Name="ISA" />
         <Sector Name="WEG" />
         <Sector Name="ARA" />
-        <!--WORLDFLIGHT-->
-        <Sector Name="ARE" />
         <Sector Name="STR" />
         <Sector Name="CVN" />
       </Sectors>
@@ -242,7 +240,6 @@
         <Sector Name="WAR" />
         <Sector Name="BKE" />
         <Sector Name="FOR" />
-        <Sector Name="FOW" />
         <Sector Name="WRA" />
         <Sector Name="ESP" />
       </Sectors>

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="2411" Revision="a" PublishDate="20241102" UpdateURL="https://vatsys.sawbe.com/downloads/data/Australia" />
+	<Version AIRAC="2411" Revision="b" PublishDate="202411014" UpdateURL="https://vatsys.sawbe.com/downloads/data/Australia" />
 	<Servers>
 		<VATSIMStatus url="https://status.vatsim.net/" />
 		<GRIB url="https://sawbe.com/GRIB/" />

diff --git a/Sectors.xml b/Sectors.xml
@@ -10,10 +10,9 @@
   <Sector FullName="Arafura" Frequency="133.700" Callsign="BN-ARA_CTR" Name="ARA">
     <Volumes>ARA</Volumes>
   </Sector>
-  <!--WORLDFLIGHT ADDED POSITION-->
-  <Sector FullName="Arafura East" Frequency="127.600" Callsign="BN-ARE_CTR" Name="ARE">
+  <!--<Sector FullName="Arafura East" Frequency="127.600" Callsign="BN-ARE_CTR" Name="ARE">
     <Volumes>ARW</Volumes>
-  </Sector>
+  </Sector>-->
   <Sector FullName="Armidale" Frequency="130.900" Callsign="BN-ARL_CTR" Name="ARL">
     <Volumes>ARL</Volumes>
     <ResponsibleSectors>MDE,MLD,OCN,MNN,CNK</ResponsibleSectors>
@@ -67,12 +66,11 @@
     <Volumes>ESP</Volumes>
   </Sector>
   <Sector FullName="Forrest" Frequency="132.700" Callsign="ML-FOR_CTR" Name="FOR">
-    <Volumes>FORE</Volumes>
-    <ResponsibleSectors>FOW</ResponsibleSectors>
+    <Volumes>FOR</Volumes>
   </Sector>
-  <Sector FullName="Forrest West" Frequency="131.700" Callsign="ML-FOW_CTR" Name="FOW">
+  <!--<Sector FullName="Forrest West" Frequency="131.700" Callsign="ML-FOW_CTR" Name="FOW">
     <Volumes>FORW</Volumes>
-  </Sector>
+  </Sector>-->
   <Sector FullName="Geraldton" Frequency="134.200" Callsign="ML-GEL_CTR" Name="GEL">
     <Volumes>GEL</Volumes>
   </Sector>

diff --git a/Volumes.xml b/Volumes.xml
@@ -245,7 +245,7 @@
     -272902.131+1524634.318/
     -272924.000+1524734.000
   </Boundary>
-  <!--<Boundary Name="ARAFURA">
+  <Boundary Name="ARAFURA">
     -072338.000+1334000.000/
     -070000.000+1350000.000/
     -073654.000+1360000.000/
@@ -302,8 +302,8 @@
     -094839.000+1313025.000/
     -081924.000+1302716.000/
     -072338.000+1334000.000
-  </Boundary>-->
-  <Boundary Name="ARAFURA_WF">
+  </Boundary>
+  <!--<Boundary Name="ARAFURA_WF">
     -07.393889+133.666667/
     -07.000000+135.000000/
     -07.615000+136.000000/
@@ -371,7 +371,7 @@
     -10.946945+139.204445/
     -09.591945+139.262778/
     -09.833333+139.666667
-  </Boundary>
+  </Boundary>-->
   <Boundary Name="ARMIDALE">
     -313806.000+1502905.000/
     -311850.000+1501748.000/
@@ -1564,7 +1564,6 @@
     -184027.000+1510035.000/
     -165817.000+1510431.000
   </Boundary>
-  <!--
   <Boundary Name="FORREST">
     -350427.000+1250010.000/
     -325136.000+1240000.000/
@@ -1591,8 +1590,8 @@
     -422100.000+1410000.000/
     -371038.000+1250454.000/
     -350427.000+1250010.000
-  </Boundary>-->
-  <Boundary Name="FORREST_EAST">
+  </Boundary>
+  <!--<Boundary Name="FORREST_EAST">
     -284701.000+1275000.000/
     -283616.000+1290000.000/
     -282326.000+1301837.000/
@@ -1628,7 +1627,7 @@
     -305100.000+1233737.000/
     -293000.000+1250000.000/
     -284701.000+1275000.000
-  </Boundary>
+  </Boundary>-->
   <Boundary Name="GERALDTON">
     -300000.000+1124356.000/
     -273000.000+1122001.000/
@@ -5356,15 +5355,15 @@
   <Volume Name="AMBTWR" LowerLimit="0" UpperLimit="1600">
     <Boundaries>AMBERLEY_CONTROL_ZONE_(C)</Boundaries>
   </Volume>
-  <!--<Volume Name="ARA" LowerLimit="0" UpperLimit="60000">
-    <Boundaries>ARAFURA</Boundaries>
-  </Volume>-->
   <Volume Name="ARA" LowerLimit="0" UpperLimit="60000">
+    <Boundaries>ARAFURA</Boundaries>
+  </Volume>
+  <!--<Volume Name="ARA" LowerLimit="0" UpperLimit="60000">
     <Boundaries>ARAFURA_WF</Boundaries>
   </Volume>
   <Volume Name="ARW" LowerLimit="0" UpperLimit="60000">
     <Boundaries>ARAFURAEAST_WF</Boundaries>
-  </Volume>
+  </Volume>-->
   <Volume Name="ARL" LowerLimit="0" UpperLimit="60000">
     <Boundaries>ARMIDALE</Boundaries>
   </Volume>
@@ -5542,15 +5541,15 @@
   <Volume Name="FLD" LowerLimit="24500" UpperLimit="60000">
     <Boundaries>FLINDERS</Boundaries>
   </Volume>
-  <!--<Volume Name="FOR" LowerLimit="0" UpperLimit="60000">
+  <Volume Name="FOR" LowerLimit="0" UpperLimit="60000">
     <Boundaries>FORREST</Boundaries>
-  </Volume>-->
-  <Volume Name="FORE" LowerLimit="0" UpperLimit="60000">
+  </Volume>
+  <!--<Volume Name="FORE" LowerLimit="0" UpperLimit="60000">
     <Boundaries>FORREST_EAST</Boundaries>
   </Volume>
   <Volume Name="FORW" LowerLimit="0" UpperLimit="60000">
     <Boundaries>FORREST_WEST</Boundaries>
-  </Volume>
+  </Volume>-->
   <Volume Name="GEL" LowerLimit="0" UpperLimit="60000">
     <Boundaries>GERALDTON</Boundaries>
   </Volume>