Merge pull request #178 from vatSys/2413draft

2413b
vatSys · Jan 26, 2025 · 119b3b0 · 119b3b0
2 parents 9109bf3 + b102866
commit 119b3b0
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 75 deletions.
diff --git a/Maps/SECTOR_FREQS.xml b/Maps/SECTOR_FREQS.xml
@@ -40,7 +40,7 @@
       <Point Name="ASW 131.8">-263809.000+1310516.000</Point>
       <Point Name="WAR 124.9">-273700.000+1254500.000</Point>
       <Point Name="FOR 132.7">-392002.000+1365637.000</Point>
-      <Point Name="WRA 132.9">-272024.000+1372305.000</Point>
+      <Point Name="WRA 132.8">-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>

diff --git a/Maps/TMA LL Labels.xml b/Maps/TMA LL Labels.xml
@@ -129,12 +129,12 @@
       <Point Name="D035">-3000.4574+15312.6515</Point>
       <Point Name="C SFC">-1750.2833+12349.8833</Point>
       <Point Name="C035">-1720.8667+12351.5333</Point>
-      <Point Name="DSFC-025(TWR)">-3806.1084+14426.2507</Point>
-      <Point Name="DSFC-025(TWR)">-3759.1143+14428.1067</Point>
+      <Point Name="DSFC-025">-3806.1084+14426.2507</Point>
+      <Point Name="DSFC-025">-3759.1143+14428.1067</Point>
       <Point Name="E015/045">-3812.3056+14431.0013</Point>
       <Point Name="E015/045">-3754.1315+14434.6098</Point>
-      <Point Name="E025/045(TWR)">-3807.7994+14425.9061</Point>
-      <Point Name="E025/045(TWR)">-3756.5533+14428.4828</Point>
+      <Point Name="E025/045">-3807.7994+14425.9061</Point>
+      <Point Name="E025/045">-3756.5533+14428.4828</Point>
       <Point Name="C045">-3622.0756+14640.0061</Point>
       <Point Name="C045">-3617.9104+14642.5867</Point>
       <Point Name="C045">-3550.0663+14710.437</Point>

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

diff --git a/RestrictedAreas.xml b/RestrictedAreas.xml
@@ -1239,9 +1239,7 @@
 -140000.000+1310000.000/
 -140000.000+1301941.000/
 -132217.000+1303407.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R225B TINDAL" AltitudeFloor="9500" AltitudeCeiling="60000" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-132524.000+1310000.000/
@@ -1251,9 +1249,7 @@
 -140000.000+1315249.000/
 -140000.000+1310000.000/
 -132524.000+1310000.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R225C TINDAL" AltitudeFloor="9500" AltitudeCeiling="60000" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-140000.000+1301941.000/
@@ -1287,9 +1283,7 @@
 -151520.000+1295433.000/
 -150544.000+1295421.000/
 -140000.000+1301941.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R225D TINDAL" AltitudeFloor="9500" AltitudeCeiling="60000" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-140000.000+1310000.000/
@@ -1318,9 +1312,7 @@
 -153432.000+1310225.000/
 -153359.000+1310000.000/
 -140000.000+1310000.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R225E TINDAL" AltitudeFloor="9500" AltitudeCeiling="60000" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-152600.000+1295820.000/
@@ -1354,9 +1346,7 @@
 -160709.936+1302304.284/
 -154536.563+1300741.808/
 -152600.000+1295820.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R225F TINDAL" AltitudeFloor="9500" AltitudeCeiling="60000" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-153359.000+1310000.000/
@@ -1373,9 +1363,7 @@
 -164056.759+1310423.360/
 -163849.000+1310000.000/
 -153359.000+1310000.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R226A TINDAL" AltitudeFloor="9500" AltitudeCeiling="0" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-140511.000+1323808.000/
@@ -1638,9 +1626,7 @@
 -180000.000+1322236.000/
 -180000.000+1313548.000/
 -170146.000+1294313.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R244 PBDS" AltitudeFloor="4000" AltitudeCeiling="9500" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-130327.000+1304117.000/
@@ -1748,9 +1734,7 @@
 -151520.000+1295433.000/
 -150544.000+1295421.000/
 -132217.000+1303407.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R248 PBDS" AltitudeFloor="4000" AltitudeCeiling="9500" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-152600.000+1295820.000/
@@ -1794,9 +1778,7 @@
 -160709.936+1302304.284/
 -154536.563+1300741.808/
 -152600.000+1295820.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R249A TINDAL" AltitudeFloor="1500" AltitudeCeiling="2500" DAIWEnabled="true" LinePattern="Dashed">
       <Area>-141912.000+1323909.000/
@@ -1909,9 +1891,7 @@
 -153432.000+1310225.000/
 -153359.000+1310000.000/
 -140000.000+1310000.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R251 PBDS" AltitudeFloor="9500" AltitudeCeiling="0" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-130138.000+1311204.000/
@@ -1974,9 +1954,7 @@
 -164430.000+1291048.000/
 -161640.000+1285943.000/
 -143432.000+1290013.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R254 NORTH EAST ROCK" AltitudeFloor="0" AltitudeCeiling="20000" DAIWEnabled="true" LinePattern="Solid">
       <Area>-350700.000+1363737.000/
@@ -2086,9 +2064,7 @@
 -122520.107+1300818.271/
 -123309.060+1300858.904/
 -123816.000+1301016.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="M263B DARWIN" AltitudeFloor="0" AltitudeCeiling="0" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-124809.000+1293554.000/
@@ -2102,9 +2078,7 @@
 -122511.697+1293227.955/
 -123905.496+1293338.286/
 -124809.000+1293554.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="M263C DARWIN" AltitudeFloor="0" AltitudeCeiling="0" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-125922.000+1285635.000/
@@ -2118,9 +2092,7 @@
 -122456.321+1285130.513/
 -124547.139+1285312.721/
 -125922.000+1285635.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="M263D DARWIN" AltitudeFloor="0" AltitudeCeiling="0" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-131315.000+1280720.000/
@@ -2134,9 +2106,7 @@
 -122428.456+1280018.851/
 -125400.537+1280237.779/
 -131315.000+1280720.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="M263E DARWIN" AltitudeFloor="0" AltitudeCeiling="0" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-124809.000+1293554.000/
@@ -2150,9 +2120,7 @@
 -130514.586+1294315.307/
 -125234.683+1293716.155/
 -124809.000+1293554.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="M263F DARWIN" AltitudeFloor="0" AltitudeCeiling="0" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-125922.000+1285635.000/
@@ -2166,9 +2134,7 @@
 -132502.607+1290732.920/
 -130601.595+1285836.521/
 -125922.000+1285635.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="M263G DARWIN" AltitudeFloor="0" AltitudeCeiling="0" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-131315.000+1280720.000/
@@ -2182,9 +2148,7 @@
 -134940.535+1282246.646/
 -132242.109+1281011.048/
 -131315.000+1280720.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="M263H DARWIN" AltitudeFloor="0" AltitudeCeiling="0" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-132616.000+1300054.000/
@@ -2212,9 +2176,7 @@
 -13.581650+130.224084/
 -13.491464+130.085164/
 -13.437778+130.015000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R262B DARWIN" AltitudeFloor="5000" AltitudeCeiling="0" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-135638.000+1293400.000/
@@ -2228,9 +2190,7 @@
 -140912.095+1295230.853/
 -135707.547+1293454.783/
 -135638.000+1293400.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R262C DARWIN" AltitudeFloor="5000" AltitudeCeiling="0" DAIWEnabled="true" LinePattern="Dotted">
       <Area>-143432.000+1290013.000/
@@ -2244,9 +2204,7 @@
 -145222.520+1292627.790/
 -143513.169+1290129.733/
 -143432.000+1290013.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Restricted" Name="R265A EDINBURGH" AltitudeFloor="4500" AltitudeCeiling="0" DAIWEnabled="true" LinePattern="Dashed">
       <Area>-344337.000+1383127.000/
@@ -7187,9 +7145,7 @@
 -130524.000+1305423.000/
 -130447.444+1304715.153/
 -130327.000+1304117.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Danger" Name="D213 ROBERTSON BARRACKS" AltitudeFloor="0" AltitudeCeiling="1100" DAIWEnabled="false" LinePattern="None">
       <Area>-122516.000+1305916.000/
@@ -7331,9 +7287,7 @@
 -143513.169+1290129.733/
 -143432.000+1290013.000/
 -125549.000+1302738.000</Area>
-      <Activations>
-        <Activation H24="true" Start="0000" End="0000" />
-      </Activations>
+      <Activations/>
     </RestrictedArea>
     <RestrictedArea Type="Danger" Name="D227 WICKHAM POINT" AltitudeFloor="0" AltitudeCeiling="900" DAIWEnabled="false" LinePattern="None">
       <Area>-123056.000+1305213.000/