Merge pull request #19 from vatSys/2307draft

2307 | 13JUN23
vatSys · Jul 13, 2023 · 2ee34d7 · 2ee34d7
2 parents 74837e8 + 1c6d88e
commit 2ee34d7
Show file tree

Hide file tree

Showing 30 changed files with 1,470 additions and 597 deletions.
diff --git a/Airspace.xml b/Airspace.xml
@@ -606,7 +606,7 @@ NI NDB
 </Airway>
     <Airway Name="B598">
 DN VOR/
-UNTER/
+MASRA/
 IGOPO/
 IDELU/
 PEBTA/
@@ -748,7 +748,7 @@ TEPAM/
 MEPAB/
 PUGEL/
 LAMEK/
-PESKY/
+MUBNI/
 CS VOR
 </Airway>
     <Airway Name="G593">
@@ -1281,7 +1281,7 @@ VELMO
 TESAT/
 EVONN/
 GEROS/
-ERVON/
+REPUD/
 LEGAN/
 LUNBI
 </Airway>
@@ -1570,7 +1570,7 @@ MABRO/
 TOSAS/
 BENKI/
 EKOKU/
-SWALO/
+RUMKA/
 SWIFT/
 TL VOR
 </Airway>
@@ -2612,6 +2612,7 @@ NINIA
     <Point Name="MARLN" Type="Fix">-340205.000+1520402.100</Point>
     <Point Name="MARMA" Type="Fix">-175112.341+1682127.911</Point>
     <Point Name="MARTI" Type="Fix">+033000.000+1691630.000</Point>
+    <Point Name="MASRA" Type="Fix">-121337.400+1321513.300</Point>
     <Point Name="MATAV" Type="Fix">-131401.000-1762223.000</Point>
     <Point Name="MATER" Type="Fix">+012633.220+1731950.909</Point>
     <Point Name="MATGA" Type="Fix">-192933.569+1700454.008</Point>
@@ -2658,6 +2659,7 @@ NINIA
     <Point Name="MUBED" Type="Fix">-184429.000+1781648.000</Point>
     <Point Name="MUBEK" Type="Fix">-032616.141+1491117.722</Point>
     <Point Name="MUBIT" Type="Fix">+033000.000+1644006.000</Point>
+    <Point Name="MUBNI" Type="Fix">-170409.700+1462632.000</Point>
     <Point Name="MUDIX" Type="Fix">-060442.000+1452324.000</Point>
     <Point Name="MUDOV" Type="Fix">-085839.202+1475451.671</Point>
     <Point Name="MUGEN" Type="Fix">-315509.710+1702214.840</Point>
@@ -2871,6 +2873,7 @@ NINIA
     <Point Name="RENEB" Type="Fix">-432633.500+1681342.100</Point>
     <Point Name="REPOK" Type="Fix">-081336.419+1570213.988</Point>
     <Point Name="REPOL" Type="Fix">-250000.000-1771431.639</Point>
+    <Point Name="REPUD" Type="Fix">-354650.900+1580455.300</Point>
     <Point Name="RFN01" Type="Fix">-174449.240+1772859.689</Point>
     <Point Name="RFN02" Type="Fix">-174636.541+1772855.409</Point>
     <Point Name="RFN03" Type="Fix">-174641.131+1772848.068</Point>
@@ -2910,6 +2913,7 @@ NINIA
     <Point Name="RUMAB" Type="Fix">-165836.000+1790954.000</Point>
     <Point Name="RUMIS" Type="Fix">-094304.681+1472819.981</Point>
     <Point Name="RUMIX" Type="Fix">-270737.000+1630000.000</Point>
+    <Point Name="RUMKA" Type="Fix">-174712.500+1464939.300</Point>
     <Point Name="RUMUS" Type="Fix">-293339.780+1715139.038</Point>
     <Point Name="RUNOD" Type="Fix">-360925.000+1630000.000</Point>
     <Point Name="RUPAS" Type="Fix">-103124.000+1630000.000</Point>

diff --git a/Maps/ALL_CTA.xml b/Maps/ALL_CTA.xml
@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Maps>
   <Map Type="System" Name="ALL_CTA" Priority="2">
+    <Line Name="AYNZ_NADZAB_CTA_D30_ARC" Pattern="Dashed">
+-063400.000+1471352.000/
+-062855.560+1471325.059/
+-062352.572+1471203.045/
+-061908.331+1470949.370/
+-061451.460+1470648.111/
+-061109.754+1470304.786/
+-060809.933+1465846.177/
+-060557.450+1465400.134/
+-060436.319+1464855.329/
+-060409.000+1464341.000/
+-060436.319+1463826.671/
+-060557.450+1463321.866/
+-060809.933+1462835.823/
+-061109.754+1462417.214/
+-061438.000+1462045.000</Line>
     <Line Name="AYNZ_NADZAB_CTA-CTZ" Pattern="Dashed">
 -061517.000+1463701.000/
 -062445.000+1464016.000/
@@ -621,44 +637,23 @@
 -091111.509+1470007.635/
 -090911.626+1470301.264/
 -090754.000+1470543.000</Line>
-    <Line Name="AYGA_GOROKA_CTZ" Pattern="Dashed">
--054457.000+1452328.000/
--054515.220+1452657.432/
--054609.326+1453020.512/
--054737.678+1453331.078/
--054937.595+1453623.349/
--055205.439+1453852.094/
--055456.724+1454052.793/
--055806.249+1454221.776/
--060128.263+1454316.332/
--060456.628+1454334.794/
--060825.016+1454316.588/
--061147.094+1454222.257/
--061456.718+1454053.441/
--061748.124+1453852.830/
--062016.097+1453624.086/
--062216.136+1453331.726/
--062344.587+1453020.992/
--062438.758+1452657.688/
--062457.000+1452328.000/
--062438.758+1451958.312/
--062344.587+1451635.008/
--062216.136+1451324.274/
--062016.097+1451031.914/
--061748.124+1450803.170/
--061456.718+1450602.559/
--061147.094+1450433.743/
--060825.016+1450339.412/
--060456.628+1450321.206/
--060128.263+1450339.668/
--055806.249+1450434.224/
--055456.724+1450603.207/
--055205.439+1450803.906/
--054937.595+1451032.651/
--054737.678+1451324.922/
--054609.326+1451635.488/
--054515.220+1451958.568/
--054457.000+1452328.000</Line>
+    <Line Name="AYGA_GOROKA_ATZ_(F)" Pattern="Dashed">
+-055257.000+1451421.000/
+-060500.000+1453835.000/
+-060729.080+1453821.415/
+-061000.633+1453740.646/
+-061222.842+1453634.017/
+-061431.385+1453503.551/
+-061622.353+1453311.992/
+-061752.370+1453102.731/
+-061858.699+1452839.697/
+-061939.321+1452607.241/
+-061953.000+1452330.000/
+-061952.000+1452251.000/
+-055647.000+1451048.000/
+-055514.370+1451156.863/
+-055323.475+1451348.422/
+-055257.000+1451421.000</Line>
     <Line Name="AYMD_MADANG_CTZ" Pattern="Dashed">
 -045229.000+1454715.000/
 -045247.221+1455044.135/
@@ -697,44 +692,38 @@
 -045341.332+1454023.076/
 -045247.221+1454345.865/
 -045229.000+1454715.000</Line>
-    <Line Name="AYMH_MT_HAGEN_CTZ" Pattern="Dashed">
--052940.000+1441758.000/
--052958.220+1442127.340/
--053052.328+1442450.330/
--053220.682+1442800.812/
--053420.602+1443053.005/
--053648.448+1443321.681/
--053939.735+1443522.322/
--054249.263+1443651.261/
--054611.278+1443745.787/
--054939.644+1443804.234/
--055308.031+1443746.032/
--055630.107+1443651.721/
--055939.730+1443522.943/
--060231.133+1443322.386/
--060459.104+1443053.710/
--060659.140+1442801.433/
--060827.589+1442450.791/
--060921.758+1442127.585/
--060940.000+1441758.000/
--060921.758+1441428.415/
--060827.589+1441105.209/
--060659.140+1440754.567/
--060459.104+1440502.290/
--060231.133+1440233.614/
--055939.730+1440033.057/
--055630.107+1435904.279/
--055308.031+1435809.968/
--054939.644+1435751.766/
--054611.278+1435810.213/
--054249.263+1435904.739/
--053939.735+1440033.678/
--053648.448+1440234.319/
--053420.602+1440502.995/
--053220.682+1440755.188/
--053052.328+1441105.670/
--052958.220+1441428.660/
--052940.000+1441758.000</Line>
+    <Line Name="AYMH_MOUNT_HAGEN_ATZ_(F)" Pattern="Dashed">
+-054300.000+1443130.000/
+-055318.000+1442719.000/
+-055439.933+1442640.393/
+-055605.620+1442540.103/
+-055719.590+1442425.765/
+-055819.593+1442259.637/
+-055903.805+1442124.336/
+-055930.882+1441942.761/
+-055940.000+1441758.000/
+-055930.882+1441613.239/
+-055903.805+1441431.664/
+-055823.000+1441302.000/
+-055232.000+1440310.000/
+-055216.089+1440307.000/
+-054939.800+1440253.324/
+-054703.523+1440307.137/
+-054432.006+1440348.012/
+-054209.851+1440454.701/
+-054001.375+1440625.175/
+-053810.478+1440816.682/
+-053640.528+1441025.834/
+-053534.254+1441248.710/
+-053453.667+1441520.973/
+-053440.000+1441758.000/
+-053453.667+1442035.027/
+-053534.254+1442307.290/
+-053640.528+1442530.166/
+-053810.478+1442739.318/
+-054001.375+1442930.825/
+-054209.851+1443101.299/
+-054300.000+1443130.000</Line>
     <Line Name="AYTK_TOKUA_CTZ" Pattern="Dashed">
 -040027.000+1522245.000/
 -040045.223+1522613.889/

diff --git a/Maps/ALL_RTES_PTS.xml b/Maps/ALL_RTES_PTS.xml
@@ -208,7 +208,7 @@
       <Point>NOBAR</Point>
       <Point>MEPEM</Point>
       <Point>GUMKI</Point>
-      <Point>UNTER</Point>
+      <Point>MASRA</Point>
       <Point>UGTUG</Point>
       <Point>BONEY</Point>
       <Point>WODAY</Point>
@@ -220,7 +220,7 @@
       <Point>DREWS</Point>
       <Point>ZANEY</Point>
       <Point>ABTOX</Point>
-      <Point>SWALO</Point>
+      <Point>RUMKA</Point>
       <Point>SWIFT</Point>
       <Point>ATROP</Point>
       <Point>HARVS</Point>
@@ -465,7 +465,7 @@
       <Point>SCUBA</Point>
       <Point>TEPAM</Point>
       <Point>LAMEK</Point>
-      <Point>PESKY</Point>
+      <Point>MUBNI</Point>
       <Point>LATOL</Point>
       <Point>DUBOP</Point>
       <Point>ATOPO</Point>
@@ -814,7 +814,7 @@
       <Point>TUNGO</Point>
       <Point>HEWIT</Point>
       <Point>MIDAT</Point>
-      <Point>ERVON</Point>
+      <Point>REPUD</Point>
       <Point>LEGAN</Point>
       <Point>BOTGU</Point>
       <Point>GIVID</Point>
@@ -2006,7 +2006,7 @@
       <Point>NOBAR</Point>
       <Point>MEPEM</Point>
       <Point>GUMKI</Point>
-      <Point>UNTER</Point>
+      <Point>MASRA</Point>
       <Point>UGTUG</Point>
       <Point>BONEY</Point>
       <Point>WODAY</Point>
@@ -2018,7 +2018,7 @@
       <Point>DREWS</Point>
       <Point>ZANEY</Point>
       <Point>ABTOX</Point>
-      <Point>SWALO</Point>
+      <Point>RUMKA</Point>
       <Point>SWIFT</Point>
       <Point>ATROP</Point>
       <Point>HARVS</Point>
@@ -2261,7 +2261,7 @@
       <Point>SCUBA</Point>
       <Point>TEPAM</Point>
       <Point>LAMEK</Point>
-      <Point>PESKY</Point>
+      <Point>MUBNI</Point>
       <Point>LATOL</Point>
       <Point>DUBOP</Point>
       <Point>ATOPO</Point>
@@ -2606,7 +2606,7 @@
       <Point>TUNGO</Point>
       <Point>HEWIT</Point>
       <Point>MIDAT</Point>
-      <Point>ERVON</Point>
+      <Point>REPUD</Point>
       <Point>LEGAN</Point>
       <Point>BOTGU</Point>
       <Point>GIVID</Point>