Merge pull request #73 from vatSys/revert-72-2311bdraft_WF

Revert "2311b"
vatSys · Nov 6, 2023 · 89768f0 · 89768f0
2 parents 74e6e1a + 21da74a
commit 89768f0
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 239 deletions.
diff --git a/Maps/ALL_SECTORS.xml b/Maps/ALL_SECTORS.xml
@@ -1730,28 +1730,5 @@
 -385543.677+1432754.528/
 -385404.000+1432539.000/
 -384614.000+1431550.000</Line>
-<!--WF OCEANIC Boundary-->
-    <Line Name="INN">
-   -422059.9533+1405959.7253/
-    -434347.9572+1455148.0322/
-    -433114.6796+1492130.1794/
-    -435102.851+1503952.6025/
-    -443357.0987+1495959.6704/
-    -450000.000+1495959.7803/
-    -533409.5544+1435204.5667/
-    -502304.1949+1334139.2798/
-    -422059.9533+1405959.7253</Line>
-    <Line Name="INC">
--502304.1949+1334139.2798/
-    -533409.5544+1435204.5667/
-    -630242.8037+1322600.498/
-    -590106.6458+1212911.358/
-    -502304.1949+1334139.2798</Line>
-    <Line Name="INA">
-     -590106.6458+1212911.358/
-    -630242.8037+1322600.498/
-    -701843.5718+1133902.2028/
-    -651315.6574+1043657.865/
-    -590106.6458+1212911.358</Line>
   </Map>
 </Maps>
diff --git a/Maps/Brisbane/BN_TCU.xml b/Maps/Brisbane/BN_TCU.xml
@@ -706,19 +706,4 @@
       <Threshold Name="35" Position="-28.169594+153.506331" ExtendedCentrelineTrack="184.09" ExtendedCentrelineLength="5" ExtendedCentrelineTickInterval="5" />
     </Runway>
   </Map>
-    <!--YBBN 5 & 10 NM FINAL MARKS-->
-    <Map Type="System2" Name="YBBN_5_10nm" Priority="2" Center="-27.384167+153.117500">
-    <Symbol Type="Circle">
-      <Point>-272726.1433+1530351.2622</Point>
-      <Point>-272834.1075+1530434.7681</Point>
-      <Point>-271658.1854+1530948.208</Point>
-      <Point>-271759.6883+1531037.262</Point>
-    </Symbol>
-    <Symbol Type="HollowTriangle">
-      <Point>-273154.4707+1530117.7832</Point>
-      <Point>-273301.9748+1530158.5425</Point>
-      <Point>-271229.0204+1531224.0491</Point>
-      <Point>-271332.6518+1531311.2354</Point>
-    </Symbol>
-  </Map>
 </Maps>
diff --git a/Maps/Cairns/CS_TCU.xml b/Maps/Cairns/CS_TCU.xml
@@ -282,15 +282,4 @@
       <Threshold Name="33" Position="-16.891969+145.755392" ExtendedCentrelineTrack="156.48" ExtendedCentrelineLength="25" ExtendedCentrelineTickInterval="2" />
     </Runway>
   </Map>
-    <!--YBCS 5 & 10 NM FINAL MARKS-->
-    <Map Type="System2" Name="YBCS_5_10nm" Priority="2" Center="-16.885833+145.755278">
-    <Symbol Type="Circle">
-      <Point>-164720.8653+1454230.9705</Point>
-      <Point>-165803.9569+1454724.2505</Point>
-    </Symbol>
-    <Symbol Type="HollowTriangle">
-      <Point>-164251.3707+1454021.4417</Point>
-      <Point>-170239.5009+1454929.220</Point>
-    </Symbol>
-  </Map>
 </Maps>
diff --git a/Maps/Darwin/DN_TCU.xml b/Maps/Darwin/DN_TCU.xml
@@ -272,11 +272,4 @@
       <Threshold Name="36" Position="-12.422625+130.870689" ExtendedCentrelineTrack="179.85" ExtendedCentrelineLength="5" ExtendedCentrelineTickInterval="5" />
     </Runway>
   </Map>
-  <!--YPDN 5 NM FINAL MARKS-->
-  <Map Type="System2" Name="YPDN_5NM" Priority="2" Center="-12.414722+130.876667">
-    <Symbol Type="Circle">
-      <Point>-122256.611+1304703.5962</Point>
-      <Point>-122646.2664+1305829.8572</Point>
-    </Symbol>
-  </Map>
 </Maps>
diff --git a/Maps/Melbourne/ML_TCU.xml b/Maps/Melbourne/ML_TCU.xml
@@ -447,13 +447,4 @@
       <Threshold Name="35" Position="-37.733944+144.901411" ExtendedCentrelineTrack="177.82" ExtendedCentrelineLength="5" ExtendedCentrelineTickInterval="5" />
     </Runway>
   </Map>
-  <!--YMML 5 NM FINAL MARKS-->
-  <Map Type="System2" Name="YMML_5NM" Priority="2" Center="-37.673333+144.843333">
-    <Symbol Type="Circle">
-      <Point>-373414.5532+1444909.884</Point>
-      <Point>-374005.5527+1445711.250</Point>
-      <Point>-374604.9567+1445122.6538</Point>
-      <Point>-373916.073+1444302.5562</Point>
-    </Symbol>
-  </Map>
 </Maps>
diff --git a/Maps/SECTOR_FREQS.xml b/Maps/SECTOR_FREQS.xml
@@ -7,7 +7,7 @@
       <Point Name="BIK 129.8">-341253.297+1494334.513</Point>
       <Point Name="YWE 134.325">-370054.794+1435021.954</Point>
       <Point Name="ELW 123.75">-373133.485+1461233.266</Point>
-      <Point Name="HUO 122.6">-401214.5047+1425819.2004</Point>
+      <Point Name="HUO 122.6">-405652.215+1430320.462</Point>
       <Point Name="TBD 123.05">-334938.349+1402433.832</Point>
       <Point Name="ASP 128.85">-245959.751+1362020.033</Point>
       <Point Name="PIY 133.9">-315024.000+1170534.000</Point>
@@ -24,7 +24,7 @@
       <Point Name="HWE 124.95">-290727.162+1591519.306</Point>
       <Point Name="FLD 132.85">-224551.262+1564423.467</Point>
       <Point Name="COL 133.15">-153555.148+1541534.767</Point>
-      <!--Point Name="INS 123.2">-500927.452+1400147.228</Point-->
+      <Point Name="INS 123.2">-500927.452+1400147.228</Point>
       <Point Name="INE 123.65">-142041.000+1054806.000</Point>
       <Point Name="KAT 133.5">-331700.000+1490400.000</Point>
       <Point Name="WOL 125.0">-353248.000+1511150.000</Point>
@@ -73,12 +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>
-      <!--WF HUS-->
-      <Point Name="HUS 127.8">-414236.5872+1425601.322</Point>
-      <!--WF OCEANIC-->
-      <Point Name="INN 123.9">-475215.3882+1415825.5725</Point>
-      <Point Name="INC 124.8">-565622.6492+1330300.8899</Point>
-      <Point Name="INA 125.7">-645209.6204+1183250.6726</Point>
     </Label>
   </Map>
 </Maps>
diff --git a/Maps/Sydney/SY_TCU.xml b/Maps/Sydney/SY_TCU.xml
@@ -527,21 +527,4 @@
       <Threshold Name="28" Position="-33.607272+150.793219" ExtendedCentrelineTrack="107.11" ExtendedCentrelineLength="10" ExtendedCentrelineTickInterval="1" />
     </Runway>
   </Map>
-  <!--YSSY 5 & 10NM Final Marks-->
-  <Map Type="System2" Name="YSSY_5_10nm" Priority="2" Center="-33.946111+151.177222">
-    <Symbol Type="Circle">
-      <Point>-335055.0095+1510901.8457</Point>
-      <Point>-335113.9334+1510947.8784</Point>
-      <Point>-335453.9209+1511707.3315</Point>
-      <Point>-335758.9032+1510401.1499</Point>
-      <Point>-340239.0683+1511206.416</Point>
-      <Point>-340304.8587+1511253.9319</Point>
-    </Symbol>
-    <Symbol Type="HollowTriangle">
-      <Point>-334601.2076+1510745.1611</Point>
-      <Point>-334620.1453+1510831.853</Point>
-      <Point>-340736.4133+1511322.771</Point>
-      <Point>-340800.3497+1511410.7813</Point>
-    </Symbol>
-  </Map>
 </Maps>
diff --git a/Positions.xml b/Positions.xml
@@ -43,7 +43,6 @@
   <Position Name="Huon" Type="ASD" DefaultCenter="-4117.000+14626.000" DefaultRange="800" VisibilityRange="600">
     <Sectors>
       <Sector Name="HUO" />
-      <Sector Name="HUS" />
       <Sector Name="HBA" />
       <Sector Name="LTA" />
     </Sectors>
@@ -77,12 +76,6 @@
       <Line>Charts - vats.im/pac/charts</Line>
       <Line>ATC feedback - helpdesk.vatpac.org</Line>
     </ControllerInfo>
-    <ControllerInfo Callsign="ML-HUS_CTR">
-      <Line>Melbourne Centre</Line>
-      <Line>WORLDFLIGHT ATC POSITION</Line>
-      <Line>Charts - vats.im/pac/charts</Line>
-      <Line>ATC feedback - helpdesk.vatpac.org</Line>
-    </ControllerInfo>
   </Position>
   <Position Name="Mt Isa" Type="ASD" DefaultCenter="-194924.2967+1405500.9521" DefaultRange="2751" VisibilityRange="600">
     <Sectors>
@@ -1168,9 +1161,6 @@
         <Sector Name="IND" />
         <Sector Name="INS" />
         <Sector Name="INE" />
-        <Sector Name="INN" />
-        <Sector Name="INC" />
-        <Sector Name="INA" />
       </Sectors>
       <Maps>
         <Map Name="ALL_CTA" />
@@ -1192,21 +1182,6 @@
         <Line>Squawk 2000 entering OCEANIC region. Check your Sim Zulu time is correct.</Line>
         <Line>ATC feedback - helpdesk.vatpac.org</Line>
       </ControllerInfo>
-      <ControllerInfo Callsign="ML-INN_CTR">
-        <Line>Brisbane Radio</Line>
-        <Line>WORLDFLIGHT ATC. THIS POSITION IS RADAR CONTROLLED.</Line>
-        <Line>ATC feedback - helpdesk.vatpac.org</Line>
-      </ControllerInfo>
-      <ControllerInfo Callsign="ML-INC_CTR">
-        <Line>Brisbane Radio</Line>
-        <Line>WORLDFLIGHT ATC. THIS POSITION IS RADAR CONTROLLED.</Line>
-        <Line>ATC feedback - helpdesk.vatpac.org</Line>
-      </ControllerInfo>
-      <ControllerInfo Callsign="ML-INA_CTR">
-        <Line>Brisbane Radio</Line>
-        <Line>WORLDFLIGHT ATC. THIS POSITION IS RADAR CONTROLLED.</Line>
-        <Line>ATC feedback - helpdesk.vatpac.org</Line>
-      </ControllerInfo>
     </Position>
   </Group>
   <Group Name="TCU">

diff --git a/Radars.xml b/Radars.xml
@@ -732,17 +732,4 @@
     <Lat>-9.45532222222222</Lat>
     <Long>147.164572222222</Long>
   </Radar>
-  <!--WF FISH AND CHIP BAR-->
-  <Radar Name="Shark" Type="ADSB" Elevation="0" MaxRange="350">
-    <Lat>-47.5215</Lat>
-    <Long>141.5826</Long>
-  </Radar>
-  <Radar Name="Snapper" Type="ADSB" Elevation="0" MaxRange="350">
-    <Lat>-56.5623</Lat>
-    <Long>133.0301</Long>
-  </Radar>
-  <Radar Name="Squid Rings" Type="ADSB" Elevation="0" MaxRange="350">
-    <Lat>-64.5210</Lat>
-    <Long>118.3251</Long>
-  </Radar>
 </Radars>
diff --git a/Sectors.xml b/Sectors.xml
@@ -77,14 +77,8 @@
   <Sector FullName="Gundagai" Frequency="128.400" Callsign="ML-GUN_CTR" Name="GUN">
     <Volumes>GUN,GUN_CB_TMA_CAP</Volumes>
   </Sector>
-  <!--WF HUO AMMENDED-->
   <Sector FullName="Huon" Frequency="122.600" Callsign="ML-HUO_CTR" Name="HUO">
     <Volumes>HUO,HUO_TMA_CAP</Volumes>
-    <ResponsibleSectors>HUS</ResponsibleSectors>
-  </Sector>
-  <!--WF HUS-->
-  <Sector FullName="Huon South" Frequency="127.800" Callsign="ML-HUS_CTR" Name="HUS">
-    <Volumes>HUS</Volumes>
   </Sector>
   <Sector FullName="Hyden" Frequency="118.200" Callsign="ML-HYD_CTR" Name="HYD">
     <Volumes>HYD</Volumes>
@@ -274,19 +268,8 @@
   </Sector>
   <Sector FullName="Brisbane Radio (Indian)" Frequency="129.250" Callsign="ML-IND_FSS" Name="IND">
     <Volumes>IND</Volumes>
-    <ResponsibleSectors>INE,INS,INN,INC,INA</ResponsibleSectors>
-  </Sector>
-  <!--WF OCEANIC SECTORS-->
-  <Sector FullName="Brisbane Radio (Indian North)" Frequency="123.900" Callsign="ML-INN_CTR" Name="INN">
-    <Volumes>INN</Volumes>
-  </Sector>
-  <Sector FullName="Brisbane Radio (Indian Central)" Frequency="124.800" Callsign="ML-INC_CTR" Name="INC">
-    <Volumes>INC</Volumes>
-  </Sector>
-  <Sector FullName="Brisbane Radio (Indian Antractica)" Frequency="125.700" Callsign="ML-INA_CTR" Name="INA">
-    <Volumes>INA</Volumes>
+    <ResponsibleSectors>INE,INS</ResponsibleSectors>
   </Sector>
-  <!--END WF OCEANIC SECTORS-->
   <Sector FullName="Brisbane Radio (Lord Howe)" Frequency="124.950" Callsign="BN-HWE_FSS" Name="HWE">
     <Volumes>HWE</Volumes>
   </Sector>

diff --git a/Volumes.xml b/Volumes.xml
@@ -2069,34 +2069,6 @@
     -900000.000+1200000.000/
     -364312.000+1200000.000
   </Boundary>
-  <!--INDIAN NORTH WF-->
-  <Boundary Name="INDIAN_NORTH">
-    -422059.9533+1405959.7253/
-    -434347.9572+1455148.0322/
-    -433114.6796+1492130.1794/
-    -435102.851+1503952.6025/
-    -443357.0987+1495959.6704/
-    -450000.000+1495959.7803/
-    -533409.5544+1435204.5667/
-    -502304.1949+1334139.2798/
-    -422059.9533+1405959.7253
-  </Boundary>
-  <!--INDIAN_CENTRAL-->
-  <Boundary Name="INDIAN_CENTRAL">
-    -502304.1949+1334139.2798/
-    -533409.5544+1435204.5667/
-    -630242.8037+1322600.498/
-    -590106.6458+1212911.358/
-    -502304.1949+1334139.2798
-  </Boundary>
-  <!--INDIAN_ANTARCTICA-->
-  <Boundary Name="INDIAN_ANTRACTICA">
-    -590106.6458+1212911.358/
-    -630242.8037+1322600.498/
-    -701843.5718+1133902.2028/
-    -651315.6574+1043657.865/
-    -590106.6458+1212911.358
-  </Boundary>
   <Boundary Name="ISA">
     -172018.000+1370918.000/
     -163557.000+1371056.000/
@@ -4107,54 +4079,6 @@
     -434348.000+1455148.000/
     -424756.000+1422850.000
   </Boundary>
-  <!--WF HUO-->
-  <Boundary Name="HUON">
-    -38.901111+141.000000/
-    -38.901111+143.427500/
-    -39.000811+143.605120/
-    -39.140036+143.886656/
-    -39.242181+144.191766/
-    -39.304565+144.512930/
-    -39.325544+144.842222/
-    -39.313611+145.125833/
-    -39.793333+145.125000/
-    -40.000000+145.200278/
-    -40.000000+146.596945/
-    -39.833078+146.855001/
-    -39.549248+147.263154/
-    -39.325833+147.564167/
-    -39.630000+147.741111/
-    -39.616008+147.790937/
-    -39.597833+147.890599/
-    -39.591726+147.992778/
-    -39.597833+148.094957/
-    -39.616008+148.194619/
-    -39.645812+148.289310/
-    -39.686525+148.376698/
-    -39.737164+148.454631/
-    -39.796502+148.521191/
-    -39.863098+148.574739/
-    -39.935331+148.613958/
-    -40.000556+148.632778/
-    -40.567222+150.644167/
-    -41.543900+147.212997/
-    -40.500000+141.000000/
-    -38.901111+141.000000
-  </Boundary>
-  <!--WF HUS-->
-  <Boundary Name="HUON_South">
-    -43.000000+151.000000/
-    -43.850833+150.664722/
-    -43.520833+149.358333/
-    -43.730000+145.863333/
-    -42.798889+142.480556/
-    -42.350000+141.000000/
-    -41.300000+141.000000/
-    -40.500000+141.000000/
-    -41.543900+147.212997/
-    -40.567222+150.644167/
-    -43.000000+151.000000
-  </Boundary>
   <Boundary Name="TRT_A">
     -123955.000+1280111.000/
     -122603.000+1261925.000/
@@ -5467,13 +5391,8 @@
   <Volume Name="HMTWR" LowerLimit="0" UpperLimit="4500">
     <Boundaries>HAMILTON_IS_CTA_D4</Boundaries>
   </Volume>
-  <!--WF HUON AMMENDED-->
   <Volume Name="HUO" LowerLimit="0" UpperLimit="60000">
-    <Boundaries>HUON</Boundaries>
-  </Volume>
-    <!--WF HUS-->
-  <Volume Name="HUS" LowerLimit="0" UpperLimit="60000">
-    <Boundaries>HUON_South</Boundaries>
+    <Boundaries>HUON_B_MODIFIED,HUON_C</Boundaries>
   </Volume>
   <Volume Name="HUO_TMA_CAP" LowerLimit="24500" UpperLimit="60000">
     <Boundaries>HOBART_APPROACH,LAUNCESTON_APPROACH</Boundaries>
@@ -5493,17 +5412,6 @@
   <Volume Name="INS" LowerLimit="24500" UpperLimit="60000">
     <Boundaries>INDIAN_SOUTH</Boundaries>
   </Volume>
-  <!--WF INDIAN VOLUMES-->
-  <Volume Name="INN" LowerLimit="0" UpperLimit="60000">
-    <Boundaries>INDIAN_NORTH</Boundaries>
-  </Volume>
-  <Volume Name="INC" LowerLimit="0" UpperLimit="60000">
-    <Boundaries>INDIAN_CENTRAL</Boundaries>
-  </Volume>
-  <Volume Name="INA" LowerLimit="0" UpperLimit="60000">
-    <Boundaries>INDIAN_ANTRACTICA</Boundaries>
-  </Volume>
-  <!--END WF VOLUME-->
   <Volume Name="ISA" LowerLimit="0" UpperLimit="60000">
     <Boundaries>ISA</Boundaries>
   </Volume>