Skip to content

Commit

Permalink
Merge pull request #79 from vatSys/2313draft
Browse files Browse the repository at this point in the history
2313 | 28DEC23 Revision A
  • Loading branch information
Slep-wt authored Dec 27, 2023
2 parents ab933f8 + 2735ec2 commit 8f81a2e
Show file tree
Hide file tree
Showing 23 changed files with 16,747 additions and 65 deletions.
43 changes: 18 additions & 25 deletions ATIS.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,11 @@
<Translation String="YBOK" Spoken="Oakey" />
<Translation String="YBRK" Spoken="Rocky" />
<Translation String="YBRM" Spoken="Broome" />
<Translation String="YBSG" Spoken="Scherger" />
<Translation String="YBSU" Spoken="Sunshine Coast" />
<Translation String="YBTL" Spoken="Townsville" />
<Translation String="YCFS" Spoken="Coffs Harbour" />
<Translation String="YCIN" Spoken="Curtin" />
<Translation String="YGIG" Spoken="GinGin" />
<Translation String="YMAV" Spoken="Avalon" />
<Translation String="YMAY" Spoken="Albury" />
Expand All @@ -91,6 +93,7 @@
<Translation String="YPKA" Spoken="Karratha" />
<Translation String="YPPF" Spoken="Parafield" />
<Translation String="YPPH" Spoken="Perth" />
<Translation String="YPLM" Spoken="Learmonth" />
<Translation String="YPTN" Spoken="Tindal" />
<Translation String="YPWR" Spoken="Woomera" />
<Translation String="YSBK" Spoken="Bankstown" />
Expand All @@ -101,15 +104,11 @@
<Translation String="YSSY" Spoken="Sydney" />
<Translation String="YSTW" Spoken="Tamworth" />
<Translation String="YWLM" Spoken="Willy" />

<Translation String="YMMM" Spoken="Melbourne" />
<Translation String="YBBB" Spoken="Brisbane" />

<Translation String="YMMM" Spoken="Melbourne" />
<Translation String="YBBB" Spoken="Brisbane" />
<Translation String="ML" Spoken="Melbourne" />
<Translation String="BN" Spoken="Brisbane" />

<Translation String="BN" Spoken="Brisbane" />
<Translation String="ATIS" Spoken="terminal information" />

<Translation String="A" Spoken="alpha" />
<Translation String="B" Spoken="bravo" />
<Translation String="C" Spoken="charlie" />
Expand Down Expand Up @@ -167,8 +166,8 @@
<Translation String="THRU" Spoken="through" />
<Translation String="CEN" Spoken="centre" />
<Translation String="GND" Spoken="ground" />
<Translation String="CL" Spoken="centre line" />
<Translation String="PARL" Spoken="parallel" />
<Translation String="CL" Spoken="centre line" />
<Translation String="PARL" Spoken="parallel" />
<Translation String="ABV" Spoken="above" />
<Translation String="BLW" Spoken="below" />
<Translation String="BTN" Spoken="between" />
Expand Down Expand Up @@ -212,11 +211,11 @@
<Translation String="RWY" Spoken="runway" />
<Translation String="RWYS" Spoken="runways" />

<!--Changes xxx.xxx to xxx decimal xxx for frequencies -->
<Translation Regex="(\d{3})\.(\d{1,3})" Spoken="$1 decimal $2" />
<!--Changes xxx.xxx to xxx decimal xxx for frequencies -->
<Translation Regex="(\d{3})\.(\d{1,3})" Spoken="$1 decimal $2" />

<!--Changes L to Left when it is associated with a two digit runway identifier-->
<Translation Regex="([012]\d|[3][0123456])L AND R" Spoken="$1 left and right" />
<Translation Regex="([012]\d|[3][0123456])L AND R" Spoken="$1 left and right" />
<Translation Regex="([012]\d|[3][0123456])L AND C" Spoken="$1 left and centre" />
<Translation Regex="([012]\d|[3][0123456])C AND R" Spoken="$1 centre and right" />
<Translation Regex="([012]\d|[3][0123456])L" Spoken="$1 left" />
Expand All @@ -226,9 +225,9 @@
<Translation String="WIND" Spoken="wind:" />
<!--This regex will change xxx/yyy to xxx degrees, yyy knots-->
<Translation Regex="(\d{3})\/(\d{1,3})" Spoken="$1 degrees, $2 knots" />
<Translation Regex="(\d{3})\/(\d{1,3})-(\d{1,3})" Spoken="$1 degrees, minimum $2 knots, maximum $3 knots" />
<Translation Regex="(\d{3})-(\d{3})\/(\d{1,3})" Spoken="varying $1 degrees to $2 degrees, $3 knots" />
<Translation Regex="(\d{3})-(\d{3})\/(\d{1,3})-(\d{1,3})" Spoken="varying $1 degrees to $2 degrees, minimum $3 knots, maximum $4 knots" />
<Translation Regex="(\d{3})\/(\d{1,3})-(\d{1,3})" Spoken="$1 degrees, minimum $2 knots, maximum $3 knots" />
<Translation Regex="(\d{3})-(\d{3})\/(\d{1,3})" Spoken="varying $1 degrees to $2 degrees, $3 knots" />
<Translation Regex="(\d{3})-(\d{3})\/(\d{1,3})-(\d{1,3})" Spoken="varying $1 degrees to $2 degrees, minimum $3 knots, maximum $4 knots" />
<Translation String="MAX" Spoken="maximum" />
<Translation String="MIN" Spoken="minimum" />
<Translation String="XW" Spoken="crosswind" />
Expand All @@ -237,26 +236,24 @@
<Translation Regex="(\d{1,3})KTS" Spoken="$1 knots" />
<Translation String="KTS" Spoken="knots" />
<Translation String="VRB" Spoken="variable" />

<Translation String="CLD" Spoken="cloud" />

<!--Changes cloud to abbreviation and altitude * 100 without leading zeros-->
<Translation Regex="(FEW|SCT|BKN|OVC)[0]{0,2}(\d+)" Spoken="$1 ${2}00 feet" />
<Translation String="FT" Spoken="feet" />
<Translation String="FEW" Spoken="few" />
<Translation String="SCT" Spoken="scattered" />
<Translation String="BKN" Spoken="broken" />
<Translation String="OVC" Spoken="overcast" />

<Translation String="VIS" Spoken="visibility" />
<Translation String="RED" Spoken="reduced" />
<Translation Regex="[0]{0,3}(\d+)M" Spoken="$1 meters" />
<Translation String="10KM" Spoken="1 0 kilometres" />
<Translation String="10KM" Spoken="1 0 kilometres" />
<Translation Regex="[0]{0,1}(\d+)KM" Spoken="$1 kilometres" />
<Translation String="RVR" Spoken="runway visual range" />
<Translation String="GT" Spoken="greater than" />

<Translation String="CAVOK" Spoken="ˈkævˈoʊˈkeɪ" Alphabet="IPA" FallbackSpoken="kuv-okay"/>
<Translation String="NSC" Spoken="nil significant cloud" />
<Translation String="CAVOK" Spoken="ˈkævˈoʊˈkeɪ" Alphabet="IPA" FallbackSpoken="kuv-okay"/>
<Translation String="NSC" Spoken="nil significant cloud" />
<Translation Regex="\+([A-Z]+)" Spoken="heavy $1" />
<Translation Regex="\-([A-Z]+)" Spoken="light $1" />
<Translation String="MI" Spoken="shallow" />
Expand Down Expand Up @@ -294,13 +291,9 @@
<Translation String="TSRA" Spoken="thunderstorms and rain" />
<Translation String="TSRAGS" Spoken="thunderstorms and rain with hail" />
<Translation String="TCU" Spoken="towering cumulus" />

<Translation String="TMP" Spoken="temperature" />

<Translation String="QNH" Spoken="Q-N-H" />

<Translation String="SIGMET" Spoken="sɪɢɱɛt" Alphabet="IPA" FallbackSpoken="sygmet" />

</Translations>
<Editor>
<Input name="APCH" NameIsSpoken="false" InputType="Edit" />
Expand Down
8 changes: 4 additions & 4 deletions Airspace.xml
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@
</Airport>
<Airport Name="YBCS">
<Runway Name="15" DataRunway="15">
<SID Name="AKROM1" Type="Jet" />
<SID Name="CS2" Default="True" />
<SID Name="AKROM1" Default="True" Type="Jet" />
<SID Name="CS2"/>
<SID Name="NONUM1" Type="NonJet" />
<STAR Name="CODI8A" ApproachName="LOC" />
<STAR Name="CODI8X" OpDataFlag="X" ApproachName="RNP-ARX" />
Expand All @@ -203,8 +203,8 @@
<STAR Name="UPOL8Z" OpDataFlag="Z" ApproachName="RNPZ" />
</Runway>
<Runway Name="33" DataRunway="33">
<SID Name="CS2" Default="True" />
<SID Name="EAZEE3" Type="Jet" />
<SID Name="CS2"/>
<SID Name="EAZEE3" Default="True" Type="Jet" />
<STAR Name="HEND9A" ApproachName="LOC" />
<STAR Name="HEND9Y" OpDataFlag="Y" ApproachName="RNP-ARY" />
<STAR Name="KEWI3A" ApproachName="LOC" />
Expand Down
6 changes: 3 additions & 3 deletions DefaultJurisdiction.xml
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@
</Departure>
</Rules>
</RuleSet>
<!--<RuleSet Name="YPLM_DEPS">
<RuleSet Name="YPLM_DEPS">
<Rules>
<Departure Values="YPLM">
<Rules>
Expand Down Expand Up @@ -554,14 +554,14 @@
</RuleSet>
<RuleSet Name="YPWR_DEPS">
<Rules>
<Departure Values="YBSG">
<Departure Values="YPWR">
<Rules>
<Default>
<AssignSector Order="WR ADC,WRA"/>
</Default>
</Rules>
</Departure>
</Rules>
</RuleSet>-->
</RuleSet>
</RuleSets>
</DefaultJurisdiction>
95 changes: 95 additions & 0 deletions Maps/ALL_CTA.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8958,6 +8958,32 @@
-171042.737+1234634.368/
-171020.000+1235107.000
</Line>
<Line Name="CURTIN_APPROACH_PARTIAL" Pattern="Dashed">
-172710.000+1234151.000/
-173039.000+1241649.000/
-173057.854+1241656.037/
-173518.271+1241720.563/
-173938.793+1241657.278/
-174351.498+1241546.835/
-174748.697+1241351.324/
-175123.160+1241114.217/
-175428.347+1240800.267/
-175658.602+1240415.367/
-175849.335+1240006.368/
-175957.159+1235540.873/
-180020.000+1235107.000/
-175957.159+1234633.127/
-175849.335+1234207.632/
-175658.602+1233758.633/
-175428.347+1233413.733/
-175123.160+1233059.783/
-174748.697+1232822.676/
-174351.498+1232627.165/
-173938.793+1232516.722/
-173518.271+1232453.437/
-173120.000+1232517.000/
-172710.000+1234151.000
</Line>
<Line Name="LEARMONTH_APPROACH" Pattern="Dashed">
-213405.000+1140538.000/
-213441.292+1141306.155/
Expand Down Expand Up @@ -8997,6 +9023,75 @@
-213441.292+1135809.845/
-213405.000+1140538.000
</Line>
<Line Name="LEARMONTH_APPROACH_INNER" Pattern="Dashed">
-214905.000+1140538.000/
-214927.722+1141018.580/
-215035.202+1141450.707/
-215225.409+1141906.178/
-215455.018+1142257.279/
-215759.518+1142617.013/
-220133.335+1142859.312/
-220530.007+1143059.222/
-220942.369+1143213.052/
-221402.770+1143238.493/
-221823.307+1143214.699/
-222236.055+1143102.319/
-222633.320+1142903.485/
-223007.865+1142621.757/
-223313.139+1142302.023/
-223543.476+1141910.351/
-223734.276+1141453.804/
-223842.144+1141020.228/
-223905.000+1140538.000/
-223842.144+1140055.772/
-223734.276+1135622.196/
-223543.476+1135205.649/
-223313.139+1134813.977/
-223007.865+1134454.243/
-222633.320+1134212.515/
-222236.055+1134013.681/
-221823.307+1133901.301/
-221402.770+1133837.507/
-220942.369+1133902.948/
-220530.007+1134016.778/
-220133.335+1134216.688/
-215759.518+1134458.987/
-215455.018+1134818.721/
-215225.409+1135209.822/
-215035.202+1135625.293/
-214927.722+1140057.420/
-214905.000+1140538.000
</Line>
<Line Name="WOOMERA_R222F" Pattern="Dashed">
-310844.000+1363722.000/
-305120.000+1363717.000/
-305119.245+1363722.081/
-304951.124+1364103.033/
-304857.168+1364458.368/
-304839.000+1364901.000/
-304857.168+1365303.632/
-304951.124+1365658.967/
-305115.000+1370035.000/
-310950.000+1370035.000/
-311022.677+1370031.602/
-311203.746+1370000.160/
-311338.604+1365908.654/
-311504.362+1365758.637/
-311618.408+1365632.229/
-311718.483+1365452.056/
-311802.754+1365301.168/
-311829.869+1365102.946/
-311839.000+1364901.000/
-311829.869+1364659.054/
-311802.754+1364500.832/
-311718.483+1364309.944/
-311618.408+1364129.771/
-311504.362+1364003.363/
-311338.604+1363853.346/
-311203.746+1363801.840/
-311022.677+1363730.398/
-310844.000+1363722.000
</Line>
<Line Name="SCHERGER_APPROACH" Pattern="Dashed">
-115726.000+1420514.000/
-115802.369+1421220.005/
Expand Down
5 changes: 0 additions & 5 deletions Maps/ALL_RTES_PTS.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,9 @@
<Line Name="H39_0">NEWMO.H39.VELGI</Line>
<Line Name="H44_0">KADOM.H44.AD VOR</Line>
<Line Name="H50_0">ML VOR.H50.MNG VOR</Line>
<Line Name="H530_0">TESAT.H530.SURVO</Line>
<Line Name="H536_0">WLM NDB.H536.NWA TAC</Line>
<Line Name="H54_0">HAWKY.H54.KAMBI</Line>
<Line Name="H630_0">ATLIB.H630.NIMEK</Line>
<Line Name="H65_0">TESAT.H65.CB VOR</Line>
<Line Name="H652_0">MK VOR.H652.TESAT</Line>
<Line Name="H66_0">ML VOR.H66.LAGOB</Line>
<Line Name="H76_0">RIC NDB.H76.UPVEN</Line>
<Line Name="H84_0">WHA NDB.H84.AD VOR</Line>
Expand Down Expand Up @@ -152,9 +149,7 @@
<Line Name="Q293_0">LASUD.Q293.AKUMI</Line>
<Line Name="Q295_0">ITIDE.Q295.SOSTU</Line>
<Line Name="Q30_0">TL VOR.Q30.MATAR</Line>
<Line Name="Q302_0">GEMAC.Q302.LIZZI</Line>
<Line Name="Q303_0">BIVAT.Q303.YCCA</Line>
<Line Name="Q31_0">KAPGA.Q31.AVPAL</Line>
<Line Name="Q32_0">BORLI.Q32.NODEV</Line>
<Line Name="Q327_0">LM VOR.Q327.SOPAT</Line>
<Line Name="Q33_0">AD VOR.Q33.ESP VOR</Line>
Expand Down
13 changes: 0 additions & 13 deletions Maps/Cairns/CS_RWY33.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@
<Threshold Name="33" Position="-16.891969+145.755392" ExtendedCentrelineTrack="156.48" ExtendedCentrelineLength="25" ExtendedCentrelineTickInterval="2" />
</Runway>
<!--SIDs-->
<Line>
<!--Rwy33 EAZEE3-->
-165156.940+1454436.850/
CANNU/
BUNPO/
EAZEE
</Line>
<!--STARs-->
<Line>
<!--Rwy33 HEND9A.ANDOP-->
Expand Down Expand Up @@ -189,9 +182,6 @@
<Point>LEBAD</Point>
</Symbol>
<Symbol Type="HollowStar">
<Point>CANNU</Point>
<Point>BUNPO</Point>
<Point>EAZEE</Point>
<Point>ANDOP</Point>
<Point>NONUM</Point>
<Point>TOTTY</Point>
Expand Down Expand Up @@ -224,9 +214,6 @@
</Map>
<Map Type="System" Name="CS_RWY33_NAMES" Priority="2" Center="-16.885833+145.755278">
<Label>
<Point>CANNU</Point>
<Point>BUNPO</Point>
<Point>EAZEE</Point>
<Point>ANDOP</Point>
<Point>NONUM</Point>
<Point>TOTTY</Point>
Expand Down
Loading

0 comments on commit 8f81a2e

Please sign in to comment.