From a9aa26d5e327dc8413655b30d04b23b1d51ebda2 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Thu, 5 Sep 2024 13:19:42 +1200 Subject: [PATCH 1/4] feat: Amend to include mapping data changes --- .github/ISSUE_TEMPLATE/-tracking-issue--nzzc-cycle-.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/-tracking-issue--nzzc-cycle-.md b/.github/ISSUE_TEMPLATE/-tracking-issue--nzzc-cycle-.md index 6fc07ac..2f7ed12 100644 --- a/.github/ISSUE_TEMPLATE/-tracking-issue--nzzc-cycle-.md +++ b/.github/ISSUE_TEMPLATE/-tracking-issue--nzzc-cycle-.md @@ -18,6 +18,11 @@ assignees: '' - [ ] Duplicate procedure changes in SFG, as per the relevant project ticket. - [ ] Implement any other changes required as a part of the AIP cycle. - [ ] Implement any backlog features. + +### Mapping Data Changes +- [ ] Make necessary changes to the Standard Routes, as defined in [the SRC repository](https://github.com/vatnz-dev/vatSys-SRC-Reader/blob/dev/Routes/Routes.xml) +- [ ] Using the Standard Route mapper, generate the vatSys Map Layers and copy to the dataset repository. +- [ ] Using the Standard Route mapper, generate the public `stdRoutes.json` file for external use and commit to the [std-rte-public repository](https://github.com/vatnz-dev/std-rte-public). Notify Navigraph that the export has been made. ### Testing - [ ] Test vatSys and EuroScope using the sweatbox environment. @@ -26,5 +31,4 @@ assignees: '' ### Release - [ ] Merge content into Master Release Repo - [ ] Publish Client Data Release. -- [ ] If necessary, publish Standard Route Changes. - [ ] If necessary, publish SOP changes. From 9d727b172e4a3af48bae1b0fc297bcf2a4544ff2 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Thu, 12 Sep 2024 20:36:51 +1200 Subject: [PATCH 2/4] Cycle 2410 ANR Updates --- Airspace.xml | 8 +- Maps/Navaids/Holding.xml | 308 +++++++++++++++++++-------------------- 2 files changed, 156 insertions(+), 160 deletions(-) diff --git a/Airspace.xml b/Airspace.xml index 6e8835d..052bd01 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -3495,7 +3495,6 @@ RILEY -425226.910+1705102.840 -391447.120+1742026.530 -211209.310-1593701.220 - -435646.070+1711036.650 -465258.130+1680901.260 -432932.800+1724113.900 -211123.820-1751413.500 @@ -4250,7 +4249,6 @@ RILEY -393150.210+1662602.450 -212624.440-1601612.610 -442424.670+1712457.500 - -440047.170+1711228.900 -460256.290+1701808.540 -394923.850+1753346.640 -385957.610+1740345.360 @@ -4717,7 +4715,6 @@ RILEY -395321.670+1753429.850 -375132.560+1760201.710 -390727.120+1713838.240 - -434555.220+1710534.940 -455728.330+1682811.830 -451647.210+1684135.280 -405703.701+1754614.588 @@ -4795,7 +4792,7 @@ RILEY -141640.660-1703648.460 -434301.320+1722942.000 -411311.310+1740223.630 - -190428.980-1695454.950 + -190428.981-1695454.950 -243251.440-1700000.000 -394112.720+1742640.840 -410913.030+1740421.010 @@ -4962,6 +4959,7 @@ RILEY -404609.340+1751644.730 -363851.230+1745109.250 -460204.510+1695245.360 + -380855.250+1761425.960 -412652.230+1725710.910 -354912.150+1740616.600 -100000.000-1591805.990 @@ -5505,7 +5503,6 @@ RILEY -411109.160+1743244.010 -412322.460+1721158.440 -402500.370+1725102.380 - -440820.800+1705910.190 -394132.040+1764745.860 -413618.680+1743210.880 -361743.930+1741419.580 @@ -5548,7 +5545,6 @@ RILEY -393130.950+1765650.840 -393530.950+1742145.040 -385012.400+1772834.280 - -441830.780+1705849.150 -383434.290+1780201.650 -372107.510+1745753.420 -382048.330+1750407.090 diff --git a/Maps/Navaids/Holding.xml b/Maps/Navaids/Holding.xml index 89f9753..c0923ba 100644 --- a/Maps/Navaids/Holding.xml +++ b/Maps/Navaids/Holding.xml @@ -2343,81 +2343,81 @@ -383652.470+1743450.850 -375057.350+1752018.770/ --375044.849+1752017.127/ --375032.353+1752016.997/ --375019.896+1752018.247/ --375007.572+1752020.867/ --374955.476+1752024.837/ --374943.699+1752030.125/ --374932.331+1752036.693/ --374921.457+1752044.490/ --374911.162+1752053.455/ --374901.523+1752103.522/ --374852.614+1752114.614/ --374844.502+1752126.645/ --374837.248+1752139.525/ --374830.909+1752153.155/ --374825.532+1752207.432/ --374821.158+1752222.248/ --374817.820+1752237.489/ --374815.544+1752253.040/ --374814.347+1752308.783/ --374814.238+1752324.598/ --374815.218+1752340.365/ --374817.280+1752355.964/ --374820.407+1752411.276/ --374824.576+1752426.186/ --374829.755+1752440.580/ --374835.906+1752454.348/ --374842.980+1752507.386/ --374850.926+1752519.594/ --374859.681+1752530.881/ --374909.180+1752541.159/ --374919.350+1752550.351/ --374930.114+1752558.386/ --374941.390+1752605.204/ --374953.092+1752610.752/ --375005.132+1752614.988/ --375017.418+1752617.880/ --375017.355+1752617.745/ --375742.668+1752737.126/ --375755.016+1752738.762/ --375807.512+1752738.908/ --375819.970+1752737.673/ --375832.295+1752735.065/ --375844.395+1752731.104/ --375856.176+1752725.820/ --375907.550+1752719.252/ --375918.429+1752711.451/ --375928.730+1752702.477/ --375938.376+1752652.396/ --375947.292+1752641.286/ --375955.411+1752629.232/ --380002.670+1752616.325/ --380009.016+1752602.663/ --380014.398+1752548.351/ --380018.776+1752533.498/ --380022.118+1752518.217/ --380024.396+1752502.623/ --380025.594+1752446.837/ --380025.703+1752430.979/ --380024.722+1752415.168/ --380022.659+1752359.527/ --380019.529+1752344.174/ --380015.355+1752329.226/ --380010.171+1752314.796/ --380004.014+1752300.996/ --375956.933+1752247.930/ --375948.982+1752235.698/ --375940.220+1752224.392/ --375930.714+1752214.099/ --375920.538+1752204.898/ --375909.768+1752156.857/ --375858.487+1752150.039/ --375846.780+1752144.494/ --375834.736+1752140.266/ --375822.448+1752137.385/ --375822.359+1752137.493/ +-375044.873+1752016.851/ +-375032.381+1752016.445/ +-375019.909+1752017.420/ +-375007.551+1752019.767/ +-374955.402+1752023.468/ +-374943.554+1752028.496/ +-374932.097+1752034.812/ +-374921.118+1752042.367/ +-374910.701+1752051.104/ +-374900.924+1752100.957/ +-374851.863+1752111.849/ +-374843.587+1752123.700/ +-374836.157+1752136.417/ +-374829.631+1752149.906/ +-374824.058+1752204.062/ +-374819.480+1752218.778/ +-374815.933+1752233.943/ +-374813.443+1752249.442/ +-374812.029+1752305.156/ +-374811.702+1752320.966/ +-374812.465+1752336.752/ +-374814.311+1752352.394/ +-374817.226+1752407.773/ +-374821.189+1752422.772/ +-374826.170+1752437.278/ +-374832.129+1752451.179/ +-374839.023+1752504.371/ +-374846.799+1752516.753/ +-374855.397+1752528.231/ +-374904.753+1752538.717/ +-374914.795+1752548.132/ +-374925.446+1752556.404/ +-374936.627+1752603.470/ +-374948.251+1752609.275/ +-375000.231+1752613.777/ +-375012.475+1752616.939/ +-375012.415+1752616.803/ +-375736.565+1752746.028/ +-375748.889+1752747.936/ +-375801.380+1752748.360/ +-375813.854+1752747.401/ +-375826.213+1752745.066/ +-375838.366+1752741.373/ +-375850.218+1752736.351/ +-375901.680+1752730.036/ +-375912.665+1752722.478/ +-375923.088+1752713.733/ +-375932.871+1752703.868/ +-375941.938+1752652.957/ +-375950.222+1752641.085/ +-375957.658+1752628.341/ +-380004.190+1752614.822/ +-380009.769+1752600.632/ +-380014.351+1752545.878/ +-380017.902+1752530.673/ +-380020.394+1752515.133/ +-380021.810+1752459.376/ +-380022.137+1752443.523/ +-380021.374+1752427.693/ +-380019.526+1752412.009/ +-380016.607+1752356.589/ +-380012.640+1752341.551/ +-380007.655+1752327.009/ +-380001.689+1752313.075/ +-375954.789+1752259.854/ +-375947.007+1752247.447/ +-375938.402+1752235.949/ +-375929.039+1752225.448/ +-375918.991+1752216.022/ +-375908.334+1752207.744/ +-375857.148+1752200.677/ +-375845.519+1752154.874/ +-375833.536+1752150.379/ +-375821.289+1752147.227/ +-375821.198+1752147.333/ -375057.350+1752018.770 -461622.140+1700849.000/ @@ -3981,81 +3981,81 @@ -392925.390+1743006.730 -384935.840+1744823.860/ --384923.268+1744823.839/ --384910.830+1744822.293/ --384858.545+1744819.361/ --384846.505+1744815.067/ --384834.802+1744809.443/ --384823.526+1744802.532/ --384812.763+1744754.387/ --384802.593+1744745.070/ --384753.094+1744734.651/ --384744.339+1744723.211/ --384736.394+1744710.836/ --384729.319+1744657.620/ --384723.169+1744643.664/ --384717.990+1744629.075/ --384713.820+1744613.962/ --384710.693+1744558.441/ --384708.632+1744542.629/ --384707.652+1744526.648/ --384707.761+1744510.617/ --384708.958+1744454.660/ --384711.234+1744438.897/ --384714.572+1744423.449/ --384718.946+1744408.431/ --384724.323+1744353.960/ --384730.662+1744340.143/ --384737.915+1744327.088/ --384746.027+1744314.893/ --384754.936+1744303.650/ --384804.575+1744253.446/ --384814.870+1744244.358/ --384825.743+1744236.455/ --384837.112+1744229.797/ --384848.889+1744224.436/ --384900.985+1744220.412/ --384913.309+1744217.756/ --384925.766+1744216.489/ --384925.689+1744216.617/ --385655.111+1744156.437/ --385707.523+1744156.447/ --385719.962+1744157.978/ --385732.250+1744200.898/ --385744.293+1744205.184/ --385756.000+1744210.805/ --385807.282+1744217.717/ --385818.052+1744225.867/ --385828.228+1744235.195/ --385837.734+1744245.629/ --385846.496+1744257.090/ --385854.448+1744309.490/ --385901.529+1744322.735/ --385907.685+1744336.725/ --385912.870+1744351.352/ --385917.043+1744406.506/ --385920.174+1744422.070/ --385922.237+1744437.926/ --385923.218+1744453.953/ --385923.109+1744510.030/ --385921.911+1744526.033/ --385919.632+1744541.840/ --385916.291+1744557.331/ --385911.913+1744612.389/ --385906.530+1744626.897/ --385900.185+1744640.746/ --385852.925+1744653.830/ --385844.806+1744706.050/ --385835.890+1744717.312/ --385826.244+1744727.531/ --385815.943+1744736.629/ --385805.064+1744744.536/ --385753.690+1744751.194/ --385741.909+1744756.550/ --385729.809+1744800.566/ --385717.483+1744803.209/ --385705.025+1744804.461/ --385704.942+1744804.340/ +-384923.270+1744823.557/ +-384910.855+1744821.733/ +-384858.611+1744818.527/ +-384846.632+1744813.963/ +-384835.008+1744808.078/ +-384823.827+1744800.916/ +-384813.176+1744752.531/ +-384803.134+1744742.987/ +-384753.779+1744732.358/ +-384745.180+1744720.723/ +-384737.405+1744708.172/ +-384730.511+1744654.800/ +-384724.551+1744640.709/ +-384719.571+1744626.005/ +-384715.608+1744610.801/ +-384712.693+1744555.212/ +-384710.847+1744539.357/ +-384710.084+1744523.356/ +-384710.411+1744507.330/ +-384711.825+1744451.402/ +-384714.315+1744435.693/ +-384717.862+1744420.321/ +-384722.439+1744405.403/ +-384728.012+1744351.054/ +-384734.538+1744337.382/ +-384741.968+1744324.490/ +-384750.245+1744312.478/ +-384759.306+1744301.436/ +-384809.082+1744251.449/ +-384819.499+1744242.593/ +-384830.477+1744234.934/ +-384841.935+1744228.532/ +-384853.783+1744223.436/ +-384905.932+1744219.683/ +-384918.290+1744217.304/ +-384930.762+1744216.316/ +-384930.684+1744216.442/ +-385700.311+1744206.350/ +-385712.721+1744206.639/ +-385725.138+1744208.449/ +-385737.384+1744211.644/ +-385749.368+1744216.200/ +-385800.996+1744222.083/ +-385812.182+1744229.247/ +-385822.840+1744237.638/ +-385832.889+1744247.194/ +-385842.251+1744257.840/ +-385850.856+1744309.496/ +-385858.639+1744322.073/ +-385905.539+1744335.475/ +-385911.504+1744349.601/ +-385916.490+1744404.343/ +-385920.457+1744419.588/ +-385923.376+1744435.220/ +-385925.224+1744451.121/ +-385925.987+1744507.168/ +-385925.660+1744523.240/ +-385924.244+1744539.213/ +-385921.752+1744554.967/ +-385918.201+1744610.381/ +-385913.618+1744625.338/ +-385908.040+1744639.723/ +-385901.508+1744653.428/ +-385854.071+1744706.347/ +-385845.788+1744718.383/ +-385836.720+1744729.443/ +-385826.937+1744739.443/ +-385816.514+1744748.309/ +-385805.529+1744755.971/ +-385754.067+1744802.372/ +-385742.214+1744807.463/ +-385730.062+1744811.206/ +-385717.702+1744813.572/ +-385705.229+1744814.544/ +-385705.147+1744814.422/ -384935.840+1744823.860 -451020.630+1710740.360/ @@ -5436,8 +5436,8 @@ -390956.171+1772206.544 -383228.152+1743535.346 -383428.152+1743435.338 - -375420.049+1752357.931 - -375620.049+1752258.552 + -375416.997+1752402.380 + -375616.997+1752303.000 -461501.823+1701456.717 -461701.823+1701348.885 -392135.613+1744456.678 @@ -5478,8 +5478,8 @@ -460120.557+1702955.778 -393144.680+1743501.192 -393344.680+1743400.435 - -385315.515+1744510.153 - -385515.515+1744409.967 + -385318.116+1744515.107 + -385518.116+1744414.921 -451330.750+1710315.406 -451530.750+1710208.896 -375611.533+1745108.911 From ad552aba2fbf8a83bdbc6f7e3b2d0c887438ad86 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Thu, 12 Sep 2024 20:53:27 +1200 Subject: [PATCH 3/4] Cycle 2410 Standard Route Maps --- Maps/NZCH/NZCH Standard Routes.xml | 4 ++-- Profile.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Maps/NZCH/NZCH Standard Routes.xml b/Maps/NZCH/NZCH Standard Routes.xml index 9fd74f6..3b44059 100644 --- a/Maps/NZCH/NZCH Standard Routes.xml +++ b/Maps/NZCH/NZCH Standard Routes.xml @@ -8,7 +8,7 @@ AVOCA/BELEE/OSOLO/LOCIY/APASA GLENN/GULOV/IGUTA/AKAVI/OMKUN/OPABI/LIKTU/UPTIK/DABKA/HN VOR PORAM/RIVTA/GULOV/IGUTA/AKAVI/OMKUN/OPABI/LIKTU/UPTIK/DABKA/HN VOR - AVOCA/BELEE/OSOLO/LOCIY/APASA/HK NDB + AVOCA/BELEE/OSOLO/LOCIY/APASA IDARA/DUKOP/NV VOR GUPUT/SUNAR/MAMUS GRETA/LUXEV/KAKUR/WARDS/OMDOX/KAMET/BINIT/PM VOR/SELDU/BITIL/NR VOR @@ -50,7 +50,7 @@ PORAM LALAP IDARA - AVOCA + AVOCA GUPUT GRETA ODOWD diff --git a/Profile.xml b/Profile.xml index d32edaa..d8d77ff 100644 --- a/Profile.xml +++ b/Profile.xml @@ -1,6 +1,6 @@ - + From 60d9815942997c6e131a053a3128f16cc7484bca Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Thu, 19 Sep 2024 17:56:34 +1200 Subject: [PATCH 4/4] Cycle 2410 AIP Changes --- Airspace.xml | 29 ++++++++++++++++++++++------- Maps/Airspace/ALL_RNAV.xml | 13 ++++++++++--- Maps/NZRO/RO_ACU.xml | 13 ++++++++++--- Maps/NZTU/TU_ACU.xml | 19 +++++++++++++++---- 4 files changed, 57 insertions(+), 17 deletions(-) diff --git a/Airspace.xml b/Airspace.xml index 052bd01..e072976 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -807,17 +807,19 @@ + - + - + - + + @@ -5209,7 +5211,14 @@ RILEY -380829.310+1763349.709 -380835.851+1761742.151 -380922.010+1761650.830 + -381139.590+1761010.940 + -380854.150+1761612.050 -380730.684+1761738.220 + -380816.660+1761749.970 + -380922.010+1761650.830 + -380954.850+1761214.510 + -380835.850+1761742.150 + -380656.110+1761842.010 -462922.150+1680617.630 -345227.080+1732857.360 -413009.690+1745421.910 @@ -7718,6 +7727,9 @@ RILEY ATSOK/DOPOP/OLGAL ATSOK/OMARU + + SUNPA/ELDAK + MUKEN DUBON @@ -9041,7 +9053,7 @@ RILEY URBUX/APUNO/KIMAR/RUSTA/UBSET - + DOPOP/BIDNI @@ -9050,12 +9062,15 @@ RILEY DUBON/MOVBO/ANGAX/IDKOV/LUVAB - + ELDAK/BIDNI/DOPOP - + ELDAK/BIDNI + + ELDAK/SUNPA + MAMUS/TU411/DOPOP @@ -9570,7 +9585,7 @@ RILEY OKERE/BONLI/TUSGA/-380601.598+1761913.238 - TOTRA/ADKAG/SEKBU/RO366/RO364/-380655.750+1761841.170 + TOTRA/ADKAG/SEKBU/RO636/RO767/-380655.750+1761841.170 MORTA diff --git a/Maps/Airspace/ALL_RNAV.xml b/Maps/Airspace/ALL_RNAV.xml index c6ba237..568f627 100644 --- a/Maps/Airspace/ALL_RNAV.xml +++ b/Maps/Airspace/ALL_RNAV.xml @@ -45,6 +45,7 @@ LARAV TUSGA SEKBU + OTKOS ATRAB SULAB AA427 @@ -123,8 +124,12 @@ QN774 BONLI ADKAG - RO366 - RO364 + RO636 + RO767 + RO401 + RO764 + RO521 + RO634 WN509 WN513 WN508 @@ -181,6 +186,7 @@ LARAV TUSGA SEKBU + OTKOS ATRAB SULAB @@ -213,7 +219,8 @@ ATKIL/QN780/TOGOX/QN770/ATVUP UGPED/OSOPU/QN774/ATVUP OKERE/BONLI/TUSGA/-380601.598+1761913.238 - TOTRA/ADKAG/SEKBU/RO366/RO364/-380655.750+1761841.170 + TOTRA/ADKAG/SEKBU/RO636/RO767/-380655.750+1761841.170 + TOTRA/RO401/RO764/OTKOS/RO521/RO634/RO862/-380655.750+1761841.170 WN416/ATRAB/-411907.039+1744826.849 DORBU/WN509/WN416 HUWIT/WN513/WN416 diff --git a/Maps/NZRO/RO_ACU.xml b/Maps/NZRO/RO_ACU.xml index 610c6e6..d76d85a 100644 --- a/Maps/NZRO/RO_ACU.xml +++ b/Maps/NZRO/RO_ACU.xml @@ -389,8 +389,12 @@ ADKAG - RO366 - RO364 + RO636 + RO767 + RO401 + RO764 + RO521 + RO634 @@ -399,15 +403,18 @@ SEKBU + OTKOS - TOTRA/ADKAG/SEKBU/RO366/RO364/-380655.750+1761841.170 + TOTRA/ADKAG/SEKBU/RO636/RO767/-380655.750+1761841.170 + TOTRA/RO401/RO764/OTKOS/RO521/RO634/RO862/-380655.750+1761841.170 diff --git a/Maps/NZTU/TU_ACU.xml b/Maps/NZTU/TU_ACU.xml index 021b1ee..fb41aae 100644 --- a/Maps/NZTU/TU_ACU.xml +++ b/Maps/NZTU/TU_ACU.xml @@ -25,6 +25,10 @@ ATSOK/OMARU + + + TU20T/SUNPA/ELDAK + TU20T BIDNI @@ -36,11 +40,12 @@ DOPOP OLGAL OMARU + SUNPA