Revision to Cycle 2212. Fix UPROG/AGROR mixing (#135)

* fix: Remove UPROG/AGROR procedure mixing. Bump to 2212b. * feat: Add dedicated POLAX/DOGBI fallback dep maps.
vatSys · Dec 3, 2022 · 121c50d · 121c50d
1 parent 890f3e5
commit 121c50d
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 76 deletions.
diff --git a/.github/changelogs/2022.md b/.github/changelogs/2022.md
@@ -261,4 +261,11 @@ This cycle is a major release for the Dataset, with the removal and replacement
 **Other Changes**
 
   - MOAs NZM301 and NZM304 boundaries amended.
-  - A tonne of new ATS routes, reviews and deletions.
+  - A tonne of new ATS routes, reviews and deletions.
+
+### Revision B
+
+#### Fixes
+
+  - Accidentally mixed the `UPROG 1Q` with the `AGROR 1Q`. This change separates these two procedures out.
+
diff --git a/Airspace.xml b/Airspace.xml
@@ -862,6 +862,7 @@
         <SID Name="IDVA1Q" />
         <SID Name="IDVA1U" />
         <SID Name="NZWN1C" />
+        <SID Name="UPRO1Q" />
         <STAR Name="ATSU6B" ApproachName="RNPZ" />
         <STAR Name="AVPO2B" ApproachName="RNPZ" />
         <STAR Name="AVPO2D" ApproachName="RNP-ARX" />
@@ -7427,10 +7428,6 @@ RILEY
       <Route Runway="16">URBEM/AGROR</Route>
       <Transition Name="AKTAN">AKTAN</Transition>
       <Transition Name="ATSUN">ATSUN</Transition>
-      <Transition Name="ATVIN">ADLAK/UPROG/ATVIN</Transition>
-      <Transition Name="KAMET">ADLAK/UPROG/MELAD/KAMET</Transition>
-      <Transition Name="KAPTI">ADLAK/UPROG/MELAD/KAPTI</Transition>
-      <Transition Name="PP">ADLAK/UPROG/MELAD/PP NDB</Transition>
       <Transition Name="VENAM">IDSIR/VENAM</Transition>
     </SID>
     <SID Name="ATVE1Q" Airport="NZWN" Runways="16">
@@ -7514,6 +7511,13 @@ RILEY
       <Transition Name="TANEN">OLSUS/HHOOT/ATRIM/DOVUL/TANEN</Transition>
       <Transition Name="VANDA">OLSUS/HHOOT/ATRIM/DOVUL/VANDA</Transition>
     </SID>
+    <SID Name="UPRO1Q" Airport="NZWN" Runways="16">
+      <Route Runway="16">URBEM/AGROR/ADLAK/UPROG</Route>
+      <Transition Name="ATVIN">ATVIN</Transition>
+      <Transition Name="KAMET">MELAD/KAMET</Transition>
+      <Transition Name="KAPTI">MELAD/KAPTI</Transition>
+      <Transition Name="PP">MELAD/PP NDB</Transition>
+    </SID>
     <SID Name="URGE1P" Airport="NZWN" Runways="34">
       <Route Runway="34">GANJI/URGEV</Route>
       <Transition Name="AKTAN">AKTAN</Transition>

diff --git a/Maps/Airspace/ALL_RNAV.xml b/Maps/Airspace/ALL_RNAV.xml
@@ -292,10 +292,13 @@
       <Point>AKINA</Point>
       <Point>MILLA</Point>
       <Point>OHITI</Point>
+      <Point>ELMAX</Point>
       <Point>KAPUA</Point>
       <Point>LIKMA</Point>
+      <Point>OTLIT</Point>
       <Point>MIBEV</Point>
       <Point>QUAIL</Point>
+      <Point>TUMGO</Point>
       <Point>ESNED</Point>
       <Point>KAGRU</Point>
       <Point>EGAMU</Point>
@@ -468,9 +471,6 @@
       <Point>SADUN</Point>
       <Point>VARMA</Point>
       <Point>UPDAL</Point>
-      <Point>ELMAX</Point>
-      <Point>OTLIT</Point>
-      <Point>TUMGO</Point>
       <Point>PAMOA</Point>
       <Point>ORBEL</Point>
       <Point>OLNAN</Point>
@@ -610,10 +610,13 @@
       <Point>AKINA</Point>
       <Point>MILLA</Point>
       <Point>OHITI</Point>
+      <Point>ELMAX</Point>
       <Point>KAPUA</Point>
       <Point>LIKMA</Point>
+      <Point>OTLIT</Point>
       <Point>MIBEV</Point>
       <Point>QUAIL</Point>
+      <Point>TUMGO</Point>
       <Point>ESNED</Point>
       <Point>KAGRU</Point>
       <Point>EGAMU</Point>
@@ -803,9 +806,6 @@
       <Point>SADUN</Point>
       <Point>VARMA</Point>
       <Point>UPDAL</Point>
-      <Point>ELMAX</Point>
-      <Point>OTLIT</Point>
-      <Point>TUMGO</Point>
       <Point>PAMOA</Point>
       <Point>ORBEL</Point>
       <Point>OLNAN</Point>

diff --git a/Maps/NZKT/KT_ACU.xml b/Maps/NZKT/KT_ACU.xml
@@ -140,22 +140,6 @@
       <!--Rwy30 PERAS1-->
       PERAS/PERIA
     </Line>
-    <Line Pattern="Solid">
-      <!--Rwy30 RNAV.KAROA-->
-      KAROA/PERIA
-    </Line>
-    <Line Pattern="Solid">
-      <!--Rwy30 RNAV.PERAS-->
-      PERAS/PERIA
-    </Line>
-    <Line Pattern="Solid">
-      <!--Rwy30 RNAV.RUATO-->
-      RUATO/PERIA
-    </Line>
-    <Line>
-      <!--Rwy30 RNAV-->
-      PERIA/-35.130614+173.490059
-    </Line>
     <Line>
       <!--Rwy30 RUATO1-->
       RUATO/PERIA

diff --git a/Maps/NZNS/NS_ACU.xml b/Maps/NZNS/NS_ACU.xml
@@ -169,10 +169,13 @@
     </Symbol>
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>ELMAX</Point>
       <Point>KAPUA</Point>
       <Point>LIKMA</Point>
+      <Point>OTLIT</Point>
       <Point>MIBEV</Point>
       <Point>QUAIL</Point>
+      <Point>TUMGO</Point>
       <Point>ESNED</Point>
     </Symbol>
     <!--FAF Symbols-->
@@ -182,11 +185,7 @@
       <Point>ISLOP</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>ELMAX</Point>
-      <Point>OTLIT</Point>
-      <Point>TUMGO</Point>
-    </Symbol>
+    <Symbol Type="SolidTriangle" />
     <Line Pattern="Solid">ELMAX/NOPEM/ORUBA/-411805.029+1731308.119</Line>
     <Line Pattern="Solid">KAPUA/ELMAX</Line>
     <Line Pattern="Solid">LIKMA/ELMAX</Line>
@@ -198,17 +197,17 @@
   </Map>
   <Map Type="System2" Name="02 RNP Labels" Priority="1" Center="-41.301397+173.218922" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>ELMAX</Point>
       <Point>KAPUA</Point>
       <Point>LIKMA</Point>
+      <Point>OTLIT</Point>
       <Point>MIBEV</Point>
       <Point>QUAIL</Point>
+      <Point>TUMGO</Point>
       <Point>ESNED</Point>
       <Point>NOPEM</Point>
       <Point>PATRU</Point>
       <Point>ISLOP</Point>
-      <Point>ELMAX</Point>
-      <Point>OTLIT</Point>
-      <Point>TUMGO</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="20 SIDs" Priority="1" CustomColourName="ProcDep" Center="-41.301397+173.218922">
@@ -377,6 +376,7 @@
     </Symbol>
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>ELMAX</Point>
       <Point>KAPUA</Point>
       <Point>LIKMA</Point>
     </Symbol>
@@ -385,19 +385,17 @@
       <Point>NOPEM</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>ELMAX</Point>
-    </Symbol>
+    <Symbol Type="SolidTriangle" />
     <Line Pattern="Solid">ELMAX/NOPEM/ORUBA/-411732.021+1731346.060</Line>
     <Line Pattern="Solid">KAPUA/ELMAX</Line>
     <Line Pattern="Solid">LIKMA/ELMAX</Line>
   </Map>
   <Map Type="System2" Name="20 RNP Labels" Priority="1" Center="-41.292228+173.229461" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>ELMAX</Point>
       <Point>KAPUA</Point>
       <Point>LIKMA</Point>
       <Point>NOPEM</Point>
-      <Point>ELMAX</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="06 RNP" Priority="1" Center="-41.296131+173.217011" CustomColourName="ProcArr">
@@ -407,6 +405,7 @@
     </Symbol>
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>ELMAX</Point>
       <Point>KAPUA</Point>
       <Point>LIKMA</Point>
     </Symbol>
@@ -415,19 +414,17 @@
       <Point>NOPEM</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>ELMAX</Point>
-    </Symbol>
+    <Symbol Type="SolidTriangle" />
     <Line Pattern="Solid">ELMAX/NOPEM/ORUBA/-411746.072+1731301.240</Line>
     <Line Pattern="Solid">KAPUA/ELMAX</Line>
     <Line Pattern="Solid">LIKMA/ELMAX</Line>
   </Map>
   <Map Type="System2" Name="06 RNP Labels" Priority="1" Center="-41.296131+173.217011" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>ELMAX</Point>
       <Point>KAPUA</Point>
       <Point>LIKMA</Point>
       <Point>NOPEM</Point>
-      <Point>ELMAX</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="24 RNP" Priority="1" Center="-41.295453+173.224183" CustomColourName="ProcArr">
@@ -437,6 +434,7 @@
     </Symbol>
     <!--IAF Symbols-->
     <Symbol Type="HollowTriangle">
+      <Point>ELMAX</Point>
       <Point>KAPUA</Point>
       <Point>LIKMA</Point>
     </Symbol>
@@ -445,19 +443,17 @@
       <Point>NOPEM</Point>
     </Symbol>
     <!--IF Symbols-->
-    <Symbol Type="SolidTriangle">
-      <Point>ELMAX</Point>
-    </Symbol>
+    <Symbol Type="SolidTriangle" />
     <Line Pattern="Solid">ELMAX/NOPEM/ORUBA/-411743.631+1731327.059</Line>
     <Line Pattern="Solid">KAPUA/ELMAX</Line>
     <Line Pattern="Solid">LIKMA/ELMAX</Line>
   </Map>
   <Map Type="System2" Name="24 RNP Labels" Priority="1" Center="-41.295453+173.224183" CustomColourName="ProcArr">
     <Label HasLeader="true">
+      <Point>ELMAX</Point>
       <Point>KAPUA</Point>
       <Point>LIKMA</Point>
       <Point>NOPEM</Point>
-      <Point>ELMAX</Point>
     </Label>
   </Map>
   <Map Type="System2" Name="VFRPoint" Priority="1" CustomColourName="VFRPoint" Center="-41.298333+173.221111">

diff --git a/Maps/NZWN/NZWN 16 CTDDOG 1Q map.xml b/Maps/NZWN/NZWN 16 CTDDOG 1Q map.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Maps>
+  <Map Type="System2" Name="16 - CTD DOGBI SID" Priority="1" CustomColourName="ProcDep" Center="-41.334939+174.806358">
+    <Line Pattern="Dashed">
+      <!--Rwy16 CTDOG1Q-->
+      -41.334939+174.806358/WN16T/TAXUP/TAPAB/RUSPI/MATVU/DOGBI/GULUT
+    </Line>
+    <Symbol Type="SolidStar">
+      <Point>TAXUP</Point>
+    </Symbol>
+    <Symbol Type="HollowTriangle">
+      <Point>WN16T</Point>
+      <Point>TAPAB</Point>
+      <Point>RUSPI</Point>
+      <Point>MATVU</Point>
+      <Point>DOGBI</Point>
+      <Point>GULUT</Point>
+    </Symbol>
+    <Label HasLeader="true">
+      <Point>GULUT</Point>
+    </Label>
+  </Map>
+</Maps>
diff --git a/Maps/NZWN/NZWN 34 CTDPOL 1P map.xml b/Maps/NZWN/NZWN 34 CTDPOL 1P map.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Maps>
+  <Map Type="System2" Name="34 - CTD POLAX SID" Priority="1" CustomColourName="ProcDep" Center="-41.318622+174.807458">
+    <Line Pattern="Dashed">
+      <!--Rwy34 CTDP1P-->
+      -41.318622+174.807458/WN34T/POLAX/OMLAS/ATRIM/DOVUL/GULUT
+    </Line>
+    <Symbol Type="SolidStar">
+      <Point>POLAX</Point>
+    </Symbol>
+    <Symbol Type="HollowTriangle">
+      <Point>WN34T</Point>
+      <Point>OMLAS</Point>
+      <Point>ATRIM</Point>
+      <Point>DOVUL</Point>
+      <Point>GULUT</Point>
+    </Symbol>
+    <Label HasLeader="true">
+      <Point>GULUT</Point>
+    </Label>
+  </Map>
+</Maps>