From 0e97b371205320c4123375c141752c20c60e3682 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Thu, 6 Oct 2022 20:23:38 +1300 Subject: [PATCH 01/50] fix: Try fix 2210 errors --- .github/CHANGELOG.md | 2 +- Airspace.xml | 7 ++++++- Maps/NZKT/KT_ACU.xml | 2 +- Maps/NZZC.xml | 4 ++-- Maps/Navaids/ATS Routes.xml | 4 ++-- Profile.xml | 2 +- Sectors.xml | 7 ++++--- 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 33bb8f4..e7bcb1d 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -755,4 +755,4 @@ None. - Added some previously missed procedures for NZNV and NZAR. - Addition of NZMF_ATIS, operating on 134.8. - - Replace IFIS and MetFlight links under 'Info' menu with GoPreflight. + - Replace IFIS and MetFlight links under 'Info' menu with GoPreflight. \ No newline at end of file diff --git a/Airspace.xml b/Airspace.xml index 74f44bf..91797bf 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -9554,7 +9554,12 @@ RILEY - + + + + + + diff --git a/Maps/NZKT/KT_ACU.xml b/Maps/NZKT/KT_ACU.xml index 26a1d81..5b609c0 100644 --- a/Maps/NZKT/KT_ACU.xml +++ b/Maps/NZKT/KT_ACU.xml @@ -155,7 +155,7 @@ - PERIA/-35.130615+173.490059 + PERIA/-35.130614+173.490059 diff --git a/Maps/NZZC.xml b/Maps/NZZC.xml index 3f76a0b..4b86851 100644 --- a/Maps/NZZC.xml +++ b/Maps/NZZC.xml @@ -103,8 +103,8 @@ - - + + diff --git a/Maps/Navaids/ATS Routes.xml b/Maps/Navaids/ATS Routes.xml index 0d2f9a6..e6dd601 100644 --- a/Maps/Navaids/ATS Routes.xml +++ b/Maps/Navaids/ATS Routes.xml @@ -750,6 +750,7 @@ OMBOL RUMUS SADIM + NONON TOARP TPARP TEARP @@ -1086,7 +1087,6 @@ AGEDU IDSEM DABAS - NONON LAPIM ELKIG TPAPA @@ -1541,6 +1541,7 @@ OMBOL RUMUS SADIM + NONON TOARP TPARP TEARP @@ -1877,7 +1878,6 @@ AGEDU IDSEM DABAS - NONON LAPIM ELKIG TPAPA diff --git a/Profile.xml b/Profile.xml index eb52cfb..1f46d05 100644 --- a/Profile.xml +++ b/Profile.xml @@ -1,6 +1,6 @@ - + diff --git a/Sectors.xml b/Sectors.xml index 64e16b8..a07471d 100644 --- a/Sectors.xml +++ b/Sectors.xml @@ -9,7 +9,7 @@ TGS,HTMA - + KAI CTMA @@ -32,7 +32,7 @@ NAK OHA,TNS,WTMA - + @@ -104,6 +104,7 @@ TNR + TNS @@ -116,7 +117,7 @@ - + From 07ce2e6df8ef2ce76b4a81eb9e049753246cd94e Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Sat, 29 Oct 2022 13:52:29 +1300 Subject: [PATCH 02/50] Cycle 2212 Changes --- .github/CHANGELOG.md | 41 ++- Airspace.xml | 460 ++++++++++++++++++-------------- Maps/Airspace/ALL_RNAV.xml | 59 +++-- Maps/Airspace/CTA.xml | 71 +++-- Maps/Airspace/CTR.xml | 136 +++++----- Maps/NZAA/AA_ACU.xml | 10 + Maps/NZAR/AR_ACU.xml | 34 ++- Maps/NZCH/CH_ACU.xml | 9 +- Maps/NZGB/GB_ACU.xml | 8 + Maps/NZGS/GS_ACU.xml | 14 +- Maps/NZGT/GT_ACU.xml | 4 + Maps/NZKT/KT_ACU.xml | 2 +- Maps/NZLX/LX_ACU.xml | 14 +- Maps/NZNE/NE_ACU.xml | 10 + Maps/NZNR/NR_ACU.xml | 14 +- Maps/NZNS/NS_ACU.xml | 4 +- Maps/NZNV/NV_ACU.xml | 32 ++- Maps/NZOH/OH_ACU.xml | 14 +- Maps/NZOX/OX_ACU.xml | 8 + Maps/NZPN/PN_ACU.xml | 4 +- Maps/NZPP/PP_ACU.xml | 54 ++-- Maps/NZQN/QN_ACU.xml | 14 +- Maps/NZTK/TK_ACU.xml | 4 +- Maps/NZTU/TU_ACU.xml | 4 + Maps/NZWB/WB_ACU.xml | 4 +- Maps/NZWF/WF_ACU.xml | 14 +- Maps/NZWN/WN_ACU.xml | 510 +++++++++++++++++++----------------- Maps/NZWP/WP_ACU.xml | 24 +- Maps/NZWR/WR_ACU.xml | 4 + Maps/NZWT/WT_ACU.xml | 6 + Maps/Navaids/ATS Routes.xml | 18 +- 31 files changed, 942 insertions(+), 662 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index e7bcb1d..c273a58 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -30,6 +30,8 @@ - [AIRAC 2208](#airac-2208) - [AIRAC 2209](#) **Not Released** - [AIRAC 2210](#airac-2210) +- [AIRAC 2211](#) **Not Released** +- [AIRAC 2212](#airac-2212) ## AIRAC 2013 @@ -749,10 +751,43 @@ None. **Manapouri** - The following procedures have been resequenced: `GULAN 2`. -**** - #### **Dataset Updates** - Added some previously missed procedures for NZNV and NZAR. - Addition of NZMF_ATIS, operating on 134.8. - - Replace IFIS and MetFlight links under 'Info' menu with GoPreflight. \ No newline at end of file + - Replace IFIS and MetFlight links under 'Info' menu with GoPreflight. + +## AIRAC 2212 + +### Revision A + +This cycle is a major release for the Dataset, with the removal and replacement of all Wellington SIDs due to the real-world DMAPS project. This has also amended a fair amount of STARs for NZWN, as well as changing some surrounding airspace due to containment requirements. + +#### ANR Update + +**Visual Reporting Points (VRPs)** + - The following VRPs have been established: Wainui Shed, Red Horn, Sadler Point, Gulf Harbour Marina, Albany Stadium, Cow Sheds, Mackenzie Pass, Glendhu Bay, Cardrona Pines, Queensberry Ponds, Albert Town Bridge and Mou Waho. + - The following VRPs have been disestablished: Matukituki River Mouth and Queensberry. + +**Auckland** + - Auckland CTA/C NZA247 replaced by NZA246. + - Auckland CTA/D NZA231 replaced by NZA232. + +**Paraparaumu** + - The following STARs have been resquenced due to changes in level restrictions: `AGAXA 4`, `GUGAK 5`. + - The following STARs have been added: `IPKEP 1H`, `IPKEP 1G`. + +**Wellington** + - Wellington CTR/C NZA654 replaced by NZA652. + - Wellington CTA/C NZA633, NZA634, and NZA638 boundaries amended. + - Wellington CTA/C airspace NZA643 established. + - Removal of all existing SIDs, and the replacement with the following: `AGROR 1Q`, `ATVEV 1Q`, `IDVAL 1Q`, `IDVAL 1U`, `UPROG 1Q`, `UPLUD 1P`, `UPLUD 1R`, `IPKEP 1P`, `IPKEP 1T`, `URGEV 1P`, `NZWN 1C/D`. + - All STARs have been amended with additional waypoints and level restrictions, and have all been resequenced by one. + +**Other Changes** + - MOAs NZM301 and NZM304 boundaries amended. + - A tonne of new ATS routes, reviews and deletions. + +#### Dataset Updates + +**Changes** \ No newline at end of file diff --git a/Airspace.xml b/Airspace.xml index 91797bf..60ef430 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -92,24 +92,24 @@ - + - + - - + + - - + + @@ -118,8 +118,8 @@ - - + + @@ -558,13 +558,13 @@ - - - - + + + + - + @@ -575,8 +575,8 @@ - - + + @@ -664,18 +664,20 @@ - + + - + + @@ -856,43 +858,42 @@ - - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - + + + @@ -1429,6 +1430,7 @@ NP VOR/ BUGNO/ ELDIB/ TM NDB/ +ONAGO/ AP NDB/ DOGMO/ ELMER/ @@ -1560,8 +1562,8 @@ TG NDB FOXTN/ OH VOR/ -TAMIS/ -OTBAX/ +AVPIB/ +ISRET/ AP NDB @@ -2732,6 +2734,7 @@ MARKO NV VOR/ +ANOPA/ SUNGU/ QN VOR/ TIMJO/ @@ -2739,8 +2742,7 @@ MAMUS/ DUBON/ BELEE/ ALADA/ -NESTA/ -NS VOR +NESTA SURFY/ @@ -2980,6 +2982,10 @@ BELEE SNAPA/ DUMOT + + +VENAM/ +WN VOR OH VOR/ @@ -3061,6 +3067,11 @@ SABDA UPNIX/ DUBON/ LAKAR + + +WN VOR/ +ATVIN/ +MEVAX PM VOR/ @@ -3314,6 +3325,7 @@ RILEY -433318.860+1722431.730 -334330.420+1753351.740 -423338.190+1710845.640 + -412545.550+1745158.430 -364600.720+1743033.190 -410912.890+1743656.480 -450235.620+1690030.250 @@ -3323,6 +3335,7 @@ RILEY -423638.630+1712212.880 -374320.560+1752021.800 -400707.370+1750329.020 + -412819.080+1742700.230 -385901.620+1755214.660 -405309.070+1744226.950 -342230.500+1550950.101 @@ -3349,6 +3362,7 @@ RILEY -402323.750+1752549.830 -390958.710+1751449.380 -453320.310+1691948.380 + -410815.640+1743733.300 -460516.730+1692827.620 -365703.770+1745357.570 -413429.790+1721301.920 @@ -3396,6 +3410,7 @@ RILEY -383520.620+1760526.509 -361143.520+1743337.350 -424701.860+1710412.120 + -434713.280-1764400.820 -441002.700+1702246.990 -423831.360+1784500.020 -395834.250+1755049.580 @@ -3451,6 +3466,8 @@ RILEY -211209.210-1595213.480 -413436.640+1752948.810 -174325.000-1514130.000 + -412928.440+1744408.960 + -404341.680+1744031.120 -443242.380+1692715.860 -410102.300+1755252.340 -445846.680+1690407.060 @@ -3474,6 +3491,7 @@ RILEY -195050.070-1741251.580 -430754.040+1714824.300 -371407.590+1745829.760 + -393649.980+1754021.450 -411912.760+1742025.610 -400249.790+1751011.050 -362348.080+1734152.330 @@ -3484,7 +3502,6 @@ RILEY -365036.150+1754913.870 -212406.150-1591828.620 -431626.510+1722024.100 - -411557.710+1744337.190 -130115.730-1765952.850 -411428.260+1743139.660 -364014.600+1745002.320 @@ -3507,7 +3524,6 @@ RILEY -400602.100+1750703.750 -413139.710+1734107.580 -390624.440+1735839.420 - -434708.430-1764339.950 -455313.620+1701712.930 -404357.580+1724856.210 -411718.360+1730324.520 @@ -3668,6 +3684,7 @@ RILEY -412741.230+1723823.030 -385410.770+1780323.650 -412754.310+1575000.539 + -411633.860+1744837.160 -395045.410+1732039.190 -383353.820+1774057.990 -435646.230-1785226.520 @@ -3705,7 +3722,6 @@ RILEY -401338.520+1753257.680 -392657.600+1741510.830 -211055.080-1595336.620 - -412637.000+1743410.000 -204203.500-1594518.420 -213300.180-1601103.830 -130912.200-1692944.000 @@ -3778,6 +3794,7 @@ RILEY -452803.050+1695828.910 -395424.210+1754136.400 +023638.988-1655348.984 + -435027.000-1763519.500 -441959.940+1680514.560 -392539.400+1733712.300 -445022.410+1684252.560 @@ -3813,6 +3830,7 @@ RILEY -205226.920-1592336.410 -423249.720+1710712.680 -444857.600+1691952.300 + -411107.880+1744429.200 -183414.460-1740620.410 -381852.230+1762351.320 -391833.140+1764325.600 @@ -3824,6 +3842,7 @@ RILEY -385654.100+1745831.540 -193826.900-1742719.290 -180429.000-1781555.000 + -413522.100+1741659.850 -432654.750+1630000.000 -390304.540+1731830.740 -380224.150+1762122.030 @@ -3846,11 +3865,13 @@ RILEY -275922.910-1650000.000 -365631.240+1750218.340 -355226.590+1735710.710 + -411827.420+1750112.220 -364316.090+1745253.510 -385037.100+1755356.900 -361442.590+1742910.940 -450223.430+1704933.170 -211326.050-1602001.590 + -413113.490+1741948.610 -135517.140-1711645.290 -441525.690+1711638.340 -364807.880+1752538.320 @@ -3864,13 +3885,13 @@ RILEY -371505.510+1753301.950 -460510.120+1701244.440 -401010.300+1751456.360 + -411052.990+1744106.490 -450249.000+1684020.000 -432612.120+1723532.940 -364232.000+1742652.000 -365912.650+1754201.200 -413038.480+1735758.400 -444224.910+1671944.720 - -410913.920+1742652.380 -440546.550+1703530.730 -395830.190+1753630.610 -371430.390+1742314.980 @@ -3893,6 +3914,7 @@ RILEY -374620.770+1755059.940 -362123.840+1751857.130 -432942.130+1724447.770 + -412804.000+1743040.000 -365453.650+1745237.590 -450953.220+1701405.190 -404135.110+1752236.700 @@ -3916,6 +3938,8 @@ RILEY -402946.700+1751307.170 -600000.000+1702000.000 -700000.000+1710000.000 + -411301.850+1744723.490 + -411642.850+1744836.560 -361430.192+1752759.112 -361415.756+1753013.176 -361422.560+1753002.412 @@ -4015,10 +4039,11 @@ RILEY -393811.090+1741822.921 -141736.070-1703542.180 -364032.350+1742450.000 + -411613.980+1745647.340 -383652.470+1743450.850 -385306.070+1773944.120 - -410439.900+1750524.870 -451351.440+1721339.880 + -410102.940+1743438.800 -425446.771+1710353.100 -424532.090+1705304.628 -423944.831+1710512.908 @@ -4071,9 +4096,11 @@ RILEY -434044.690-1761626.550 -344020.660+1774451.070 -402009.200+1751400.790 + -414110.810+1744319.560 -370629.500+1752945.040 -433901.840+1722040.900 -450548.920+1684106.600 + -412513.010+1744247.810 -454806.990+1705304.560 -385619.910+1752558.110 -370449.990+1754929.260 @@ -4119,6 +4146,7 @@ RILEY -180423.160-1650000.000 -362636.970+1743233.470 -372826.200+1740500.450 + -411027.000+1744024.670 -435157.360+1714747.810 -452954.550+1704146.110 -650000.000+1713500.000 @@ -4129,8 +4157,11 @@ RILEY -401624.940+1760303.770 -382900.250+1744243.630 -385907.580+1770510.220 + -411451.280+1744815.790 -410504.710+1731258.360 -370302.260+1743846.510 + -412755.720+1743914.370 + -412608.760+1744758.400 -371457.010+1753534.730 -413856.700+1731425.960 -154843.060-1724834.220 @@ -4139,12 +4170,11 @@ RILEY -382304.340+1761236.490 -370834.130+1754100.360 -412209.160+1730717.790 - -413101.200+1743807.970 - -411129.940+1744140.430 -393049.000+1770211.810 -385830.330+1743730.510 -220524.070-1603652.940 -374729.990+1752133.850 + -391221.450+1755143.340 -455517.020+1684555.820 -190142.000+1782348.000 -372631.020+1754607.720 @@ -4169,7 +4199,6 @@ RILEY -265021.020-1790326.560 -432329.380+1721228.550 -362836.480+1743010.150 - -410956.910+1745803.850 -455223.890+1700843.970 -365612.530+1754153.360 -462829.250+1680740.100 @@ -4182,7 +4211,6 @@ RILEY -445227.950+1692615.820 -334139.340+1751925.790 -444242.450+1693027.860 - -411149.580+1745549.560 -383521.110+1755904.070 -414919.570+1743444.550 -414554.530+1742247.280 @@ -4209,6 +4237,7 @@ RILEY -362617.540+1743808.690 -381318.640+1772023.770 -455031.820+1691132.090 + -413209.260+1743039.570 -401912.200+1752235.080 -370756.150+1750143.910 -433653.650+1723306.770 @@ -4407,7 +4436,6 @@ RILEY -210846.170-1601951.410 -385916.980+1760029.220 -103542.650-1605747.490 - -413528.110+1741355.000 -434530.080-1761418.880 -372002.930+1760340.190 -433227.430+1722613.340 @@ -4424,7 +4452,6 @@ RILEY -443632.260+1691606.250 -371137.700+1751755.100 -411826.620+1732138.040 - -412700.010+1744233.660 -430633.730+1731501.880 -391047.450+1734116.690 -365011.000+1743316.590 @@ -4481,7 +4508,6 @@ RILEY -410352.088+1752901.921 -405843.208+1753640.799 -365741.790+1743735.480 - -411439.270+1744445.910 -422209.960+1710945.670 -315509.710+1702214.840 -375916.940+1751434.520 @@ -4577,6 +4603,7 @@ RILEY -393150.210+1662602.450 -431642.470+1723918.770 -451726.540+1691934.910 + -412342.820+1744525.620 -364426.470+1752707.160 -455946.130+1703725.100 -392441.890+1765224.870 @@ -4585,7 +4612,6 @@ RILEY -425435.730+1725542.280 -140256.080-1722718.820 -264423.780-1700000.000 - -405530.660+1744345.400 -454636.960+1683152.970 -162429.850-1720026.530 -432733.800+1723358.920 @@ -4623,7 +4649,9 @@ RILEY -365709.030+1754840.790 -383920.870+1760527.190 -445841.970+1690919.590 + -410819.040+1744545.450 -405409.230+1734612.560 + -410940.720+1743931.380 -364904.650+1760005.710 -370425.730+1754431.030 -362054.970+1743941.110 @@ -4635,11 +4663,12 @@ RILEY -390823.890+1745839.750 -414402.300+1741620.500 -361504.680+1754016.840 + -411854.690+1750519.310 -385303.240+1751934.780 + -411104.750+1745608.460 -422452.000+1630000.000 -365745.570+1742902.700 -392925.390+1743006.730 - -410301.950+1743737.380 -364717.000+1740032.000 -460816.440+1685327.320 -450356.600+1683730.650 @@ -4647,6 +4676,7 @@ RILEY -411714.060+1730346.520 -440730.170+1703022.530 -445455.180+1690436.000 + -385232.240+1753042.870 -164131.680-1713720.590 -372501.860+1745646.800 -411639.300+1750808.060 @@ -4656,6 +4686,7 @@ RILEY -352528.160+1735751.820 -362132.740+1745428.840 -171912.000-1514101.000 + -434703.300-1762052.420 -390941.390+1773007.220 -211208.810-1595934.030 -201110.360-1650000.000 @@ -4672,7 +4703,6 @@ RILEY -370116.840+1742750.480 -365743.140+1745732.290 -372532.290+1745128.430 - -410010.660+1745838.470 -104850.880-1653840.450 -370557.640+1742806.630 -371609.440+1752610.840 @@ -4689,7 +4719,6 @@ RILEY -350526.530+1735136.270 -404609.340+1751644.730 -363851.230+1745109.250 - -385752.150+1755654.170 -460204.510+1695245.360 -412652.230+1725710.910 -382946.040+1774413.880 @@ -4729,7 +4758,6 @@ RILEY -363644.090+1742834.650 -392726.490+1770502.610 -352541.070+1742700.870 - -412202.090+1745135.630 -384430.960+1753211.430 -423724.070+1710418.250 -384024.600+1755259.330 @@ -4753,6 +4781,7 @@ RILEY -365824.710+1743633.270 -455927.270+1703308.350 -212006.980-1593746.980 + -410435.350+1743119.590 -440958.400+1722423.700 -373436.790+1745736.340 -352703.460+1733413.120 @@ -4781,7 +4810,6 @@ RILEY -401911.150+1754005.660 -402354.000+1753455.000 -375219.540+1744822.740 - -411055.060+1744859.930 -370340.730+1750524.660 -105814.060-1653737.630 -500500.000+1724000.000 @@ -4893,7 +4921,6 @@ RILEY -402634.720+1753053.430 -250000.000-1771431.640 -365355.700+1755644.290 - -412725.120+1745313.050 -374007.620+1751211.440 -362254.590+1753657.390 -411306.290+1744851.130 @@ -4914,6 +4941,7 @@ RILEY -413340.260+1730243.630 -385448.340+1741419.960 -385444.920+1772347.860 + -435158.950-1764154.160 -443424.640+1701042.050 -431225.490+1720613.590 -423225.400+1725252.680 @@ -4935,7 +4963,6 @@ RILEY -200000.000-1725547.070 -383036.120+1775417.400 -395053.280+1752215.020 - -435154.100-1764133.270 -413336.630+1740055.800 -454956.060+1704428.180 -355931.800+1752611.040 @@ -4952,12 +4979,12 @@ RILEY -403947.260+1744850.800 -411119.470+1742553.680 -432545.180+1723916.870 - -413619.860+1742618.020 -373551.090+1760135.090 -363653.100+1744652.950 -432706.660+1722906.900 -461649.450+1682049.460 -383814.530+1740458.120 + -410834.200+1742728.320 -450734.460+1684427.380 -402433.080+1754759.650 -370114.970+1750421.290 @@ -5073,14 +5100,11 @@ RILEY -431749.120+1722746.420 -404611.180+1741938.640 -390226.800+1762415.800 - -412952.430+1741658.390 -091021.010-1575651.570 - -393816.860+1753859.490 -142032.400-1704342.630 -403026.900+1703326.580 -354909.140+1740148.850 -194726.870-1575238.580 - -413712.520+1743915.260 -180024.000-1513854.000 -363834.580+1732553.480 -340358.110+1764453.080 @@ -5092,7 +5116,6 @@ RILEY -452322.870+1691833.370 -405759.980+1745717.510 -200006.000-1773813.000 - -412816.960+1744749.670 -373924.490+1752429.110 -372018.920+1742802.920 -212239.864-1745726.532 @@ -5159,7 +5182,6 @@ RILEY -384733.940+1761639.520 -411139.500+1734509.320 -412546.330+1745442.590 - -411631.750+1743327.590 -213429.230-1600925.300 -413319.470+1735253.630 -380016.880+1762235.740 @@ -5181,10 +5203,14 @@ RILEY -373656.290+1762254.370 -383735.270+1741936.880 -365726.820+1665201.700 + -412420.140+1742941.370 -402444.740+1755035.000 + -411414.000+1744521.460 -361343.870+1753507.190 -370051.790+1743927.850 -121045.120-1713604.560 + -405603.430+1744028.110 + -411538.030+1742836.930 -394340.980+1752147.510 -365845.820+1745414.570 -445423.550+1684824.650 @@ -5192,11 +5218,14 @@ RILEY -370331.810+1743658.850 -364425.720+1755747.080 -370935.380+1750536.960 + -411109.160+1743244.010 -440820.800+1705910.190 + -413618.680+1743210.880 -361743.930+1741419.580 -461214.430+1695538.630 -374040.940+1761734.100 -455522.180+1691719.090 + -411742.940+1743408.740 -385058.600+1775051.070 -412954.630+1744743.120 -352541.990+1742717.000 @@ -5208,12 +5237,14 @@ RILEY -353355.220+1710535.290 -461105.740+1681001.940 -363224.150+1744835.900 + -410951.980+1744617.640 + -413218.710+1742418.240 -441434.630+1704508.600 -365005.920+1744925.220 -400819.440+1753615.280 -403209.640+1752528.350 + -410957.970+1745803.790 -364633.440+1745735.200 - -435639.720-1763926.250 -393530.950+1742145.040 -385012.400+1772834.280 -441830.780+1705849.150 @@ -5221,8 +5252,10 @@ RILEY -382048.330+1750407.090 -450219.610+1684048.100 -210405.020-1745159.840 + -410502.630+1750306.690 -410201.560+1742647.260 -394436.120+1741429.270 + -412205.200+1744814.840 -365109.990+1743818.940 -364752.220+1744456.650 -452619.910+1704925.160 @@ -5232,7 +5265,9 @@ RILEY -365755.690+1751047.520 -364940.780+1751826.410 -460545.180+1691651.590 + -411323.490+1745303.250 -413509.780+1735125.570 + -435644.580-1763947.170 -455702.790+1702315.920 -213319.170-1601043.970 -230015.740-1650000.000 @@ -5361,7 +5396,6 @@ RILEY -365124.491+1752455.840 -141743.460-1703840.630 -142132.450-1704523.140 - -411153.130+1750611.130 -365429.360+1742558.830 -404721.110+1743603.910 -365005.650+1745514.950 @@ -5668,6 +5702,8 @@ RILEY -405835.800+1730405.500 -450925.700+1682400.200 -442945.000+1681039.500 + -364337.000+1744208.000 + -444052.450+1691126.560 -432540.000+1700904.300 -455508.900+1701546.800 -432828.000+1701227.300 @@ -5735,6 +5771,7 @@ RILEY -441324.100+1700300.300 -361653.500+1744900.700 -410303.800+1733536.500 + -444816.190+1690257.000 -445255.800+1690013.000 -395519.620+1745744.560 -444853.800+1672341.000 @@ -5762,6 +5799,7 @@ RILEY -370042.200+1743618.500 -364520.500+1753003.000 -445457.200+1684423.000 + -441350.000+1701615.000 -450006.100+1682930.200 -445937.300+1685551.800 -431839.200+1722254.100 @@ -5807,6 +5845,7 @@ RILEY -391109.700+1740756.600 -444433.100+1680041.200 -371223.500+1744346.600 + -443952.380+1690125.490 -412437.800+1731057.500 -432935.000+1702922.400 -413023.200+1725122.100 @@ -5816,6 +5855,7 @@ RILEY -371327.000+1750152.000 -411056.900+1745008.600 -383544.200+1775730.300 + -363728.000+1744716.000 -444227.000+1675904.100 -450500.400+1683715.900 -394347.700+1762639.700 @@ -5936,7 +5976,9 @@ RILEY -432742.000+1701045.300 -433624.000+1724312.500 -445204.700+1684926.000 + -441135.000+1703637.000 -431950.000+1722957.000 + -411738.600+1732231.300 -411818.800+1732505.500 -411720.400+1744225.000 -461944.200+1682051.200 @@ -5961,9 +6003,7 @@ RILEY -400501.800+1752320.200 -395946.400+1752327.400 -465520.800+1674558.500 - -411738.600+1732231.300 -374813.000+1752344.000 - -443749.600+1690051.800 -360653.500+1742100.600 -443104.100+1680347.200 -370047.100+1745044.300 @@ -5981,6 +6021,7 @@ RILEY -410636.800+1730042.500 -430342.000+1730427.500 -385113.700+1755633.700 + -443320.380+1690452.230 -444527.100+1682140.200 -464425.400+1675458.500 -442943.100+1685011.500 @@ -6089,11 +6130,11 @@ RILEY -432614.800+1723003.000 -371607.000+1750959.500 -445737.500+1685939.800 - -444947.300+1691958.700 + -444648.160+1691823.210 -445948.600+1684206.700 -411702.800+1730755.500 - -374355.600+1760719.700 -412004.800+1731050.500 + -374355.600+1760719.700 -392539.800+1751654.900 -415229.400+1725138.800 -384417.600+1760100.700 @@ -6102,6 +6143,7 @@ RILEY -450430.700+1682742.900 -401143.700+1751308.600 -370402.000+1745857.000 + -363123.000+1742556.000 -411803.800+1730429.500 -441124.000+1700510.300 -433140.000+1723242.000 @@ -6118,6 +6160,7 @@ RILEY -464209.700+1674254.300 -375107.600+1751820.700 -411908.800+1741416.600 + -363010.000+1744408.000 -384408.600+1760738.700 -462940.300+1681822.200 -412039.800+1730448.500 @@ -6229,6 +6272,7 @@ RILEY -462704.300+1682731.100 -364546.500+1742931.600 -384117.700+1780418.800 + -363548.000+1743459.000 -393300.800+1765127.200 -381046.200+1761600.900 -384248.700+1775629.800 @@ -6490,7 +6534,7 @@ RILEY EGUMO/GUMVA/ADGUG/NOLEG/FIRTH - + BODUG/UGSIM/MERAS BODUG/UGSIM/MERAS BODUG/UGSIM/MERAS @@ -6499,7 +6543,7 @@ RILEY VEGBO/MERAS - + BODUG/UGSIM/REKIS BODUG/UGSIM/REKIS BODUG/UGSIM/REKIS @@ -7151,20 +7195,22 @@ RILEY IGMUL IPMIR - + AGAXA FICAN/AVKEX + BRUDA KAMET KAPTI PP NDB WITBY - + GUGAK BRUDA/AVKEX - FICAN + BRUDA KAMET KAPTI + PEGPU PP NDB WITBY @@ -7382,98 +7428,99 @@ RILEY RO VOR TG NDB - - TAXUP/TAPAB/RUSPI/MATVU/DOGBI - GOPLU - GULUT - KABKA - TANEN - VANDA - - - ISNIP - BAXOV/AVPOD - OGAMI/NIMOS - AGSOP/ENRED/NULKO - OGAMI/RUSIL - AGSOP/UPVAP - - - MUDGU/ISNIP - BAXOV/AVPOD - OGAMI/NIMOS - AGSOP/ENRED/NULKO - OGAMI/RUSIL - AGSOP/UPVAP - - - REVNA/ADLAK/KADNU - OSALA/KAMET - OSALA/KAPTI - NIMOS - OSALA/PP NDB - RUSIL - - - KALEM + + URBEM/AGROR AKTAN ATSUN - PAPSI/KAMDO - MELAD/KAMET - MELAD/KAPTI - MELAD/PP NDB - PAPSI/SABDA - - - MESEL - DAPVA/IGMUL - ISLUG/TAKMI/LUBSI + ADLAK/UPROG/ATVIN + ADLAK/UPROG/MELAD/KAMET + ADLAK/UPROG/MELAD/KAPTI + ADLAK/UPROG/MELAD/PP NDB + IDSIR/VENAM + + + URBEM/ATVEV + ATSUN + IRSOG/EKVUB/ATVIN + UKANO/ELGIP/DOGBI/GOPLU + UKANO/ELGIP/DOGBI/GULUT + UKANO/ELGIP/DOGBI/KABKA + IRSOG/EKVUB/KAMET + IRSOG/EKVUB/KAPTI + UKANO/ELGIP/LUBSI + IRSOG/EKVUB/RUSIL SABDA - DAPVA/IGMUL/UPVAP - - + UKANO/ELGIP/DOGBI/TANEN + UKANO/ELGIP/DOGBI/VANDA + + + URBEM + ESMAB/IGMUL + KENJA/EMSUT/LUBSI + ESMAB/IGMUL/UPVAP + + + OBGID/IDVAL + ESMAB/IGMUL + KENJA/EMSUT/LUBSI + ESMAB/IGMUL/UPVAP + + + GANJI/IPKEP + UGARO/ATVIN + UGEXO/AVPOD + AKPEX/RUVUM/NULKO + AKPEX/UPVAP + + + UDOSO/IPKEP + UGARO/ATVIN + UGEXO/AVPOD + AKPEX/RUVUM/NULKO + AKPEX/UPVAP + + - - NL NDB + + - - POLAX - OMLAS/ATRIM/DOVUL/GOPLU - OMLAS/ATRIM/DOVUL/GULUT - OMLAS/ATRIM/DOVUL/KABKA - LAROX/JONAH/KAMDO + + COUBY/UPLUD + ATSUN + ATVIN + OLSUS/HHOOT/ATRIM/DOVUL/GOPLU + OLSUS/HHOOT/ATRIM/DOVUL/GULUT + OLSUS/HHOOT/ATRIM/DOVUL/KABKA KAMET - NIMOS + KAPTI + OLSUS/HHOOT/ATRIM/NULKO RUSIL - LAROX/JONAH/SABDA - OMLAS/ATRIM/DOVUL/TANEN - OMLAS/ATRIM/DOVUL/VANDA - - - LAXIV/POLAX - OMLAS/ATRIM/DOVUL/GOPLU - OMLAS/ATRIM/DOVUL/GULUT - OMLAS/ATRIM/DOVUL/KABKA - LAROX/JONAH/KAMDO + ENKEM/LAROX/JONAH/SABDA + OLSUS/HHOOT/ATRIM/DOVUL/TANEN + OLSUS/HHOOT/ATRIM/DOVUL/VANDA + + + LAXIV/IRNIL/GAMJU/UPLUD + ATVIN + OLSUS/HHOOT/ATRIM/DOVUL/GOPLU + OLSUS/HHOOT/ATRIM/DOVUL/GULUT + OLSUS/HHOOT/ATRIM/DOVUL/KABKA KAMET - NIMOS + KAPTI RUSIL - LAROX/JONAH/SABDA - OMLAS/ATRIM/DOVUL/TANEN - OMLAS/ATRIM/DOVUL/VANDA + ENKEM/LAROX/JONAH/SABDA + OLSUS/HHOOT/ATRIM/DOVUL/TANEN + OLSUS/HHOOT/ATRIM/DOVUL/VANDA - - REVNA + + GANJI/URGEV AKTAN - ATSUN - - - TAXUP - KAMDO - BAXAN/KAMET - BAXAN/RUSIL - SABDA + OMGIM/ATSUN + OMKEB/MELAD/KAMET + OMKEB/MELAD/KAPTI + OMKEB/MELAD/PP NDB + HANWU/IRTAG/VENAM DOMON @@ -8480,6 +8527,12 @@ RILEY AVKEX/PP401/ENBAR + + IPKEP/DABGU + + + IPKEP/GUDSA/ENBAR + KAMET/NOKIX/NILID @@ -8705,86 +8758,86 @@ RILEY KEEPA/WK404/WK403/REGAT - + ATSUN/DONNY/RONGO/UMAGA - + ATSUN/CHATS/ONOKI/PAHWA/WITBY - + AVPOD/HUWIT/WITBY - + AVPOD/HUWIT - - DOGAD/WN406/LADIT/WYRAP/TURAK/RONGO/UMAGA + + DOGAD/WN406/LADIT/EMRUP/TURAK/RONGO/UMAGA - - DOGAD/WN406/LADIT/HECTA/PAHWA/WITBY + + DOGAD/WN406/LADIT/UPTUL/PAHWA/WITBY IGMUL/MEEDA/JONAH/UMAGA - - LADIT/WYRAP/TURAK/RONGO/UMAGA + + LADIT/EMRUP/TURAK/RONGO/UMAGA - LADIT/HECTA/PAHWA/WITBY + LADIT/UPTUL/PAHWA/WITBY - + SIMZI/KRAKA/MEEDA/JONAH/UMAGA GOPLU GULUT TANEN - + SIMZI/KABUS/RUSKI/HUWIT/WITBY GOPLU GULUT TANEN - + SIMZI/KRAKA/MEEDA GOPLU GULUT TANEN - + SIMZI/KABUS/RUSKI/HUWIT GOPLU GULUT TANEN - + SULRI/MEEDA/JONAH/UMAGA - + SULRI/MEEDA TPAPA/FICAN/TURBY/RIPPA/JONAH/UMAGA - + TPAPA/BRUDA/HUWIT/WITBY - - TPAPA/FICAN/TURBY/RIPPA + + TPAPA/BRUDA/PEGPU/UGTOV/UKLEB/RIPPA - + TPAPA/BRUDA/HUWIT - + WARDS/OMDOX/SALTI/MEEDA/JONAH/UMAGA - - WARDS/PHNIX/HUWIT/WITBY + + WARDS/OMDOX/UPMOM/AGVEG/UDIVA/PHNIX/OLVIR/HUWIT/WITBY - + WARDS/OMDOX/SALTI/MEEDA - - WARDS/OMDOX/PHNIX/DORBU + + WARDS/OMDOX/UPMOM/AGVEG/UDIVA/PHNIX/DORBU GURSU/AGTID @@ -9101,7 +9154,14 @@ RILEY ESNED TUMGO/ISLOP/PATRU/-411805.029+1731308.119 + + EGAMU + ESNUP + KAGRU/NILIB/-462506.280+1681808.129 + + DOTLU + LALEV DUNAX/PALTU/-462439.960+1681929.078 @@ -9207,7 +9267,7 @@ RILEY MEEDA/WN514/WN423 RIPPA/WN411/WN506 - WN412/WN508/SULAB/WN34T/-412005.780+1744822.889 + WN412/WN508/SULAB/-412005.780+1744822.889 AGTID @@ -9257,7 +9317,7 @@ RILEY - + @@ -9308,7 +9368,7 @@ RILEY - + diff --git a/Maps/Airspace/ALL_RNAV.xml b/Maps/Airspace/ALL_RNAV.xml index 1618b6f..8cd2756 100644 --- a/Maps/Airspace/ALL_RNAV.xml +++ b/Maps/Airspace/ALL_RNAV.xml @@ -126,7 +126,6 @@ WN509 WN513 WN508 - WN34T WN514 WN423 WN411 @@ -218,7 +217,7 @@ WN416/RIDGE/-411907.039+1744826.849 DORBU/WN509/WN416 HUWIT/WN513/WN416 - WN412/WN508/SULAB/WN34T/-412005.780+1744822.889 + WN412/WN508/SULAB/-412005.780+1744822.889 MEEDA/WN514/WN423/WN412 RIPPA/WN411/WN506/WN412 @@ -253,10 +252,12 @@ VARSI ELPAM PAKSA + RUGRU CREEK EWOOD OTOKO WARIK + KOPUA COOKS UKLIP MAMUS @@ -280,8 +281,10 @@ URDAL PANGO BOLOR + AROPA ELBOW NANUA + AKINA MILLA OHITI KAPUA @@ -289,11 +292,19 @@ MIBEV QUAIL ESNED + KAGRU + EGAMU + ESNUP + DUNAX + DOTLU + LALEV + NUTGO BOBIT DOTGO LELUK GUPIL ADKIS + SOSLA NOBED VARNO ENDIX @@ -337,14 +348,17 @@ SUPIM LAVIS POTOP + UMAGA WITBY AGTID IKIMU UPSUV BURLY OPOHO + MAKEE HALEN IGOLF + FLAXX ABUOY BAZEN AVMAK @@ -434,8 +448,6 @@ ESKAT OMGET PAROA - RUGRU - KOPUA ATMAS WAPOU MAKOS @@ -452,15 +464,9 @@ UPLIN VARMA UPDAL - AROPA - AKINA ELMAX OTLIT TUMGO - KAGRU - DUNAX - NUTGO - SOSLA PAMOA ORBEL OLNAN @@ -471,13 +477,10 @@ TU593 ELBEV REGAT - UMAGA AVMEB MARKS WYTAK - MAKEE BAYES - FLAXX OMANA BIRAX BURKI @@ -563,10 +566,12 @@ VARSI ELPAM PAKSA + RUGRU CREEK EWOOD OTOKO WARIK + KOPUA COOKS UKLIP MAMUS @@ -590,8 +595,10 @@ URDAL PANGO BOLOR + AROPA ELBOW NANUA + AKINA MILLA OHITI KAPUA @@ -599,11 +606,19 @@ MIBEV QUAIL ESNED + KAGRU + EGAMU + ESNUP + DUNAX + DOTLU + LALEV + NUTGO BOBIT DOTGO LELUK GUPIL ADKIS + SOSLA NOBED VARNO ENDIX @@ -647,14 +662,17 @@ SUPIM LAVIS POTOP + UMAGA WITBY AGTID IKIMU UPSUV BURLY OPOHO + MAKEE HALEN IGOLF + FLAXX ABUOY BAZEN AVMAK @@ -761,8 +779,6 @@ ESKAT OMGET PAROA - RUGRU - KOPUA ATMAS WAPOU MAKOS @@ -779,15 +795,9 @@ UPLIN VARMA UPDAL - AROPA - AKINA ELMAX OTLIT TUMGO - KAGRU - DUNAX - NUTGO - SOSLA PAMOA ORBEL OLNAN @@ -798,13 +808,10 @@ TU593 ELBEV REGAT - UMAGA AVMEB MARKS WYTAK - MAKEE BAYES - FLAXX OMANA BIRAX BURKI @@ -920,7 +927,11 @@ TUMGO/ISLOP ESNED/TUMGO KAGRU/NILIB/-462506.280+1681808.129 + EGAMU/KAGRU + ESNUP/KAGRU DUNAX/PALTU/-462439.960+1681929.078 + DOTLU/DUNAX + LALEV/DUNAX NUTGO/NIVOD/-401209.562+1752227.570 BOBIT/NUTGO DOTGO/NUTGO diff --git a/Maps/Airspace/CTA.xml b/Maps/Airspace/CTA.xml index 296b088..fb9a59b 100644 --- a/Maps/Airspace/CTA.xml +++ b/Maps/Airspace/CTA.xml @@ -668,8 +668,8 @@ -362556.743+1750414.423/ -362752.009+1750626.991/ -362824.300+1750655.600 - - + + -383246.000+1753905.000/ -385718.300+1753437.300/ -385555.100+1752219.300/ @@ -693,17 +693,15 @@ -384013.487+1740137.060/ -384010.100+1740153.500/ -383338.900+1740317.300/ --372853.500+1742330.700/ --373032.918+1742645.756/ --373158.091+1743010.255/ --373308.701+1743343.452/ --373404.198+1743723.695/ --373444.150+1744109.275/ --373508.247+1744458.438/ --373516.300+1744849.400/ --373508.247+1745240.362/ --373444.150+1745629.525/ --373424.100+1745853.400/ +-373909.400+1742018.400/ +-374100.918+1742447.591/ +-374231.889+1742922.166/ +-374343.394+1743405.877/ +-374434.873+1743856.509/ +-374505.923+1744351.788/ +-374516.300+1744849.400/ +-374505.923+1745347.012/ +-374438.500+1745833.300/ -374925.000+1745824.000/ -380650.400+1750101.400/ -381123.700+1750202.800/ @@ -959,21 +957,39 @@ -373047.700+1751914.900/ -373047.000+1752115.000/ -373047.700+1752321.800 - - --371800.580+1741103.270/ + + +-371800.600+1741103.300/ -372241.389+1741504.988/ -372457.161+1741739.805/ -372701.633+1742029.084/ --372853.500+1742330.700/ +-372853.842+1742331.534/ +-373032.918+1742645.756/ +-373158.091+1743010.255/ +-373308.701+1743343.452/ +-373404.198+1743723.695/ +-373444.150+1744109.275/ +-373508.247+1744458.438/ +-373516.300+1744849.400/ +-373508.247+1745240.362/ +-373444.150+1745629.525/ +-373424.100+1745853.400/ +-374438.500+1745833.300/ +-374516.300+1744849.400/ +-374505.923+1744351.788/ +-374434.873+1743856.509/ +-374343.394+1743405.877/ +-374231.889+1742922.166/ +-374100.918+1742447.591/ +-373911.193+1742024.289/ -373909.400+1742018.400/ -373439.050+1741219.563/ -373158.755+1740841.871/ -372903.932+1740522.888/ -372555.939+1740224.122/ -372236.233+1735946.912/ --372149.900+1735919.570/ --371800.580+1741103.270 +-372149.900+1735919.600/ +-371800.600+1741103.300 -373343.000+1750930.500/ @@ -2284,7 +2300,8 @@ -413049.549+1743451.168/ -412951.512+1743340.558/ -412927.300+1743317.300/ --412440.700+1744058.800/ +-412414.700+1744035.200/ +-412503.021+1744121.378/ -412532.000+1744156.692/ -412558.561+1744235.249/ -412622.496+1744316.755/ @@ -2310,7 +2327,7 @@ -410820.600+1750532.000/ -411031.300+1750514.400/ -411628.400+1745717.500/ --412445.400+1745444.500/ +-412445.400+1745444.400/ -412555.600+1745530.400/ -412622.496+1745445.365/ -412643.623+1745401.225/ @@ -2330,7 +2347,8 @@ -412558.561+1744235.249/ -412532.000+1744156.692/ -412503.021+1744121.378/ --412440.700+1744058.800/ +-412431.839+1744049.575/ +-412414.700+1744035.200/ -412927.300+1743317.300/ -413049.549+1743451.168/ -413142.743+1743608.299/ @@ -2476,8 +2494,7 @@ -413335.800+1750848.100/ -413034.900+1750328.400/ -412555.600+1745530.400/ --412445.400+1745444.500/ --411628.400+1745717.500/ +-412445.400+1745444.400/ -411031.300+1750514.400/ -411502.700+1751250.100/ -411712.100+1751605.900 @@ -2549,6 +2566,12 @@ -405557.100+1750944.000/ -405024.900+1751021.300/ -404238.500+1751622.200 + + +-411031.300+1750514.400/ +-412445.400+1745444.400/ +-411628.400+1745717.500/ +-411031.300+1750514.400 -432821.600+1700321.800/ diff --git a/Maps/Airspace/CTR.xml b/Maps/Airspace/CTR.xml index a1a3a77..2532152 100644 --- a/Maps/Airspace/CTR.xml +++ b/Maps/Airspace/CTR.xml @@ -402,18 +402,16 @@ -411527.600+1731641.700/ -411153.400+1731928.400/ -411216.600+1732006.400 - + --410859.400+1745227.800/ --411115.700+1745210.300/ --411325.100+1745219.500/ --411908.400+1745040.700/ --412012.500+1745022.300/ --412018.700+1745020.500/ --412029.600+1745018.000/ --412039.700+1745016.300/ --412441.900+1745044.000/ --412738.500+1745032.200/ +-410855.300+1745225.900/ +-411059.800+1745325.500/ +-411736.900+1745112.800/ +-412000.800+1745013.700/ +-412123.300+1745057.500/ +-412725.300+1745150.800/ +-412737.170+1745045.330/ +-412742.304+1744953.395/ -412744.020+1744901.060/ -412742.304+1744808.725/ -412737.170+1744716.790/ @@ -422,90 +420,80 @@ -412701.781+1744447.329/ -412643.623+1744400.895/ -412622.496+1744316.755/ --412608.800+1744255.000/ --412548.200+1744314.800/ --412347.900+1744535.900/ --412001.600+1744632.900/ --411917.600+1744643.900/ --411903.000+1744642.300/ --411401.100+1744608.200/ --411142.700+1744520.400/ +-412614.000+1744304.000/ +-412159.500+1744525.300/ +-412044.600+1744642.000/ +-412028.000+1744641.200/ +-411800.000+1744633.300/ +-411732.200+1744631.800/ +-411645.800+1744556.800/ +-411240.200+1744431.600/ +-411158.900+1744515.500/ -411101.400+1744533.000/ -410910.300+1744606.900/ -410856.900+1744959.700/ --410855.300+1745225.900/ --410859.400+1745227.800 - +-410855.300+1745225.900 + --411540.200+1745540.200/ --411701.400+1745415.800/ --411908.400+1745040.700/ --411325.100+1745219.500/ --411115.700+1745210.300/ --410859.400+1745227.800/ --411540.200+1745540.200 - +-411059.800+1745325.500/ +-411437.600+1745510.100/ +-411736.900+1745112.800/ +-411059.800+1745325.500 + +-411437.600+1745510.100/ -411540.200+1745540.200/ -411735.100+1745451.500/ --412202.700+1745259.100/ +-412202.800+1745259.200/ -412248.300+1745328.700/ -412300.200+1745336.300/ --412012.500+1745022.300/ --411908.400+1745040.700/ --411701.400+1745415.800/ --411540.200+1745540.200 - - --412300.200+1745336.300/ -412445.400+1745444.500/ -412555.600+1745530.400/ +-412123.300+1745057.500/ +-412000.800+1745013.700/ +-411736.900+1745112.800/ +-411437.600+1745510.100 + + +-412123.300+1745057.500/ +-412555.600+1745530.400/ -412622.496+1745445.365/ -412643.623+1745401.225/ -412701.781+1745314.791/ -412716.831+1745226.414/ --412728.658+1745136.467/ --412737.170+1745045.330/ --412738.500+1745032.200/ --412441.900+1745044.000/ --412039.700+1745016.300/ --412029.600+1745018.000/ --412018.700+1745020.500/ --412012.500+1745022.300/ --412300.200+1745336.300 - +-412725.300+1745150.800/ +-412123.300+1745057.500 + --412001.600+1744632.900/ --412347.900+1744535.900/ --412548.200+1744314.800/ --412608.800+1744255.000/ +-412028.000+1744641.200/ +-412044.600+1744642.000/ +-412159.500+1744525.300/ +-412614.000+1744304.000/ -412532.000+1744156.692/ -412503.021+1744121.378/ --412440.700+1744058.800/ --412233.600+1744249.700/ --412001.300+1744625.900/ --412001.600+1744632.900 - +-412431.839+1744049.575/ +-412414.700+1744035.200/ +-412338.500+1744109.400/ +-412028.000+1744641.200 + --411903.000+1744642.300/ --411917.600+1744643.900/ --412001.600+1744632.900/ --412001.300+1744625.900/ --412233.600+1744249.700/ --412440.700+1744058.800/ +-411800.000+1744633.330/ +-412028.000+1744641.200/ +-412338.500+1744109.400/ -412143.800+1744257.600/ --411947.400+1744332.000/ --411719.000+1744337.500/ --411901.900+1744613.100/ --411903.000+1744642.300 - +-411838.800+1744443.600/ +-411614.100+1744249.200/ +-411506.500+1744155.900/ +-411445.200+1744218.600/ +-411800.000+1744633.330 + --411142.700+1744520.400/ --411401.100+1744608.200/ --411903.000+1744642.300/ --411901.900+1744613.100/ --411719.000+1744337.500/ --411142.700+1744520.400 +-411240.200+1744431.600/ +-411645.800+1744556.800/ +-411732.200+1744631.800/ +-411800.000+1744633.300/ +-411445.200+1744218.600/ +-411240.200+1744431.600 -413208.700+1740830.700/ diff --git a/Maps/NZAA/AA_ACU.xml b/Maps/NZAA/AA_ACU.xml index f61669a..46227f3 100644 --- a/Maps/NZAA/AA_ACU.xml +++ b/Maps/NZAA/AA_ACU.xml @@ -1341,6 +1341,7 @@ + -364337.000+1744208.000 -365353.500+1744124.600 -365533.600+1744224.700 -365911.800+1745938.600 @@ -1355,6 +1356,7 @@ -371223.500+1744346.600 -374013.400+1751818.200 -371327.000+1750152.000 + -363728.000+1744716.000 -364025.300+1742700.200 -370510.400+1745427.200 -374155.160+1751144.690 @@ -1389,12 +1391,15 @@ -365750.500+1744429.600 -371607.000+1750959.500 -370402.000+1745857.000 + -363123.000+1742556.000 + -363010.000+1744408.000 -370540.500+1744647.600 -365035.500+1745150.700 -370955.500+1744728.600 -365858.500+1753006.400 -364929.500+1743857.600 -364546.500+1742931.600 + -363548.000+1743459.000 -365715.000+1750430.000 -365356.500+1743147.600 -362402.100+1743949.300 @@ -1404,6 +1409,7 @@ -365643.500+1745749.700 + -364337.000+1744208.000 -360253.500+1743500.700 -361653.500+1744900.700 -365929.200+1750214.700 -364520.500+1753003.000 + -363728.000+1744716.000 -365241.500+1745529.700 -365653.400+1751009.200 -364650.500+1744557.400 @@ -144,18 +146,22 @@ -363600.300+1744149.600 -365440.500+1745209.700 -365444.100+1745130.000 + -363010.000+1744408.000 -365035.500+1745150.700 -365858.500+1753006.400 + -363548.000+1743459.000 -365715.000+1750430.000 -362402.100+1743949.300 -361745.900+1743123.600 -365643.500+1745749.700 @@ -277,6 +276,7 @@ + KOPUA COOKS UKLIP @@ -285,19 +285,17 @@ VESAV - - KOPUA - + KOPUA/VESAV/-384010.870+1775844.540 COOKS/KOPUA UKLIP/KOPUA diff --git a/Maps/NZGT/GT_ACU.xml b/Maps/NZGT/GT_ACU.xml index 76f8817..6b770e8 100644 --- a/Maps/NZGT/GT_ACU.xml +++ b/Maps/NZGT/GT_ACU.xml @@ -55,6 +55,7 @@ -433037.000+1700630.300 -432954.000+1700234.300 -432652.000+1700239.300 + -441350.000+1701615.000 -433154.000+1701800.300 -433054.000+1701300.300 -433133.000+1701533.300 @@ -81,6 +82,7 @@ -433912.000+1701900.000 -434220.000+1703344.400 -432742.000+1701045.300 + -441135.000+1703637.000 -433806.000+1701318.300 -432754.000+1703453.400 -435835.100+1695241.300 @@ -127,6 +129,7 @@ -433037.000+1700630.300 -432954.000+1700234.300 -432652.000+1700239.300 + -441350.000+1701615.000 -433154.000+1701800.300 -433054.000+1701300.300 -433133.000+1701533.300 @@ -153,6 +156,7 @@ -433912.000+1701900.000 -434220.000+1703344.400 -432742.000+1701045.300 + -441135.000+1703637.000 -433806.000+1701318.300 -432754.000+1703453.400 -435835.100+1695241.300 diff --git a/Maps/NZKT/KT_ACU.xml b/Maps/NZKT/KT_ACU.xml index 5b609c0..26a1d81 100644 --- a/Maps/NZKT/KT_ACU.xml +++ b/Maps/NZKT/KT_ACU.xml @@ -155,7 +155,7 @@ - PERIA/-35.130614+173.490059 + PERIA/-35.130615+173.490059 diff --git a/Maps/NZLX/LX_ACU.xml b/Maps/NZLX/LX_ACU.xml index 7e8179e..27e07c5 100644 --- a/Maps/NZLX/LX_ACU.xml +++ b/Maps/NZLX/LX_ACU.xml @@ -315,12 +315,14 @@ -450925.700+1682400.200 + -444052.450+1691126.560 -450522.200+1690940.600 -450945.000+1684109.100 -450025.100+1683655.200 -450045.700+1682308.400 -450421.600+1683047.900 -450031.100+1685400.200 + -444816.190+1690257.000 -445255.800+1690013.000 -454334.200+1700251.300 -451045.100+1691824.300 @@ -336,6 +338,7 @@ -445712.100+1682136.200 -444407.200+1683658.800 -451225.100+1691251.300 + -443952.380+1690125.490 -450500.400+1683715.900 -451145.800+1684149.600 -450412.100+1683853.200 @@ -347,16 +350,16 @@ -445646.100+1682926.200 -454800.000+1700740.000 -445204.700+1684926.000 - -443749.600+1690051.800 -450001.100+1683403.200 -445749.500+1683903.200 -442943.100+1685011.500 -444354.100+1691040.800 -445245.000+1682931.200 -450539.700+1682538.600 + -443320.380+1690452.230 -445638.100+1682424.200 -445737.500+1685939.800 - -444947.300+1691958.700 + -444648.160+1691823.210 -445948.600+1684206.700 -450430.700+1682742.900 -450001.100+1690413.300 @@ -379,12 +382,14 @@ + -364337.000+1744208.000 -365353.500+1744124.600 -365533.600+1744224.700 -360253.500+1743500.700 @@ -110,6 +111,7 @@ -370613.500+1745649.700 -371223.500+1744346.600 -371327.000+1750152.000 + -363728.000+1744716.000 -364025.300+1742700.200 -370510.400+1745427.200 -371124.100+1750849.400 @@ -141,12 +143,15 @@ -365750.500+1744429.600 -371607.000+1750959.500 -370402.000+1745857.000 + -363123.000+1742556.000 + -363010.000+1744408.000 -370540.500+1744647.600 -365035.500+1745150.700 -370955.500+1744728.600 -365858.500+1753006.400 -364929.500+1743857.600 -364546.500+1742931.600 + -363548.000+1743459.000 -365715.000+1750430.000 -365356.500+1743147.600 -362402.100+1743949.300 @@ -156,6 +161,7 @@ -365643.500+1745749.700 @@ -290,6 +289,7 @@ + AKINA MILLA OHITI @@ -298,18 +298,16 @@ -39.536822+176.859764 - - AKINA - + AKINA/-39.536822+176.859764/-392839.698+1765158.720 MILLA/AKINA OHITI/AKINA diff --git a/Maps/NZNS/NS_ACU.xml b/Maps/NZNS/NS_ACU.xml index 49ca76e..2c6f96d 100644 --- a/Maps/NZNS/NS_ACU.xml +++ b/Maps/NZNS/NS_ACU.xml @@ -479,9 +479,9 @@ -411952.800+1731646.500 -412842.400+1734844.400 -411059.800+1730351.500 + -411738.600+1732231.300 -411818.800+1732505.500 -411523.800+1730600.500 - -411738.600+1732231.300 -420506.400+1731539.200 -410636.800+1730042.500 -412506.300+1734534.600 @@ -529,9 +529,9 @@ -411952.800+1731646.500 -412842.400+1734844.400 -411059.800+1730351.500 + -411738.600+1732231.300 -411818.800+1732505.500 -411523.800+1730600.500 - -411738.600+1732231.300 -420506.400+1731539.200 -410636.800+1730042.500 -412506.300+1734534.600 diff --git a/Maps/NZNV/NV_ACU.xml b/Maps/NZNV/NV_ACU.xml index 1c2c559..a654589 100644 --- a/Maps/NZNV/NV_ACU.xml +++ b/Maps/NZNV/NV_ACU.xml @@ -132,21 +132,27 @@ - + + KAGRU + EGAMU + ESNUP + NILIB - - KAGRU - + KAGRU/NILIB/-462506.280+1681808.129 + EGAMU/KAGRU + ESNUP/KAGRU @@ -282,21 +288,27 @@ - + + DUNAX + DOTLU + LALEV + PALTU - - DUNAX - + DUNAX/PALTU/-462439.960+1681929.078 + DOTLU/DUNAX + LALEV/DUNAX diff --git a/Maps/NZOH/OH_ACU.xml b/Maps/NZOH/OH_ACU.xml index be484cc..f1b0aa5 100644 --- a/Maps/NZOH/OH_ACU.xml +++ b/Maps/NZOH/OH_ACU.xml @@ -75,6 +75,7 @@ + NUTGO BOBIT DOTGO LELUK @@ -84,9 +85,7 @@ NIVOD - - NUTGO - + NUTGO/NIVOD/-401209.562+1752227.570 BOBIT/NUTGO DOTGO/NUTGO @@ -94,11 +93,11 @@ @@ -233,6 +232,7 @@ + SOSLA NOBED VARNO @@ -241,19 +241,17 @@ VELSU - - SOSLA - + SOSLA/VELSU/-401302.150+1752325.670 NOBED/SOSLA VARNO/SOSLA diff --git a/Maps/NZOX/OX_ACU.xml b/Maps/NZOX/OX_ACU.xml index dd5d778..6218aad 100644 --- a/Maps/NZOX/OX_ACU.xml +++ b/Maps/NZOX/OX_ACU.xml @@ -58,9 +58,11 @@ + -364337.000+1744208.000 -360253.500+1743500.700 -361653.500+1744900.700 -364520.500+1753003.000 + -363728.000+1744716.000 -365241.500+1745529.700 -365653.400+1751009.200 -364650.500+1744557.400 @@ -68,14 +70,18 @@ -365047.500+1745406.700 -363938.600+1744437.700 -363600.300+1744149.600 + -363010.000+1744408.000 -365035.500+1745150.700 + -363548.000+1743459.000 -362402.100+1743949.300 -361745.900+1743123.600 diff --git a/Maps/NZPN/PN_ACU.xml b/Maps/NZPN/PN_ACU.xml index bd44aa0..cebc2e5 100644 --- a/Maps/NZPN/PN_ACU.xml +++ b/Maps/NZPN/PN_ACU.xml @@ -89,11 +89,11 @@ -412842.400+1734844.400 -412037.800+1743906.600 -411059.800+1730351.500 + -411738.600+1732231.300 -411818.800+1732505.500 -411720.400+1744225.000 -410442.800+1744651.600 -411523.800+1730600.500 - -411738.600+1732231.300 -410636.800+1730042.500 -411703.700+1744601.100 -411418.800+1743843.600 @@ -159,11 +159,11 @@ -412842.400+1734844.400 -412037.800+1743906.600 -411059.800+1730351.500 + -411738.600+1732231.300 -411818.800+1732505.500 -411720.400+1744225.000 -410442.800+1744651.600 -411523.800+1730600.500 - -411738.600+1732231.300 -410636.800+1730042.500 -411703.700+1744601.100 -411418.800+1743843.600 diff --git a/Maps/NZPP/PP_ACU.xml b/Maps/NZPP/PP_ACU.xml index 1d27e9b..09e099e 100644 --- a/Maps/NZPP/PP_ACU.xml +++ b/Maps/NZPP/PP_ACU.xml @@ -2,27 +2,31 @@ - + -40.910642+174.987931/PP16T/-40.928889+175.000000/AGAXA - + AGAXA/FICAN/AVKEX - + + AGAXA/BRUDA + + + AGAXA/-40.958889+174.766389/KAMET - + -40.958889+174.766389/KAPTI - + -40.958889+174.766389/PP NDB - + AGAXA/WITBY @@ -33,6 +37,7 @@ AGAXA FICAN AVKEX + BRUDA KAMET KAPTI WITBY @@ -40,6 +45,7 @@ + + + IPKEP/GUDSA + KAMET/NOKIX @@ -83,6 +93,7 @@ GUDSA AVKEX PP401 + IPKEP KAMET KAPTI TPAPA @@ -92,6 +103,7 @@ + + + IPKEP/DABGU + KAMET/NOKIX/NILID @@ -215,6 +235,7 @@ AVKEX PP401 AKADU + IPKEP KAMET NOKIX KAPTI @@ -225,6 +246,7 @@ + + + WN16T/TAXUP/TAPAB/RUSPI/MATVU/DOGBI/GULUT + @@ -123,6 +127,7 @@ AGROR URBEM ATVEV + TAXUP PP NDB @@ -152,6 +157,9 @@ SABDA TANEN VANDA + TAPAB + RUSPI + MATVU ESMAB IGMUL KENJA @@ -163,6 +171,7 @@ + + + -41.318622+174.807458/WN34T/POLAX/OMLAS/ATRIM/DOVUL/GULUT + - -41.318622+174.807458/WN34T/GANJI/IPKEP + WN34T/GANJI/IPKEP @@ -503,6 +515,7 @@ URGEV/HANWU/IRTAG/VENAM + POLAX GANJI UPLUD URGEV @@ -512,6 +525,10 @@ WN34T + OMLAS + ATRIM + DOVUL + GULUT IPKEP UGARO ATVIN @@ -526,10 +543,7 @@ ATSUN OLSUS HHOOT - ATRIM - DOVUL GOPLU - GULUT KABKA KAMET KAPTI @@ -552,6 +566,7 @@ VENAM @@ -688,8 +687,7 @@ - - + @@ -7237,11 +7235,6 @@ RILEY REDOL/BASOS/ADLUP SUNGU - - GIXEL/EPDEX - AKMAD/NONAN/SAVLA - ATVOR/TIMJO - ATHOL @@ -7831,6 +7824,7 @@ RILEY IDONO/REDOG + IGABI MERAS OSNUM OVSAN/IGABI @@ -8233,12 +8227,6 @@ RILEY PERAS/PERIA - - PERIA - KAROA - PERAS - RUATO - RUATO/PERIA diff --git a/Maps/Airspace/ALL_RNAV.xml b/Maps/Airspace/ALL_RNAV.xml index 8cd2756..e9b0865 100644 --- a/Maps/Airspace/ALL_RNAV.xml +++ b/Maps/Airspace/ALL_RNAV.xml @@ -270,6 +270,9 @@ EKVIL OPAPA NR VOR + OTAHA + OPARE + STEED PERIA BESMO KAKIT @@ -279,7 +282,9 @@ MAMOD ATVOX URDAL + LIBKO PANGO + UPLIN BOLOR AROPA ELBOW @@ -361,6 +366,10 @@ FLAXX ABUOY BAZEN + OMANA + LEECH + OTUHI + BIRAX AVMAK GUNOM ANSIS @@ -455,13 +464,8 @@ BUDEN VATNA GUNDA - OTAHA - OPARE - STEED LUGDU SADUN - LIBKO - UPLIN VARMA UPDAL ELMAX @@ -481,8 +485,6 @@ MARKS WYTAK BAYES - OMANA - BIRAX BURKI WS408 UGSAP @@ -507,6 +509,8 @@ -39.640450+176.769780 -35.244333+173.907978 -35.270886+173.916278 + KT401 + KT501 MS603 MS818 MS572 @@ -584,6 +588,9 @@ EKVIL OPAPA NR VOR + OTAHA + OPARE + STEED PERIA BESMO KAKIT @@ -593,7 +600,9 @@ MAMOD ATVOX URDAL + LIBKO PANGO + UPLIN BOLOR AROPA ELBOW @@ -675,6 +684,10 @@ FLAXX ABUOY BAZEN + OMANA + LEECH + OTUHI + BIRAX AVMAK GUNOM ANSIS @@ -786,13 +799,8 @@ BUDEN VATNA GUNDA - OTAHA - OPARE - STEED LUGDU SADUN - LIBKO - UPLIN VARMA UPDAL ELMAX @@ -812,8 +820,6 @@ MARKS WYTAK BAYES - OMANA - BIRAX BURKI WS408 UGSAP @@ -1015,6 +1021,8 @@ ABUOY/FLAXX BAZEN/FLAXX OMANA/ADKES/WR601/-354611.550+1742128.170 + LEECH/OMANA + OTUHI/OMANA SF NDB/DUDAP/WR431/-354611.550+1742128.170 WR431/-354611.798+1742133.368 WR431/-354606.139+1742211.341 diff --git a/Maps/NZAR/AR_ACU.xml b/Maps/NZAR/AR_ACU.xml index f15790f..a30002d 100644 --- a/Maps/NZAR/AR_ACU.xml +++ b/Maps/NZAR/AR_ACU.xml @@ -83,6 +83,10 @@ AA VOR/RIKNA + + + IGABI/IDONO + MERAS/IDONO @@ -93,7 +97,7 @@ - OVSAN/IGABI/IDONO + OVSAN/IGABI @@ -107,15 +111,16 @@ AA VOR - MERAS + IGABI IDONO + MERAS OSNUM OVSAN - IGABI - - - KAROA/PERIA - - - - PERAS/PERIA - - - - RUATO/PERIA - - - - PERIA/-35.130615+173.490059 - RUATO/PERIA @@ -172,13 +155,15 @@ - + + KT501 + PERIA diff --git a/Maps/NZNE/NE_ACU.xml b/Maps/NZNE/NE_ACU.xml index 8966a63..8f241df 100644 --- a/Maps/NZNE/NE_ACU.xml +++ b/Maps/NZNE/NE_ACU.xml @@ -23,6 +23,7 @@ + LIBKO PANGO @@ -30,17 +31,15 @@ RIKDI - - LIBKO - + LIBKO/RIKDI/-36.667425+174.640756/-363929.318+1743911.189 PANGO/LIBKO @@ -75,6 +74,7 @@ + UPLIN BOLOR @@ -82,16 +82,14 @@ -36.597019+174.734392 - - UPLIN - + UPLIN/-36.597019+174.734392/-363915.379+1743929.750 BOLOR/UPLIN diff --git a/Maps/NZQN/QN_ACU.xml b/Maps/NZQN/QN_ACU.xml index 7ec9b39..b39ed2f 100644 --- a/Maps/NZQN/QN_ACU.xml +++ b/Maps/NZQN/QN_ACU.xml @@ -41,18 +41,6 @@ QN882/SUNGU - - - -45.016544+168.757728/GIXEL/EPDEX - - - - EPDEX/AKMAD - - - - EPDEX/ATVOR - -45.016544+168.757728/QN VOR/AGTAM/GIXEL @@ -74,10 +62,11 @@ - GIXEL/EPDEX + GIXEL/EPDEX/AKMAD + EPDEX/ATVOR @@ -131,12 +120,12 @@ BASOS ADLUP SUNGU - EPDEX AGTAM ENRAT ADKOS BIKOS LIBLA + EPDEX QN862 QN864 QN866 @@ -146,7 +135,6 @@ ANPOV QN VOR QN882 - EPDEX GIXEL IPNOR SAVLA diff --git a/Maps/NZWR/WR_ACU.xml b/Maps/NZWR/WR_ACU.xml index 8823c47..7c3749b 100644 --- a/Maps/NZWR/WR_ACU.xml +++ b/Maps/NZWR/WR_ACU.xml @@ -74,7 +74,12 @@ WR983 - + + OMANA + LEECH + OTUHI + BIRAX + ADKES @@ -82,21 +87,22 @@ MONSU - - OMANA - BIRAX - + OMANA/ADKES/WR601/-354611.550+1742128.170 + LEECH/OMANA + OTUHI/OMANA SF NDB/DUDAP/WR431/-354611.550+1742128.170 BIRAX/MONSU/WR983/-354611.550+1742128.170 @@ -172,24 +178,24 @@ WR983 - + + BIRAX + DUDAP MONSU - - BIRAX - + SF NDB/DUDAP/WR431/-354606.139+1742211.341 BIRAX/MONSU/WR983/-354606.139+1742211.341 @@ -199,24 +205,24 @@ WR983 - + + BIRAX + DUDAP MONSU - - BIRAX - + SF NDB/DUDAP/WR431/-354611.798+1742133.368 BIRAX/MONSU/WR983/-354611.798+1742133.368 @@ -226,24 +232,24 @@ WR983 - + + BIRAX + DUDAP MONSU - - BIRAX - + SF NDB/DUDAP/WR431/-354625.831+1742140.511 BIRAX/MONSU/WR983/-354625.831+1742140.511 From 9e7b6c76704bca0c602645d4dc12f79b05814ce8 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Thu, 10 Nov 2022 12:39:29 +1300 Subject: [PATCH 09/50] Bump Changelog --- .github/changelogs/2022.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/changelogs/2022.md b/.github/changelogs/2022.md index 7caf52c..50c52ca 100644 --- a/.github/changelogs/2022.md +++ b/.github/changelogs/2022.md @@ -229,18 +229,28 @@ This cycle is a major release for the Dataset, with the removal and replacement #### ANR Update **Visual Reporting Points (VRPs)** + - The following VRPs have been established: Wainui Shed, Red Horn, Sadler Point, Gulf Harbour Marina, Albany Stadium, Cow Sheds, Mackenzie Pass, Glendhu Bay, Cardrona Pines, Queensberry Ponds, Albert Town Bridge and Mou Waho. - The following VRPs have been disestablished: Matukituki River Mouth and Queensberry. + - These have been updated in the VRPs for LittleNavMap release, and [can be downloaded here](https://github.com/vatnz-dev/vrpsForLittleNavMap/releases). + +**Standard Route Clearances** + + - The following Standard Routes have been updated: `TUCH1`, `TUWN2`, `WNAA5`, `WNCH4`, `WNDN7`, `WNNV4`, `WNQN3`, `WNQN4`, `WNTU2`, `WNWR2`, `WNWP3`. + - These have been updated in the Standard Route tool, and will update next time you launch the vatSys plugin, or standalone application. **Auckland** + - Auckland CTA/C NZA247 replaced by NZA246. - Auckland CTA/D NZA231 replaced by NZA232. + **Paraparaumu** - The following STARs have been resquenced due to changes in level restrictions: `AGAXA 4`, `GUGAK 5`. - The following STARs have been added: `IPKEP 1H`, `IPKEP 1G`. **Wellington** + - Wellington CTR/C NZA654 replaced by NZA652. - Wellington CTA/C NZA633, NZA634, and NZA638 boundaries amended. - Wellington CTA/C airspace NZA643 established. @@ -249,9 +259,6 @@ This cycle is a major release for the Dataset, with the removal and replacement - The original POLAX and DOGBI departures have been added to the dataset as `CTDPOL` and `CTDDOG`, to be used as a fallback for CTD 2022. **Other Changes** - - MOAs NZM301 and NZM304 boundaries amended. - - A tonne of new ATS routes, reviews and deletions. -#### Dataset Updates - -**Changes** \ No newline at end of file + - MOAs NZM301 and NZM304 boundaries amended. + - A tonne of new ATS routes, reviews and deletions. \ No newline at end of file From 9cb2f9e9d6f75dad524596f4d91bb0ceea121fcb Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Wed, 30 Nov 2022 22:52:29 +1300 Subject: [PATCH 10/50] Update Profile.xml --- Profile.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Profile.xml b/Profile.xml index 1f46d05..4983865 100644 --- a/Profile.xml +++ b/Profile.xml @@ -1,6 +1,6 @@ - + From bfe478b022abef1aef3200d23ed09003820308f5 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Sat, 3 Dec 2022 15:23:49 +1300 Subject: [PATCH 11/50] fix: Remove UPROG/AGROR procedure mixing. Bump to 2212b. --- .github/changelogs/2022.md | 8 ++++- Airspace.xml | 12 +++++--- Maps/Airspace/ALL_RNAV.xml | 12 ++++---- Maps/NZKT/KT_ACU.xml | 16 ---------- Maps/NZNS/NS_ACU.xml | 36 ++++++++++------------ Maps/NZWN/WN_ACU.xml | 62 +++++++++++++++++++++----------------- Profile.xml | 2 +- 7 files changed, 72 insertions(+), 76 deletions(-) diff --git a/.github/changelogs/2022.md b/.github/changelogs/2022.md index 1c4fc51..6fe1736 100644 --- a/.github/changelogs/2022.md +++ b/.github/changelogs/2022.md @@ -261,4 +261,10 @@ 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. \ No newline at end of file + - 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. \ No newline at end of file diff --git a/Airspace.xml b/Airspace.xml index 66f267b..87bd2db 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -862,6 +862,7 @@ + @@ -7427,10 +7428,6 @@ RILEY URBEM/AGROR AKTAN ATSUN - ADLAK/UPROG/ATVIN - ADLAK/UPROG/MELAD/KAMET - ADLAK/UPROG/MELAD/KAPTI - ADLAK/UPROG/MELAD/PP NDB IDSIR/VENAM @@ -7514,6 +7511,13 @@ RILEY OLSUS/HHOOT/ATRIM/DOVUL/TANEN OLSUS/HHOOT/ATRIM/DOVUL/VANDA + + URBEM/AGROR/ADLAK/UPROG + ATVIN + MELAD/KAMET + MELAD/KAPTI + MELAD/PP NDB + GANJI/URGEV AKTAN diff --git a/Maps/Airspace/ALL_RNAV.xml b/Maps/Airspace/ALL_RNAV.xml index e9b0865..fad061f 100644 --- a/Maps/Airspace/ALL_RNAV.xml +++ b/Maps/Airspace/ALL_RNAV.xml @@ -292,10 +292,13 @@ AKINA MILLA OHITI + ELMAX KAPUA LIKMA + OTLIT MIBEV QUAIL + TUMGO ESNED KAGRU EGAMU @@ -468,9 +471,6 @@ SADUN VARMA UPDAL - ELMAX - OTLIT - TUMGO PAMOA ORBEL OLNAN @@ -610,10 +610,13 @@ AKINA MILLA OHITI + ELMAX KAPUA LIKMA + OTLIT MIBEV QUAIL + TUMGO ESNED KAGRU EGAMU @@ -803,9 +806,6 @@ SADUN VARMA UPDAL - ELMAX - OTLIT - TUMGO PAMOA ORBEL OLNAN diff --git a/Maps/NZKT/KT_ACU.xml b/Maps/NZKT/KT_ACU.xml index cc01de6..4338cc7 100644 --- a/Maps/NZKT/KT_ACU.xml +++ b/Maps/NZKT/KT_ACU.xml @@ -140,22 +140,6 @@ PERAS/PERIA - - - KAROA/PERIA - - - - PERAS/PERIA - - - - RUATO/PERIA - - - - PERIA/-35.130614+173.490059 - RUATO/PERIA diff --git a/Maps/NZNS/NS_ACU.xml b/Maps/NZNS/NS_ACU.xml index 2c6f96d..026e7bc 100644 --- a/Maps/NZNS/NS_ACU.xml +++ b/Maps/NZNS/NS_ACU.xml @@ -169,10 +169,13 @@ + ELMAX KAPUA LIKMA + OTLIT MIBEV QUAIL + TUMGO ESNED @@ -182,11 +185,7 @@ ISLOP - - ELMAX - OTLIT - TUMGO - + ELMAX/NOPEM/ORUBA/-411805.029+1731308.119 KAPUA/ELMAX LIKMA/ELMAX @@ -198,17 +197,17 @@ @@ -377,6 +376,7 @@ + ELMAX KAPUA LIKMA @@ -385,19 +385,17 @@ NOPEM - - ELMAX - + ELMAX/NOPEM/ORUBA/-411732.021+1731346.060 KAPUA/ELMAX LIKMA/ELMAX @@ -407,6 +405,7 @@ + ELMAX KAPUA LIKMA @@ -415,19 +414,17 @@ NOPEM - - ELMAX - + ELMAX/NOPEM/ORUBA/-411746.072+1731301.240 KAPUA/ELMAX LIKMA/ELMAX @@ -437,6 +434,7 @@ + ELMAX KAPUA LIKMA @@ -445,19 +443,17 @@ NOPEM - - ELMAX - + ELMAX/NOPEM/ORUBA/-411743.631+1731327.059 KAPUA/ELMAX LIKMA/ELMAX diff --git a/Maps/NZWN/WN_ACU.xml b/Maps/NZWN/WN_ACU.xml index f8fdaa2..c242136 100644 --- a/Maps/NZWN/WN_ACU.xml +++ b/Maps/NZWN/WN_ACU.xml @@ -3,7 +3,7 @@ - -41.334939+174.806358/URBEM/AGROR + -41.334939+174.806358/WN34T/URBEM/AGROR @@ -13,22 +13,6 @@ AGROR/ATSUN - - - AGROR/ADLAK/UPROG/ATVIN - - - - UPROG/MELAD/KAMET - - - - MELAD/KAPTI - - - - MELAD/PP NDB - AGROR/IDSIR/VENAM @@ -123,35 +107,54 @@ WN16T/-41.367520+174.804020/-41.493900+174.823560 + + + AGROR/ADLAK/UPROG + + + + UPROG/ATVIN + + + + UPROG/MELAD/KAMET + + + + MELAD/KAPTI + + + + MELAD/PP NDB + - AGROR URBEM + AGROR ATVEV TAXUP + ADLAK PP NDB + WN34T AKTAN ATSUN - ADLAK - UPROG - ATVIN - MELAD - KAMET - KAPTI IDSIR VENAM WN16T IRSOG EKVUB + ATVIN UKANO ELGIP DOGBI GOPLU GULUT KABKA + KAMET + KAPTI LUBSI RUSIL SABDA @@ -167,6 +170,8 @@ UPVAP OBGID IDVAL + UPROG + MELAD diff --git a/Profile.xml b/Profile.xml index 4983865..434a9c4 100644 --- a/Profile.xml +++ b/Profile.xml @@ -1,6 +1,6 @@ - + From 75509be253eaab6fbc7bd9639ea3239ce56811ec Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Sat, 3 Dec 2022 15:32:44 +1300 Subject: [PATCH 12/50] feat: Add dedicated POLAX/DOGBI fallback dep maps. --- Maps/NZWN/NZWN 16 CTDDOG 1Q map.xml | 23 +++++++++++++++++++++++ Maps/NZWN/NZWN 34 CTDPOL 1P map.xml | 22 ++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 Maps/NZWN/NZWN 16 CTDDOG 1Q map.xml create mode 100644 Maps/NZWN/NZWN 34 CTDPOL 1P map.xml diff --git a/Maps/NZWN/NZWN 16 CTDDOG 1Q map.xml b/Maps/NZWN/NZWN 16 CTDDOG 1Q map.xml new file mode 100644 index 0000000..0d0ab53 --- /dev/null +++ b/Maps/NZWN/NZWN 16 CTDDOG 1Q map.xml @@ -0,0 +1,23 @@ + + + + + + -41.334939+174.806358/WN16T/TAXUP/TAPAB/RUSPI/MATVU/DOGBI/GULUT + + + TAXUP + + + WN16T + TAPAB + RUSPI + MATVU + DOGBI + GULUT + + + + \ No newline at end of file diff --git a/Maps/NZWN/NZWN 34 CTDPOL 1P map.xml b/Maps/NZWN/NZWN 34 CTDPOL 1P map.xml new file mode 100644 index 0000000..35f1f35 --- /dev/null +++ b/Maps/NZWN/NZWN 34 CTDPOL 1P map.xml @@ -0,0 +1,22 @@ + + + + + + -41.318622+174.807458/WN34T/POLAX/OMLAS/ATRIM/DOVUL/GULUT + + + POLAX + + + WN34T + OMLAS + ATRIM + DOVUL + GULUT + + + + \ No newline at end of file From 8f51668c405b8f5b4d0efb72c82e77a545486d64 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Sat, 3 Dec 2022 19:57:10 +1300 Subject: [PATCH 13/50] fix: Small procedure name changes to WN --- .github/changelogs/2022.md | 1 + Airspace.xml | 12 ++++++------ Maps/NZWN/WN_ACU.xml | 23 +++++++++-------------- Profile.xml | 2 +- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/changelogs/2022.md b/.github/changelogs/2022.md index 976df78..771c33a 100644 --- a/.github/changelogs/2022.md +++ b/.github/changelogs/2022.md @@ -268,4 +268,5 @@ This cycle is a major release for the Dataset, with the removal and replacement #### Fixes - Accidentally mixed the `UPROG 1Q` with the `AGROR 1Q`. This change separates these two procedures out. + - Fixed a small error in the `IDVAL 1Q`. diff --git a/Airspace.xml b/Airspace.xml index 87bd2db..4b4e1e1 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -867,7 +867,7 @@ - + @@ -891,7 +891,7 @@ - + @@ -7452,7 +7452,7 @@ RILEY POLAX/OMLAS/ATRIM/DOVUL/GULUT - URBEM + URBEM/IDVAL ESMAB/IGMUL KENJA/EMSUT/LUBSI ESMAB/IGMUL/UPVAP @@ -8782,7 +8782,7 @@ RILEY LADIT/EMRUP/TURAK/RONGO/UMAGA - + LADIT/UPTUL/PAHWA/WITBY @@ -8815,8 +8815,8 @@ RILEY SULRI/MEEDA - - TPAPA/FICAN/TURBY/RIPPA/JONAH/UMAGA + + TPAPA/BRUDA/PEGPU/UGTOV/UKLEB/RIPPA/JONAH/UMAGA TPAPA/BRUDA/HUWIT/WITBY diff --git a/Maps/NZWN/WN_ACU.xml b/Maps/NZWN/WN_ACU.xml index c242136..a7bd360 100644 --- a/Maps/NZWN/WN_ACU.xml +++ b/Maps/NZWN/WN_ACU.xml @@ -75,14 +75,15 @@ + URBEM/IDVAL - URBEM/ESMAB/IGMUL + IDVAL/ESMAB/IGMUL - URBEM/KENJA/EMSUT/LUBSI + IDVAL/KENJA/EMSUT/LUBSI @@ -94,11 +95,9 @@ - IDVAL/ESMAB - IDVAL/KENJA @@ -163,13 +162,13 @@ TAPAB RUSPI MATVU + IDVAL ESMAB IGMUL KENJA EMSUT UPVAP OBGID - IDVAL UPROG MELAD @@ -177,7 +176,6 @@ AGROR ATVEV GULUT - URBEM IDVAL UPROG AKTAN @@ -215,7 +213,7 @@ DOGAD/WN406/LADIT/UPTUL/PAHWA - + @@ -523,7 +521,9 @@ POLAX GANJI + COUBY UPLUD + LAXIV URGEV @@ -545,7 +545,6 @@ NULKO UPVAP UDOSO - COUBY ATSUN OLSUS HHOOT @@ -560,7 +559,6 @@ SABDA TANEN VANDA - LAXIV IRNIL GAMJU AKTAN @@ -646,12 +644,11 @@ - - TPAPA/FICAN/TURBY/RIPPA/JONAH + + TPAPA/BRUDA/PEGPU/UGTOV/UKLEB/RIPPA/JONAH - TPAPA/BRUDA/PEGPU/UGTOV/UKLEB/RIPPA @@ -683,8 +680,6 @@ KRAKA SULRI TPAPA - FICAN - TURBY BRUDA PEGPU UGTOV diff --git a/Profile.xml b/Profile.xml index 434a9c4..a8dd88f 100644 --- a/Profile.xml +++ b/Profile.xml @@ -1,6 +1,6 @@ - + From 855a8537cdbefc044a9fc28c5960437e78d00793 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Thu, 15 Dec 2022 15:03:45 +1300 Subject: [PATCH 14/50] 2212d - Remove CTD Procedures and Maps --- .github/changelogs/2022.md | 13 ++++++++++++- Airspace.xml | 8 -------- Maps/NZWN/NZWN 16 CTDDOG 1Q map.xml | 23 ----------------------- Maps/NZWN/NZWN 34 CTDPOL 1P map.xml | 22 ---------------------- Maps/NZWN/WN_ACU.xml | 27 ++++++--------------------- Profile.xml | 2 +- 6 files changed, 19 insertions(+), 76 deletions(-) delete mode 100644 Maps/NZWN/NZWN 16 CTDDOG 1Q map.xml delete mode 100644 Maps/NZWN/NZWN 34 CTDPOL 1P map.xml diff --git a/.github/changelogs/2022.md b/.github/changelogs/2022.md index 53f93d9..15af960 100644 --- a/.github/changelogs/2022.md +++ b/.github/changelogs/2022.md @@ -265,9 +265,20 @@ This cycle is a major release for the Dataset, with the removal and replacement ### Revision B -#### Fixes +#### Changes - Accidentally mixed the `UPROG 1Q` with the `AGROR 1Q`. This change separates these two procedures out. - Fixed a small error in the `IDVAL 1Q`. +### Revision C + +#### Changes + +A silent release to amend some Wellington STARs. + +### Revision D + +#### Changes + + - Removal of the `POLAX` and `DOGBI` departures that were retained for CTD. This also removes the special map layers. diff --git a/Airspace.xml b/Airspace.xml index 4b4e1e1..a1ac640 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -858,7 +858,6 @@ - @@ -876,7 +875,6 @@ - @@ -7445,12 +7443,6 @@ RILEY UKANO/ELGIP/DOGBI/TANEN UKANO/ELGIP/DOGBI/VANDA - - TAXUP/TAPAB/RUSPI/MATVU/DOGBI/GULUT - - - POLAX/OMLAS/ATRIM/DOVUL/GULUT - URBEM/IDVAL ESMAB/IGMUL diff --git a/Maps/NZWN/NZWN 16 CTDDOG 1Q map.xml b/Maps/NZWN/NZWN 16 CTDDOG 1Q map.xml deleted file mode 100644 index 0d0ab53..0000000 --- a/Maps/NZWN/NZWN 16 CTDDOG 1Q map.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - -41.334939+174.806358/WN16T/TAXUP/TAPAB/RUSPI/MATVU/DOGBI/GULUT - - - TAXUP - - - WN16T - TAPAB - RUSPI - MATVU - DOGBI - GULUT - - - - \ No newline at end of file diff --git a/Maps/NZWN/NZWN 34 CTDPOL 1P map.xml b/Maps/NZWN/NZWN 34 CTDPOL 1P map.xml deleted file mode 100644 index 35f1f35..0000000 --- a/Maps/NZWN/NZWN 34 CTDPOL 1P map.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - -41.318622+174.807458/WN34T/POLAX/OMLAS/ATRIM/DOVUL/GULUT - - - POLAX - - - WN34T - OMLAS - ATRIM - DOVUL - GULUT - - - - \ No newline at end of file diff --git a/Maps/NZWN/WN_ACU.xml b/Maps/NZWN/WN_ACU.xml index dffdb14..bc347bd 100644 --- a/Maps/NZWN/WN_ACU.xml +++ b/Maps/NZWN/WN_ACU.xml @@ -69,10 +69,6 @@ DOGBI/VANDA - - - WN16T/TAXUP/TAPAB/RUSPI/MATVU/DOGBI/GULUT - URBEM/IDVAL @@ -130,7 +126,6 @@ URBEM AGROR ATVEV - TAXUP ADLAK @@ -159,9 +154,6 @@ SABDA TANEN VANDA - TAPAB - RUSPI - MATVU IDVAL ESMAB IGMUL @@ -169,14 +161,12 @@ EMSUT UPVAP OBGID - IDVAL UPROG MELAD - - - -41.318622+174.807458/WN34T/POLAX/OMLAS/ATRIM/DOVUL/GULUT - - WN34T/GANJI/IPKEP + -41.318622+174.807458/WN34T/GANJI/IPKEP @@ -520,7 +507,6 @@ URGEV/HANWU/IRTAG/VENAM - POLAX GANJI COUBY UPLUD @@ -532,10 +518,6 @@ WN34T - OMLAS - ATRIM - DOVUL - GULUT IPKEP UGARO ATVIN @@ -549,7 +531,10 @@ ATSUN OLSUS HHOOT + ATRIM + DOVUL GOPLU + GULUT KABKA KAMET KAPTI @@ -571,7 +556,6 @@ VENAM @@ -219,7 +219,7 @@ - + @@ -264,13 +264,10 @@ - - - @@ -417,14 +414,20 @@ - - + + + + + + - + + + @@ -462,10 +465,10 @@ - + - + @@ -515,7 +518,7 @@ - + @@ -764,16 +767,16 @@ - + - + - + - + @@ -911,7 +914,7 @@ - + @@ -921,11 +924,11 @@ - - + + - + @@ -935,7 +938,7 @@ - + @@ -955,12 +958,14 @@ + + @@ -969,25 +974,10 @@ - - - - - - - - - - - - - - - - - - + + + @@ -6893,8 +6883,11 @@ RILEY PORUT/SW VOR TOMID - + + MO552/GULAN + MO552/GULAN MO552/GULAN + MO552/GULAN AFTON ANOPA ENKUV @@ -6946,7 +6939,7 @@ RILEY IGDIL/ATRUG/HARVO - + IDMAT/SEGMI/RUVMO/UBSUK/HARVO @@ -7015,7 +7008,7 @@ RILEY ANPAR/DUMIK - + SALIR/DAZSA/IDNIM NESTA/BISEB CONOR @@ -7332,7 +7325,7 @@ RILEY PATMO/UBSET NOBAR - + BENVU/MARKO BENVU/MARKO BENVU/MARKO @@ -7540,22 +7533,23 @@ RILEY IRMUV - + BAYES - + BAYES BAYES AA VOR LAKES + LUPRU OMLEN - + WYTAK - + WYTAK @@ -7598,6 +7592,12 @@ RILEY SF NDB + + KAKET + + + KAKET + OVTAP OBKIT @@ -7791,7 +7791,7 @@ RILEY PERAS SF NDB - + UKAPA/SHILI/MUDEE/UDUMO KK NDB PERAS @@ -8011,7 +8011,7 @@ RILEY REPAP/ABVIM LALAP/CH789 - + AKLAR/BIPUV/LOSKO/AKDAS/BIGAR/ESKAT @@ -8056,9 +8056,6 @@ RILEY RILEY/PAKSA - - DABIP/CREEK - CREEK/UKLIP @@ -8083,15 +8080,9 @@ RILEY KOPUA/XEPEP/EWOOD - - KEEPA/OTOKO - OTOKO/UKLIP - - TG NDB/WARIK - WARIK/UKLIP @@ -8241,7 +8232,7 @@ RILEY SF NDB/PANGO - + BUGNO/ISPAG/UPDAL @@ -8842,7 +8833,7 @@ RILEY AA VOR/GUTLA/OMKOL/WYTAK - + AA VOR/IGOLF @@ -8925,24 +8916,6 @@ RILEY KAKET/GUNOM - - ISKIK/ENPEV - ISKIK/ENPEV - ISKIK/ENPEV - ISKIK/ENPEV - - - MAGEX/WT734/WT652/AGPUM - MAGEX/WT734/WT652/AGPUM - MAGEX/WT734/WT652/AGPUM - MAGEX/WT734/WT652/AGPUM - - - MASDA/WT576/GOVTI - MASDA/WT576/GOVTI - MASDA/WT576/GOVTI - MASDA/WT576/GOVTI - TENUR/ADGAT diff --git a/Maps/NZAA/AA_ACU.xml b/Maps/NZAA/AA_ACU.xml index 46227f3..9a90bfb 100644 --- a/Maps/NZAA/AA_ACU.xml +++ b/Maps/NZAA/AA_ACU.xml @@ -485,16 +485,16 @@ UKAPA/SHILI/AKBAM - + - + - + - + SHILI/MUDEE/UDUMO diff --git a/Maps/NZDN/DN_ACU.xml b/Maps/NZDN/DN_ACU.xml index 6878295..8822a66 100644 --- a/Maps/NZDN/DN_ACU.xml +++ b/Maps/NZDN/DN_ACU.xml @@ -314,7 +314,7 @@ - + AKLAR/BIPUV/LOSKO/AKDAS/BIGAR/ESKAT diff --git a/Maps/NZGS/GS_ACU.xml b/Maps/NZGS/GS_ACU.xml index e747dd0..d10db67 100644 --- a/Maps/NZGS/GS_ACU.xml +++ b/Maps/NZGS/GS_ACU.xml @@ -64,10 +64,6 @@ - - - DABIP/CREEK - ELMER/EWOOD @@ -84,44 +80,24 @@ KOPUA/XEPEP - - - KEEPA/OTOKO - - - - TG NDB/WARIK - - CREEK EWOOD - OTOKO - WARIK GS VOR - TG NDB - DABIP ELMER XEPEP HAWKE KOPUA - KEEPA diff --git a/Maps/NZMO/MO_ACU.xml b/Maps/NZMO/MO_ACU.xml index 7fd49d8..ed8da07 100644 --- a/Maps/NZMO/MO_ACU.xml +++ b/Maps/NZMO/MO_ACU.xml @@ -1,5 +1,42 @@  + + + + -45.534492+167.662997/MO552/GULAN + + + + GULAN/AFTON + + + + GULAN/ANOPA + + + + GULAN/ENKUV + + + + GULAN/SUNGU + + + MO552 + GULAN + AFTON + ANOPA + ENKUV + SUNGU + + + @@ -87,6 +124,80 @@ ENSOV + + + + -45.538742+167.648619/MO552/GULAN + + + + GULAN/AFTON + + + + GULAN/ANOPA + + + + GULAN/ENKUV + + + + GULAN/SUNGU + + + MO552 + GULAN + AFTON + ANOPA + ENKUV + SUNGU + + + + + + + -45.528525+167.643922/MO552/GULAN + + + + GULAN/AFTON + + + + GULAN/ANOPA + + + + GULAN/ENKUV + + + + GULAN/SUNGU + + + MO552 + GULAN + AFTON + ANOPA + ENKUV + SUNGU + + + -444305.100+1675108.200 diff --git a/Maps/NZNP/NP_ACU.xml b/Maps/NZNP/NP_ACU.xml index cf0e86c..ea256e1 100644 --- a/Maps/NZNP/NP_ACU.xml +++ b/Maps/NZNP/NP_ACU.xml @@ -223,7 +223,7 @@ MUMOX/VELGA - + NP23T/-39.025278+174.115000/IDMAT/SEGMI/RUVMO/UBSUK/HARVO @@ -332,7 +332,7 @@ - + BUGNO/ISPAG/UPDAL diff --git a/Maps/NZNS/NS_ACU.xml b/Maps/NZNS/NS_ACU.xml index 026e7bc..b180d9c 100644 --- a/Maps/NZNS/NS_ACU.xml +++ b/Maps/NZNS/NS_ACU.xml @@ -6,19 +6,19 @@ -41.292228+173.229461/NS02T/NS20T/-41.255556+173.258889/RIKRU/DUMIK - + -41.255556+173.258889/SALIR/DAZSA/IDNIM - + IDNIM/NESTA/BISEB - + IDNIM/CONOR - + diff --git a/Maps/NZWP/WP_ACU.xml b/Maps/NZWP/WP_ACU.xml index eaca040..de57707 100644 --- a/Maps/NZWP/WP_ACU.xml +++ b/Maps/NZWP/WP_ACU.xml @@ -2,11 +2,12 @@ - + -36.785153+174.639053/WP03T/BAYES + -36.785153+174.639053/WP21T/BAYES @@ -16,6 +17,10 @@ BAYES/LAKES + + + BAYES/LUPRU + BAYES/OMLEN @@ -26,13 +31,16 @@ WP03T BAYES + WP21T LAKES + LUPRU OMLEN @@ -190,7 +198,7 @@ - + -36.796181+174.620886/WP21T/WYTAK @@ -216,12 +224,14 @@ WYTAK/OMLEN + + WYTAK + AA VOR WP21T - WYTAK KAPAI LIMES KANVI @@ -392,7 +402,7 @@ - + -36.785733+174.641011/WP08T/-36.789167+174.694167/-36.706111+174.770833/BAYES @@ -405,7 +415,7 @@ - + AA VOR/IGOLF @@ -448,7 +458,7 @@ - + -36.783758+174.623467/WP26T/-36.788333+174.692500/-36.703611+174.772222/WYTAK diff --git a/Maps/NZWT/WT_ACU.xml b/Maps/NZWT/WT_ACU.xml index be2577b..0bc7faa 100644 --- a/Maps/NZWT/WT_ACU.xml +++ b/Maps/NZWT/WT_ACU.xml @@ -3,7 +3,7 @@ - -36.825625+175.688550/WT04T/WT22T/OVTAP + -36.825625+175.688550/WT04T/OVTAP @@ -13,10 +13,11 @@ OVTAP/UGSAP + + OVTAP + WT04T - WT22T - OVTAP OBKIT UGSAP @@ -26,41 +27,6 @@ UGSAP - - - - ISKIK/ENPEV - - - - MAGEX/WT734/WT652/AGPUM - - - - MASDA/WT576/GOVTI - - - ENPEV - AGPUM - GOVTI - - - ISKIK - MAGEX - WT734 - WT652 - MASDA - WT576 - - - @@ -91,41 +57,6 @@ UGSAP - - - - ISKIK/ENPEV - - - - MAGEX/WT734/WT652/AGPUM - - - - MASDA/WT576/GOVTI - - - ENPEV - AGPUM - GOVTI - - - ISKIK - MAGEX - WT734 - WT652 - MASDA - WT576 - - - @@ -156,41 +87,6 @@ UGSAP - - - - ISKIK/ENPEV - - - - MAGEX/WT734/WT652/AGPUM - - - - MASDA/WT576/GOVTI - - - ENPEV - AGPUM - GOVTI - - - ISKIK - MAGEX - WT734 - WT652 - MASDA - WT576 - - - @@ -221,41 +117,6 @@ UGSAP - - - - ISKIK/ENPEV - - - - MAGEX/WT734/WT652/AGPUM - - - - MASDA/WT576/GOVTI - - - ENPEV - AGPUM - GOVTI - - - ISKIK - MAGEX - WT734 - WT652 - MASDA - WT576 - - - From 4bddb7c17ef28641b8952cf9128a7af078d8c1a3 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Tue, 27 Dec 2022 23:23:38 +1300 Subject: [PATCH 16/50] feat: Fix OCR/RAN/BAY/AA TMA/HN TMA lateral bounds --- .github/changelogs/2023.md | 10 +++++- Maps/Airspace/ENR Sectors.xml | 63 ++++++++--------------------------- Maps/Airspace/TMA Sectors.xml | 54 +++++------------------------- 3 files changed, 32 insertions(+), 95 deletions(-) diff --git a/.github/changelogs/2023.md b/.github/changelogs/2023.md index 2bd5c4b..2c0bab4 100644 --- a/.github/changelogs/2023.md +++ b/.github/changelogs/2023.md @@ -24,4 +24,12 @@ We have a new procedure checker, which cross-checks the procedures in the databa - NZNP `BUGNO1B` and `HARVO1Q` had the incorrect revision number. - Spelling error in the NZNS `IDNEM2P` SID name. - NZWP `BAYES` and `WYTAK` open SIDs had the incorrect revision number. - - Removal of the NZWT SIDs. \ No newline at end of file + - Removal of the NZWT SIDs. + +**ENR and TMA Sector Bounds** + +We have made the following changes to ENR sectors: + - AA TMA: Added `DAVEE` TMA step on the border with RAN. + - HN TMA: Realigned the eastern border to the RAN/BAY border, and extended further south. + - OCR/RAN/BAY: Realigned border to better match surrounding ENRs and TMAs. + - ENR and TMA sector maps updated. \ No newline at end of file diff --git a/Maps/Airspace/ENR Sectors.xml b/Maps/Airspace/ENR Sectors.xml index 6b9e8dd..381d82f 100644 --- a/Maps/Airspace/ENR Sectors.xml +++ b/Maps/Airspace/ENR Sectors.xml @@ -4,56 +4,34 @@ -390738.032+1713321.982/ --385155.489+1711823.997/ +-390738.032+1713321.982/ -383652.034+1710707.458/ --382105.251+1705738.593/ -380442.756+1705000.757/ --374752.362+1704416.310/ -373042.007+1704026.636/ --371319.693+1703832.181/ -365553.417+1703832.490/ --363831.115+1704026.251/ -362120.605+1704411.346/ --360429.530+1704944.901/ -354805.314+1705703.339/ --353215.108+1710602.430/ -351705.755+1711637.346/ --350243.744+1712842.715/ -344915.175+1714212.663/ --343645.730+1715700.871/ -342520.636+1721300.618/ --341504.645+1723004.825/ -340602.003+1724806.102/ --335816.434+1730656.788/ -335151.121+1732628.993/ --334648.687+1734634.639/ -334311.188+1740705.496/ --334100.096+1742753.221/ -334016.300+1744849.400/ --334100.096+1750945.579/ -334311.188+1753033.304/ --334648.687+1755104.161/ -335151.121+1761109.807/ --335816.434+1763042.012/ -340602.003+1764932.698/ --341504.645+1770733.975/ -342520.636+1772438.182/ --343645.730+1774037.929/ -344915.175+1775526.137/ --350243.744+1780856.085/ -351705.755+1782101.454/ --353215.108+1783136.370/ -354805.314+1784035.461/ --360429.530+1784753.899/ -362120.605+1785327.454/ --363831.115+1785712.549/ -365553.417+1785906.310/ --371319.693+1785906.619/ -373042.007+1785712.164/ -373230.000+1785609.000/ --365900.000+1754715.004/ +-365931.000+1754510.000/ -371524.005+1754144.000/ --373017.003+1752253.299/ +-373047.664+1752322.344/ -375610.000+1754540.000/ -385718.256+1753437.322/ -385518.008+1751849.003/ @@ -62,7 +40,7 @@ -390738.032+1713321.982 --373017.003+1752253.299/ +-373047.664+1752322.344/ -375610.000+1754540.000/ -385718.256+1753437.322/ -385518.008+1751849.003/ @@ -70,17 +48,18 @@ -390026.071+1741102.159/ -390231.000+1733239.000/ -373115.000+1740755.000/ --373439.051+1741219.562/ --373703.573+1741614.302/ -373911.194+1742024.288/ --374100.919+1742447.590/ -374231.890+1742922.165/ --374254.900+1742957.833/ --374925.003+1745823.995/ --373017.003+1752253.299 +-374434.874+1743856.508/ +-374516.301+1744849.399/ +-374439.768+1745832.664/ +-373424.024+1745852.212/ +-373342.624+1750929.700/ +-373047.628+1751914.988/ +-373047.664+1752322.344 --365900.000+1754715.004/ +-365931.000+1754510.000/ -373230.000+1785609.000/ -382700.000+1794359.995/ -393948.000+1785528.006/ @@ -92,9 +71,9 @@ -390555.000+1761939.994/ -385718.256+1753437.322/ -375610.000+1754540.000/ --373017.003+1752253.299/ +-373047.664+1752322.344/ -371524.005+1754144.000/ --365900.000+1754715.004 +-365931.000+1754510.000 -421219.508+1755312.818/ @@ -118,25 +97,15 @@ -480854.985+1681559.987/ -455459.994+1651800.000/ -453013.003+1654842.991/ --450756.160+1654320.832/ -445635.871+1654315.205/ --444517.814+1654433.072/ -443407.095+1654713.035/ --442308.718+1655113.127/ -441227.547+1655630.837/ --440208.278+1660303.155/ -435215.409+1661046.605/ --434253.211+1661937.284/ -433405.701+1662930.902/ --432556.625+1664022.815/ -431829.432+1665208.064/ --431147.256+1670441.408/ -430552.901+1671757.360/ --430048.828+1673150.221/ -425637.138+1674614.112/ --425319.565+1680103.003/ -425057.466+1681610.746/ --424931.815+1683131.106/ -424903.200+1684657.790/ -424916.997+1685447.894/ -413400.000+1701435.005/ @@ -168,13 +137,9 @@ -420645.000+1720150.000/ -413400.000+1701435.005/ -412527.005+1702324.000/ --405745.212+1702504.710/ -404036.022+1702913.548/ --402346.853+1703516.936/ -400725.064+1704310.833/ --395137.731+1705250.543/ -393631.609+1710410.771/ --392213.092+1711705.684/ -390848.177+1713128.965/ -390738.100+1713321.701 diff --git a/Maps/Airspace/TMA Sectors.xml b/Maps/Airspace/TMA Sectors.xml index 74059c8..1308782 100644 --- a/Maps/Airspace/TMA Sectors.xml +++ b/Maps/Airspace/TMA Sectors.xml @@ -5,74 +5,44 @@ -365906.720+1734005.304/ -365850.088+1735007.512/ --365359.050+1734836.851/ --365031.244+1734804.933/ -364702.004+1734755.797/ --364332.922+1734809.460/ -364005.587+1734845.768/ --363641.572+1734944.395/ -363322.420+1735104.848/ --363009.635+1735246.476/ -362704.668+1735448.468/ --362408.911+1735709.870/ -362123.681+1735949.583/ --361850.218+1740246.382/ -361629.669+1740558.917/ -361515.408+1740804.272/ -360118.192+1741302.280/ --355853.592+1742152.965/ -355757.537+1742708.840/ -355727.576+1743109.228/ -360707.788+1743715.924/ --360721.499+1744211.415/ -360748.595+1744628.444/ --360833.532+1745041.645/ -360935.976+1745449.136/ --361055.464+1745849.075/ -361231.404+1750239.671/ --361423.083+1750619.199/ -361629.669+1750946.011/ --361850.218+1751258.546/ -362013.632+1751443.728/ --362320.667+1752052.857/ -362542.946+1752446.094/ --362820.930+1752823.280/ -363113.440+1753142.771/ --363419.191+1753443.044/ -363736.793+1753722.712/ --364104.767+1753940.534/ -364441.552+1754135.426/ --364825.517+1754306.470/ -365214.972+1754412.919/ --365608.185+1754454.211/ -370003.386+1754509.967/ --370358.789+1754500.000/ -370752.602+1754424.326/ --371143.039+1754323.145/ -371526.604+1754150.964/ -373047.664+1752322.344/ -373047.628+1751914.988/ -373342.624+1750929.700/ --373519.176+1744723.712/ --373444.554+1744108.979/ --373404.602+1743723.398/ --373309.105+1743343.154/ --373158.495+1743009.957/ --373033.322+1742645.458/ --372854.246+1742331.235/ --372852.068+1742331.632/ --373911.052+1742019.104/ +-373424.024+1745852.212/ +-374439.768+1745832.664/ +-374435.277+1743856.212/ +-374232.293+1742921.868/ +-373911.597+1742023.990/ -373439.454+1741219.263/ --373159.159+1740841.571/ -372904.336+1740522.588/ --372556.343+1740223.822/ -372236.637+1735946.612/ -372151.372+1735916.836/ -372538.784+1734738.904/ --371847.687+1734350.062/ --371412.153+1734205.273/ -370930.384+1734051.227/ --370444.541+1734008.394/ -365956.809+1733957.004/ -365906.720+1734005.304 @@ -140,16 +110,10 @@ -373047.628+1751914.988/ -373047.664+1752322.344/ -373928.152+1753138.820/ --374725.800+1753343.092/ --380117.328+1752912.480/ --381555.908+1752123.976/ --381551.596+1751732.204/ --381534.419+1751446.989/ --381505.938+1751204.342/ --381426.375+1750925.519/ --381336.035+1750651.747/ --381235.306+1750424.212/ --381124.660+1750204.049/ +-375609.852+1754540.032/ +-383244.700+1753904.536/ +-383505.784+1751916.788/ +-383149.584+1745945.096/ -381124.972+1750202.436/ -380649.500+1750100.876/ -374923.304+1745823.664/ From dca695ca6d651e849cce1194ed4ed990eba681dc Mon Sep 17 00:00:00 2001 From: Zain Khan <76762885+zkaviator@users.noreply.github.com> Date: Tue, 27 Dec 2022 23:29:57 +1300 Subject: [PATCH 17/50] Add additional wind parameter, with minor localisation changes. Contribution made by @zkaviator --- ATIS.xml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/ATIS.xml b/ATIS.xml index 7998b8e..7b75212 100644 --- a/ATIS.xml +++ b/ATIS.xml @@ -75,7 +75,8 @@ - + + @@ -139,6 +140,8 @@ + + @@ -160,9 +163,10 @@ - + + - + @@ -197,6 +201,7 @@ + @@ -226,7 +231,7 @@ - + @@ -235,6 +240,9 @@ + + + From e2c31e8d099795cfe7fbe4e3df3e607a13b9c482 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Tue, 27 Dec 2022 23:32:41 +1300 Subject: [PATCH 18/50] feat: Add attribution for ATIS changes. --- .github/changelogs/2023.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/changelogs/2023.md b/.github/changelogs/2023.md index 2c0bab4..ff3344b 100644 --- a/.github/changelogs/2023.md +++ b/.github/changelogs/2023.md @@ -14,6 +14,8 @@ Not released due to a lack of applicable changes. #### Dataset Updates + - Addition of minor translations to the ATIS parser. Thanks to @zkaviator. + **Procedure Checker** We have a new procedure checker, which cross-checks the procedures in the database against the promulgated Part 95 procedure sheets. Thanks to this, a few errors have been caught: From 438900e4e76d3fb120ea5cf74ee76e232f6ee1d9 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Wed, 28 Dec 2022 12:12:39 +1300 Subject: [PATCH 19/50] fix: Fix DefaultJurisdiction rulesets --- .github/changelogs/2023.md | 1 + DefaultJurisdiction.xml | 74 ++++++++++++++++++++++++++++++++------ 2 files changed, 65 insertions(+), 10 deletions(-) diff --git a/.github/changelogs/2023.md b/.github/changelogs/2023.md index ff3344b..0c273f5 100644 --- a/.github/changelogs/2023.md +++ b/.github/changelogs/2023.md @@ -15,6 +15,7 @@ Not released due to a lack of applicable changes. #### Dataset Updates - Addition of minor translations to the ATIS parser. Thanks to @zkaviator. + - Amendment of DefaultJurisdiction to include better automatic sector ownership for TMAs. **Procedure Checker** diff --git a/DefaultJurisdiction.xml b/DefaultJurisdiction.xml index b0a5b62..71bbbe2 100644 --- a/DefaultJurisdiction.xml +++ b/DefaultJurisdiction.xml @@ -1,38 +1,92 @@  - - + + + + + - + - + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + - - + + \ No newline at end of file From 731e119e68a1372116fc89a2d5d29300a7065adf Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Fri, 30 Dec 2022 14:21:05 +1300 Subject: [PATCH 20/50] Reformatted changelog --- .github/changelogs/2023.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/changelogs/2023.md b/.github/changelogs/2023.md index 0c273f5..46d961f 100644 --- a/.github/changelogs/2023.md +++ b/.github/changelogs/2023.md @@ -11,7 +11,6 @@ Not released due to a lack of applicable changes. #### ANR Updates - #### Dataset Updates - Addition of minor translations to the ATIS parser. Thanks to @zkaviator. @@ -20,18 +19,20 @@ Not released due to a lack of applicable changes. **Procedure Checker** We have a new procedure checker, which cross-checks the procedures in the database against the promulgated Part 95 procedure sheets. Thanks to this, a few errors have been caught: - - NZAA `UKAPA#D` STAR had the incorrect revision number. - - Spelling error in the NZDN `AKLAR2B` SID name. + + - NZAA `UKAPA #D` STAR had the incorrect revision number. + - Spelling error in the NZDN `AKLAR 2B` SID name. - Removal of the NZGS `CREEK`, `WARIK` and `OTOKO` STARs. - - Reassigned the NZMO `GULAN2` SID to both runways. - - NZNP `BUGNO1B` and `HARVO1Q` had the incorrect revision number. - - Spelling error in the NZNS `IDNEM2P` SID name. + - Reassigned the NZMO `GULAN 2` SID to both runways. + - NZNP `BUGNO 1B` and `HARVO 1Q` had the incorrect revision number. + - Spelling error in the NZNS `IDNEM 2P` SID name. - NZWP `BAYES` and `WYTAK` open SIDs had the incorrect revision number. - Removal of the NZWT SIDs. **ENR and TMA Sector Bounds** We have made the following changes to ENR sectors: + - AA TMA: Added `DAVEE` TMA step on the border with RAN. - HN TMA: Realigned the eastern border to the RAN/BAY border, and extended further south. - OCR/RAN/BAY: Realigned border to better match surrounding ENRs and TMAs. From 108c7cb3a718f60046577f6e95825d0b6e0075bb Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Mon, 2 Jan 2023 16:38:22 +1300 Subject: [PATCH 21/50] fix: OCR volume bounds. Fix CH TMA volume --- Maps/Airspace/ENR Sectors.xml | 16 +- Maps/Airspace/TMA Sectors.xml | 42 -- Volumes.xml | 803 +++++++++++++++------------------- 3 files changed, 358 insertions(+), 503 deletions(-) diff --git a/Maps/Airspace/ENR Sectors.xml b/Maps/Airspace/ENR Sectors.xml index 381d82f..97876a4 100644 --- a/Maps/Airspace/ENR Sectors.xml +++ b/Maps/Airspace/ENR Sectors.xml @@ -4,7 +4,6 @@ -390738.032+1713321.982/ --390738.032+1713321.982/ -383652.034+1710707.458/ -380442.756+1705000.757/ -373042.007+1704026.636/ @@ -32,11 +31,16 @@ -365931.000+1754510.000/ -371524.005+1754144.000/ -373047.664+1752322.344/ --375610.000+1754540.000/ --385718.256+1753437.322/ --385518.008+1751849.003/ --391349.109+1745455.602/ --390026.070+1741102.160/ +-373047.628+1751914.988/ +-373342.624+1750929.700/ +-373424.024+1745852.212/ +-374439.768+1745832.664/ +-374435.277+1743856.212/ +-374232.293+1742921.868/ +-373911.597+1742023.990/ +-373439.454+1741219.263/ +-373115.000+1740755.000/ +-390231.000+1733239.000/ -390738.032+1713321.982 diff --git a/Maps/Airspace/TMA Sectors.xml b/Maps/Airspace/TMA Sectors.xml index 1308782..1e5fa81 100644 --- a/Maps/Airspace/TMA Sectors.xml +++ b/Maps/Airspace/TMA Sectors.xml @@ -49,58 +49,33 @@ -434354.012+1723500.420/ -440920.304+1724247.448/ --441005.561+1723544.275/ -441014.796+1723052.668/ --441005.561+1722601.061/ -440937.929+1722111.748/ --440852.117+1721627.004/ -440748.486+1721149.063/ --440627.535+1720720.103/ -440449.900+1720302.222/ --440256.347+1715857.426/ -440033.948+1715525.932/ -440816.296+1714557.996/ --440210.859+1713735.912/ -435910.248+1713429.496/ -435320.220+1714614.088/ --435004.782+1714251.256/ --434658.125+1714039.837/ -434343.882+1713851.664/ --434023.549+1713727.505/ -433658.666+1713627.940/ --433330.802+1713553.354/ -433227.456+1713546.392/ -433212.048+1714249.536/ --432701.712+1714250.946/ -432400.318+1714326.258/ --432101.842+1714423.118/ -431807.635+1714541.044/ --431519.010+1714719.399/ -431237.237+1714917.396/ --431003.529+1715134.109/ -430739.038+1715408.474/ --430524.846+1715659.304/ -430321.953+1720005.295/ --430131.275+1720325.039/ -425953.635+1720657.029/ --425829.759+1721039.676/ -425720.269+1721431.317/ --425625.681+1721830.228/ -425546.398+1722234.636/ -425533.564+1722551.780/ -425013.776+1723201.248/ --425050.864+1724021.088/ --425135.699+1724500.059/ -425238.005+1724932.781/ --425357.322+1725357.237/ -425533.065+1725811.465/ --425724.525+1730213.570/ -425930.877+1730601.742/ --430151.184+1730934.264/ -430424.404+1731249.525/ --430709.397+1731546.036/ -431004.932+1731822.437/ --431309.697+1732037.510/ -431453.592+1732144.172/ -434354.012+1723500.420 @@ -129,16 +104,10 @@ -401025.212+1755506.240/ -401148.192+1755647.148/ -401143.944+1761332.484/ --401415.550+1761423.604/ --401640.721+1761449.972/ -401907.094+1761459.678/ --402133.554+1761452.617/ -402358.988+1761428.813/ --402622.284+1761348.418/ -402842.349+1761251.711/ --403058.109+1761139.099/ -403308.523+1761011.112/ --403512.590+1760828.401/ -403559.964+1760735.616/ -402849.404+1755459.904/ -403846.644+1754219.116/ @@ -181,27 +150,16 @@ -412554.912+1751300.912/ -413335.784+1750848.120/ -413636.756+1751410.932/ --413921.098+1751031.531/ --414041.166+1750812.978/ -414151.857+1750545.518/ --414252.626+1750310.286/ -414343.000+1750028.477/ --414422.592+1745741.341/ -414451.094+1745450.171/ --414508.283+1745156.293/ -414514.028+1744901.056/ --414508.283+1744605.819/ -414454.852+1744400.852/ -414457.120+1744400.348/ -420358.968+1743441.700/ --420229.351+1742817.643/ --420058.241+1742325.235/ -415908.354+1741844.890/ --415700.555+1741418.788/ -415435.843+1741008.989/ --415155.352+1740617.414/ -414900.335+1740245.830/ --414552.154+1735935.838/ -414232.273+1735648.859/ -414223.688+1735640.560/ -414227.576+1734858.608/ diff --git a/Volumes.xml b/Volumes.xml index 4c016c8..a1d0316 100644 --- a/Volumes.xml +++ b/Volumes.xml @@ -1,9 +1,9 @@ - + - -36.983333+175.787501/ + -36.991944+175.752778/ -37.541667+178.935833/ -38.450000+179.733332/ -39.663333+178.924446/ @@ -15,10 +15,9 @@ -39.098611+176.327776/ -38.955071+175.577034/ -37.936111+175.761111/ - -37.504723+175.381472/ + -37.513240+175.389540/ -37.256668+175.695556/ - -36.983333+175.787501/ - -36.983333+175.787501 + -36.991944+175.752778 @@ -41,71 +40,48 @@ -39.127231+171.556106/ - -38.865414+171.306666/ -38.614454+171.118738/ - -38.351459+170.960720/ -38.078543+170.833544/ - -37.797878+170.737864/ -37.511669+170.674066/ - -37.222137+170.642272/ -36.931505+170.642358/ - -36.641977+170.673959/ -36.355724+170.736485/ - -36.074870+170.829139/ -35.801476+170.950927/ - -35.537530+171.100675/ -35.284932+171.277041/ - -35.045484+171.478532/ -34.820882+171.703517/ - -34.612703+171.950242/ -34.422399+172.216838/ - -34.251290+172.501340/ -34.100556+172.801695/ - -33.971232+173.115774/ -33.864200+173.441387/ - -33.780191+173.776289/ -33.719774+174.118193/ - -33.683360+174.464784/ -33.671194+174.813722/ - -33.683360+175.162661/ -33.719774+175.509251/ - -33.780191+175.851156/ -33.864200+176.186057/ - -33.971232+176.511670/ -34.100556+176.825750/ - -34.251290+177.126104/ -34.422399+177.410606/ - -34.612703+177.677202/ -34.820882+177.923927/ - -35.045484+178.148913/ -35.284932+178.350404/ - -35.537530+178.526770/ -35.801476+178.676517/ - -36.074870+178.798305/ -36.355724+178.890959/ - -36.641977+178.953486/ -36.931505+178.985086/ - -37.222137+178.985172/ -37.511669+178.953379/ -37.541667+178.935833/ - -36.983333+175.787501/ + -36.991944+175.752778/ -37.256668+175.695556/ - -37.504723+175.381472/ - -37.823612+174.973332/ - -37.715250+174.499398/ - -37.683589+174.413219/ - -37.653110+174.340080/ - -37.617659+174.270639/ - -37.577514+174.205434/ - -37.532988+174.144964/ + -37.513240+175.389540/ + -37.513230+175.320830/ + -37.561840+175.158250/ + -37.573340+174.981170/ + -37.744380+174.975740/ + -37.743133+174.648948/ + -37.708970+174.489408/ + -37.653221+174.339997/ + -37.577626+174.205351/ -37.520833+174.131944/ -39.041944+173.544167/ - -39.127250+171.556028/ -39.127231+171.556106 - -37.504723+175.381472/ + -37.513240+175.389540/ -37.936111+175.761111/ -38.955071+175.577034/ -38.921669+175.313612/ @@ -113,15 +89,15 @@ -39.007242+174.183933/ -39.041944+173.544167/ -37.520833+174.131944/ - -37.577514+174.205434/ - -37.617659+174.270639/ -37.653110+174.340080/ - -37.683589+174.413219/ -37.708858+174.489490/ - -37.715250+174.499398/ - -37.823612+174.973332/ - -37.504723+175.381472/ - -37.504723+175.381472 + -37.743021+174.649030/ + -37.754528+174.813722/ + -37.744380+174.975740/ + -37.573340+174.981170/ + -37.561840+175.158250/ + -37.513230+175.320830/ + -37.513240+175.389540 @@ -216,7 +192,7 @@ -39.127250+171.556028 - + -412639.900+1735254.500/ -412218.200+1735627.300/ @@ -270,181 +246,98 @@ - -372914.200+1752153.400/ - -373928.800+1753140.300/ - -374725.800+1753342.700/ - -380118.800+1752912.700/ - -380857.000+1752509.500/ - -381254.900+1752302.700/ - -381558.200+1752125.000/ - -381555.602+1751838.280/ - -381542.938+1751552.401/ - -381518.908+1751308.586/ - -381443.697+1751028.101/ - -381357.578+1750752.187/ - -381300.907+1750522.046/ - -381154.123+1750258.835/ - -381123.700+1750202.800/ - -380650.400+1750101.400/ - -374925.000+1745824.000/ - -373424.100+1745853.400/ - -373343.000+1750930.500/ - -373219.700+1751408.800/ - -373047.700+1751914.900/ - -372914.200+1752153.400 + -37.573340+174.981170/ + -37.561840+175.158250/ + -37.513230+175.320830/ + -37.513240+175.389540/ + -37.657820+175.527450/ + -37.936070+175.761120/ + -38.545750+175.651260/ + -38.584940+175.321330/ + -38.530440+174.995860/ + -38.190270+175.034010/ + -38.113750+175.016910/ + -37.823140+174.973240/ + -37.573340+174.981170 - -365851.330+1735001.330/ - -365528.221+1734857.649/ - -365201.530+1734815.913/ - -364832.716+1734756.897/ - -364503.370+1734800.695/ - -364135.084+1734827.226/ - -363809.440+1734916.237/ - -363447.994+1735027.309/ - -363132.270+1735159.856/ - -362823.742+1735353.137/ - -362523.830+1735606.259/ - -362233.884+1735838.185/ - -361955.179+1740127.743/ - -361728.902+1740433.636/ - -361516.146+1740754.450/ - -361510.900+1740804.100/ - -360122.200+1741304.100/ - -360042.066+1741503.667/ - -360005.494+1741704.955/ - -355932.333+1741907.718/ - -355902.624+1742111.810/ - -355836.400+1742317.084/ - -355813.693+1742523.392/ - -355754.530+1742730.583/ - -355738.933+1742938.509/ - -355729.400+1743109.500/ - -360709.300+1743715.600/ - -360719.130+1744134.718/ - -360743.678+1744552.137/ - -360826.102+1745005.996/ - -360926.090+1745414.410/ - -361043.194+1745815.529/ - -361216.842+1750207.557/ - -361406.337+1750548.757/ - -361610.865+1750917.468/ - -361829.496+1751232.119/ - -362024.500+1751452.900/ - -362222.864+1751905.796/ - -362437.885+1752305.550/ - -362709.090+1752650.014/ - -362955.355+1753017.492/ - -363255.440+1753326.407/ - -363608.000+1753615.310/ - -363931.595+1753842.896/ - -364304.697+1754048.009/ - -364645.705+1754229.658/ - -365032.954+1754347.018/ - -365424.728+1754439.447/ - -365819.272+1754506.482/ - -370214.808+1754507.855/ - -370609.542+1754443.488/ - -371001.684+1754353.501/ - -371349.460+1754238.211/ - -371524.000+1754143.000/ - -372914.200+1752153.400/ - -373047.700+1751914.900/ - -373219.700+1751408.800/ - -373343.000+1750930.500/ - -373424.100+1745853.400/ - -373454.899+1745505.301/ - -373513.092+1745115.266/ - -373515.203+1744724.094/ - -373501.217+1744333.587/ - -373431.242+1743945.540/ - -373345.513+1743601.726/ - -373244.383+1743223.886/ - -373128.330+1742853.710/ - -372957.945+1742532.823/ - -372853.500+1742330.700/ - -373909.400+1742018.400/ - -373700.718+1741609.230/ - -373435.854+1741214.828/ - -373155.242+1740837.511/ - -372900.129+1740518.937/ - -372551.876+1740220.608/ - -372231.941+1735943.862/ - -372149.900+1735919.570/ - -372149.900+1735919.540/ - -372536.100+1734746.280/ - -372119.442+1734502.923/ - -371648.371+1734301.060/ - -371209.862+1734129.566/ - -370726.055+1734029.049/ - -370239.122+1733959.875/ - -365906.760+1734001.500/ - -365851.330+1735001.330 + -36.985200+173.668140/ + -36.980580+173.835420/ + -36.783890+173.798832/ + -36.668219+173.812713/ + -36.556228+173.851347/ + -36.451297+173.913463/ + -36.356578+173.997106/ + -36.274908+174.099699/ + -36.254280+174.134520/ + -36.021720+174.217300/ + -35.965983+174.452456/ + -35.957660+174.519230/ + -36.118830+174.621090/ + -36.130165+174.774568/ + -36.159993+174.913649/ + -36.208723+175.044353/ + -36.274908+175.162781/ + -36.337120+175.245480/ + -36.428596+175.412804/ + -36.520400+175.528547/ + -36.626887+175.622975/ + -36.744876+175.693174/ + -36.870826+175.736922/ + -37.000941+175.752769/ + -37.131278+175.740091/ + -37.257390+175.697490/ + -37.513240+175.389540/ + -37.513230+175.320830/ + -37.561840+175.158250/ + -37.573340+174.981170/ + -37.744380+174.975740/ + -37.743133+174.648948/ + -37.708970+174.489408/ + -37.653221+174.339997/ + -37.577626+174.205351/ + -37.484538+174.089608/ + -37.376843+173.996281/ + -37.364270+173.988010/ + -37.427440+173.794140/ + -37.158440+173.680896/ + -36.999114+173.665835/ + -36.985200+173.668140 - -433212.000+1714251.100/ - -432909.167+1714239.497/ - -432606.552+1714259.623/ - -432305.902+1714341.538/ - -432008.585+1714444.871/ - -431715.941+1714609.092/ - -431429.270+1714753.519/ - -431149.827+1714957.320/ - -430918.807+1715219.526/ - -430657.341+1715459.036/ - -430446.487+1715754.627/ - -430247.221+1720104.960/ - -430100.430+1720428.596/ - -425926.910+1720804.004/ - -425807.353+1721149.569/ - -425702.352+1721543.610/ - -425612.386+1721944.385/ - -425537.827+1722350.107/ - -425525.000+1722603.200/ - -425014.500+1723201.900/ - -425029.019+1723646.814/ - -425100.375+1724129.152/ - -425149.465+1724606.802/ - -425255.926+1725037.711/ - -425419.268+1725459.875/ - -425558.875+1725911.346/ - -425754.012+1730310.250/ - -430003.824+1730654.796/ - -430227.348+1731023.292/ - -430503.520+1731334.157/ - -430751.174+1731625.932/ - -431049.061+1731857.288/ - -431355.850+1732107.045/ - -431459.600+1732134.700/ - -432158.100+1731027.400/ - -434354.000+1723500.400/ - -435932.600+1723946.500/ - -440918.400+1724246.900/ - -440955.276+1723759.662/ - -441013.096+1723308.838/ - -441012.462+1722816.944/ - -440953.379+1722326.278/ - -440915.997+1721839.125/ - -440820.610+1721357.741/ - -440707.654+1720924.332/ - -440537.701+1720501.036/ - -440351.458+1720049.903/ - -440149.755+1715652.880/ - -440041.800+1715515.200/ - -440809.200+1714606.600/ - -440708.525+1714406.917/ - -440556.147+1714221.531/ - -440441.148+1714039.798/ - -440323.620+1713901.842/ - -440203.662+1713727.782/ - -440041.373+1713557.731/ - -435916.856+1713431.797/ - -435906.400+1713437.100/ - -435324.500+1714602.600/ - -433227.000+1713559.100/ - -433212.000+1714251.100 + -43.731670+172.583450/ + -44.155640+172.713180/ + -44.170777+172.514630/ + -44.160536+172.353263/ + -44.130135+172.196962/ + -44.080528+172.050617/ + -44.009430+171.923870/ + -44.137860+171.766110/ + -43.986180+171.574860/ + -43.888950+171.770580/ + -43.728856+171.647684/ + -43.616296+171.607761/ + -43.540960+171.596220/ + -43.536680+171.713760/ + -43.400088+171.723961/ + -43.302121+171.761401/ + -43.210344+171.821499/ + -43.127511+171.902354/ + -43.056098+172.001471/ + -42.998232+172.115841/ + -42.955630+172.242033/ + -42.929555+172.376288/ + -42.925990+172.431050/ + -42.837160+172.533680/ + -42.877224+172.825772/ + -42.925851+172.969851/ + -42.991910+173.100484/ + -43.073446+173.213757/ + -43.168037+173.306233/ + -43.248220+173.362270/ + -43.731670+172.583450 @@ -524,45 +417,45 @@ -370105.200+1743705.400/ --370010.300+1743645.100/ --365748.800+1743935.400/ --365708.200+1744518.700/ --365631.600+1744730.700/ --365626.300+1744750.400/ --365636.100+1744921.000/ --365552.800+1744952.700/ --365450.700+1745417.100/ --365532.800+1745618.200/ --365603.300+1745627.900/ --365952.300+1745740.800/ --370002.800+1745744.200/ --370056.800+1745628.900/ --370235.500+1745548.400/ --370341.100+1745520.100/ --370417.900+1745053.100/ --370517.100+1744632.500/ --370630.300+1744420.900/ --370524.200+1743841.100/ --370511.300+1743836.300/ --370105.200+1743705.400 + -370010.300+1743645.100/ + -365748.800+1743935.400/ + -365708.200+1744518.700/ + -365631.600+1744730.700/ + -365626.300+1744750.400/ + -365636.100+1744921.000/ + -365552.800+1744952.700/ + -365450.700+1745417.100/ + -365532.800+1745618.200/ + -365603.300+1745627.900/ + -365952.300+1745740.800/ + -370002.800+1745744.200/ + -370056.800+1745628.900/ + -370235.500+1745548.400/ + -370341.100+1745520.100/ + -370417.900+1745053.100/ + -370517.100+1744632.500/ + -370630.300+1744420.900/ + -370524.200+1743841.100/ + -370511.300+1743836.300/ + -370105.200+1743705.400 -433142.137+1722246.410/ --433005.148+1722634.218/ --432731.613+1722534.760/ --432709.959+1722440.287/ --432617.659+1722250.382/ --432215.973+1722728.542/ --432322.390+1723043.869/ --432246.157+1723350.524/ --432135.683+1723414.765/ --432136.256+1723619.570/ --432245.734+1723849.862/ --432455.891+1724133.427/ --433124.758+1724208.070/ --433625.786+1723549.637/ --433651.193+1722749.249/ --433326.355+1722205.352/ --433140.645+1722241.714/ --433142.137+1722246.410 + -433005.148+1722634.218/ + -432731.613+1722534.760/ + -432709.959+1722440.287/ + -432617.659+1722250.382/ + -432215.973+1722728.542/ + -432322.390+1723043.869/ + -432246.157+1723350.524/ + -432135.683+1723414.765/ + -432136.256+1723619.570/ + -432245.734+1723849.862/ + -432455.891+1724133.427/ + -433124.758+1724208.070/ + -433625.786+1723549.637/ + -433651.193+1722749.249/ + -433326.355+1722205.352/ + -433140.645+1722241.714/ + -433142.137+1722246.410 -46.076944+170.730583/ -46.483722+170.235722/ @@ -652,14 +545,14 @@ -38.402472+177.708194/ -38.402472+177.708194 -374152.900+1752639.200/ --374548.800+1752828.800/ --380036.400+1752341.800/ --380310.300+1751858.200/ --380153.300+1751318.600/ --375805.700+1751127.400/ --374310.300+1751619.600/ --374036.900+1752105.200/ --374152.900+1752639.200 + -374548.800+1752828.800/ + -380036.400+1752341.800/ + -380310.300+1751858.200/ + -380153.300+1751318.600/ + -375805.700+1751127.400/ + -374310.300+1751619.600/ + -374036.900+1752105.200/ + -374152.900+1752639.200 -39.030389+173.724167/ -38.999157+173.722941/ @@ -854,176 +747,176 @@ -46.056444+169.018583 -401301.900+1753230.500/ --401508.500+1753158.800/ --401651.700+1752752.600/ --401931.000+1752242.000/ --402327.200+1752128.200/ --402328.300+1751854.300/ --402223.800+1751340.600/ --400355.100+1750732.400/ --400357.251+1750727.724/ --400255.100+1750830.407/ --400157.357+1750939.896/ --400158.600+1750939.300/ --400222.300+1751032.700/ --400249.000+1751251.500/ --400329.000+1751840.200/ --400327.600+1751838.000/ --400505.400+1752229.600/ --400515.300+1752329.500/ --401045.800+1753029.500/ --401301.900+1753230.500 + -401508.500+1753158.800/ + -401651.700+1752752.600/ + -401931.000+1752242.000/ + -402327.200+1752128.200/ + -402328.300+1751854.300/ + -402223.800+1751340.600/ + -400355.100+1750732.400/ + -400357.251+1750727.724/ + -400255.100+1750830.407/ + -400157.357+1750939.896/ + -400158.600+1750939.300/ + -400222.300+1751032.700/ + -400249.000+1751251.500/ + -400329.000+1751840.200/ + -400327.600+1751838.000/ + -400505.400+1752229.600/ + -400515.300+1752329.500/ + -401045.800+1753029.500/ + -401301.900+1753230.500 -401719.000+1754518.500/ --401921.300+1754451.300/ --401921.300+1754451.300/ --402208.500+1753943.300/ --402208.500+1753943.300/ --402223.800+1753726.500/ --402331.600+1752605.500/ --402327.200+1752128.200/ --401931.000+1752242.000/ --401651.700+1752752.600/ --401655.900+1753100.900/ --401654.800+1753140.600/ --401644.500+1753315.900/ --401650.500+1753742.400/ --401649.800+1753816.600/ --401719.000+1754518.500 + -401921.300+1754451.300/ + -401921.300+1754451.300/ + -402208.500+1753943.300/ + -402208.500+1753943.300/ + -402223.800+1753726.500/ + -402331.600+1752605.500/ + -402327.200+1752128.200/ + -401931.000+1752242.000/ + -401651.700+1752752.600/ + -401655.900+1753100.900/ + -401654.800+1753140.600/ + -401644.500+1753315.900/ + -401650.500+1753742.400/ + -401649.800+1753816.600/ + -401719.000+1754518.500 -450842.704+1681304.880/ --450345.766+1682737.979/ --450003.002+1683404.930/ --445535.847+1684334.800/ --445458.436+1684423.896/ --445429.046+1685231.762/ --445557.860+1690041.790/ --445541.319+1690307.279/ --445555.680+1690747.600/ --450103.268+1690733.849/ --450423.632+1690553.883/ --450445.233+1690120.661/ --450247.196+1685159.811/ --450236.225+1685003.503/ --450316.870+1684808.654/ --451255.130+1684710.642/ --451237.845+1683904.155/ --451141.822+1683641.873/ --450629.371+1683940.042/ --450606.629+1683852.872/ --450743.105+1683335.722/ --451206.753+1682358.956/ --451318.285+1681835.173/ --451213.071+1681526.557/ --450842.704+1681304.880 + -450345.766+1682737.979/ + -450003.002+1683404.930/ + -445535.847+1684334.800/ + -445458.436+1684423.896/ + -445429.046+1685231.762/ + -445557.860+1690041.790/ + -445541.319+1690307.279/ + -445555.680+1690747.600/ + -450103.268+1690733.849/ + -450423.632+1690553.883/ + -450445.233+1690120.661/ + -450247.196+1685159.811/ + -450236.225+1685003.503/ + -450316.870+1684808.654/ + -451255.130+1684710.642/ + -451237.845+1683904.155/ + -451141.822+1683641.873/ + -450629.371+1683940.042/ + -450606.629+1683852.872/ + -450743.105+1683335.722/ + -451206.753+1682358.956/ + -451318.285+1681835.173/ + -451213.071+1681526.557/ + -450842.704+1681304.880 -375803.800+1762941.200/ --380617.900+1762433.400/ --381258.500+1761754.700/ --381513.200+1761115.600/ --381511.031+1761121.536/ --381438.276+1761025.338/ --381401.793+1760933.005/ --381321.860+1760844.933/ --381238.784+1760801.489/ --381152.892+1760723.003/ --381119.200+1760702.100/ --380256.600+1761311.300/ --375428.700+1761918.700/ --375429.411+1761922.000/ --375434.326+1762041.366/ --375444.665+1762159.893/ --375500.351+1762316.987/ --375521.264+1762432.066/ --375547.247+1762544.563/ --375618.104+1762653.929/ --375653.601+1762759.638/ --375733.470+1762901.193/ --375803.800+1762941.200 + -380617.900+1762433.400/ + -381258.500+1761754.700/ + -381513.200+1761115.600/ + -381511.031+1761121.536/ + -381438.276+1761025.338/ + -381401.793+1760933.005/ + -381321.860+1760844.933/ + -381238.784+1760801.489/ + -381152.892+1760723.003/ + -381119.200+1760702.100/ + -380256.600+1761311.300/ + -375428.700+1761918.700/ + -375429.411+1761922.000/ + -375434.326+1762041.366/ + -375444.665+1762159.893/ + -375500.351+1762316.987/ + -375521.264+1762432.066/ + -375547.247+1762544.563/ + -375618.104+1762653.929/ + -375653.601+1762759.638/ + -375733.470+1762901.193/ + -375803.800+1762941.200 -373735.100+1762007.500/ --373735.852+1762007.456/ --373812.356+1762025.696/ --373849.978+1762039.853/ --373928.435+1762049.819/ --374007.432+1762055.515/ --374046.675+1762056.897/ --374125.863+1762053.952/ --374204.699+1762046.700/ --374242.886+1762035.195/ --374305.200+1762025.600/ --374251.000+1761651.500/ --374258.400+1761414.700/ --374328.000+1761013.200/ --374213.800+1760819.000/ --374220.800+1760630.000/ --374209.600+1760212.000/ --374212.397+1760212.063/ --374133.668+1760203.955/ --374054.526+1760200.146/ --374015.271+1760200.662/ --373936.200+1760205.498/ --373857.612+1760214.615/ --373819.800+1760227.942/ --373743.050+1760245.376/ --373707.643+1760306.782/ --373633.846+1760331.997/ --373612.600+1760350.900/ --373814.100+1760944.600/ --373817.700+1761037.400/ --373754.700+1761103.400/ --373752.100+1761823.000/ --373735.100+1762007.500 + -373735.852+1762007.456/ + -373812.356+1762025.696/ + -373849.978+1762039.853/ + -373928.435+1762049.819/ + -374007.432+1762055.515/ + -374046.675+1762056.897/ + -374125.863+1762053.952/ + -374204.699+1762046.700/ + -374242.886+1762035.195/ + -374305.200+1762025.600/ + -374251.000+1761651.500/ + -374258.400+1761414.700/ + -374328.000+1761013.200/ + -374213.800+1760819.000/ + -374220.800+1760630.000/ + -374209.600+1760212.000/ + -374212.397+1760212.063/ + -374133.668+1760203.955/ + -374054.526+1760200.146/ + -374015.271+1760200.662/ + -373936.200+1760205.498/ + -373857.612+1760214.615/ + -373819.800+1760227.942/ + -373743.050+1760245.376/ + -373707.643+1760306.782/ + -373633.846+1760331.997/ + -373612.600+1760350.900/ + -373814.100+1760944.600/ + -373817.700+1761037.400/ + -373754.700+1761103.400/ + -373752.100+1761823.000/ + -373735.100+1762007.500 -413736.722+1733013.934/ --413634.341+1740957.249/ --413432.677+1740841.910/ --413002.040+1740753.219/ --412624.299+1740152.638/ --412627.458+1735746.324/ --412654.098+1735254.316/ --412648.032+1733604.384/ --413154.875+1732940.334/ --413703.006+1733010.341/ --413736.722+1733013.934 + -413634.341+1740957.249/ + -413432.677+1740841.910/ + -413002.040+1740753.219/ + -412624.299+1740152.638/ + -412627.458+1735746.324/ + -412654.098+1735254.316/ + -412648.032+1733604.384/ + -413154.875+1732940.334/ + -413703.006+1733010.341/ + -413736.722+1733013.934 -412436.165+1744054.213/ --412140.452+1744303.544/ --411943.874+1744330.310/ --411719.995+1744332.394/ --410911.082+1744602.049/ --410855.188+1745229.372/ --411544.959+1745545.461/ --412159.743+1745306.544/ --412553.583+1745527.592/ --412643.584+1745400.022/ --412718.722+1745229.416/ --412737.552+1745059.975/ --412748.278+1744856.284/ --412725.017+1744606.876/ --412651.595+1744421.705/ --412602.354+1744230.493/ --412440.964+1744051.822/ --412436.165+1744054.213 + -412140.452+1744303.544/ + -411943.874+1744330.310/ + -411719.995+1744332.394/ + -410911.082+1744602.049/ + -410855.188+1745229.372/ + -411544.959+1745545.461/ + -412159.743+1745306.544/ + -412553.583+1745527.592/ + -412643.584+1745400.022/ + -412718.722+1745229.416/ + -412737.552+1745059.975/ + -412748.278+1744856.284/ + -412725.017+1744606.876/ + -412651.595+1744421.705/ + -412602.354+1744230.493/ + -412440.964+1744051.822/ + -412436.165+1744054.213 -365125.880+1742312.186/ --364818.505+1742540.240/ --364137.859+1743643.247/ --364144.479+1743809.165/ --364124.151+1743922.610/ --363949.563+1744153.354/ --363935.450+1744438.675/ --363818.799+1744602.920/ --363855.990+1744702.092/ --364008.044+1744824.183/ --364134.776+1744941.838/ --364310.659+1745037.665/ --364507.193+1745111.689/ --364631.820+1744914.689/ --365614.498+1743316.636/ --365719.124+1742842.681/ --365627.296+1742719.145/ --365521.579+1742602.530/ --365412.278+1742456.335/ --365246.316+1742355.564/ --365150.053+1742323.164/ --365125.090+1742309.701/ --365125.880+1742312.186 + -364818.505+1742540.240/ + -364137.859+1743643.247/ + -364144.479+1743809.165/ + -364124.151+1743922.610/ + -363949.563+1744153.354/ + -363935.450+1744438.675/ + -363818.799+1744602.920/ + -363855.990+1744702.092/ + -364008.044+1744824.183/ + -364134.776+1744941.838/ + -364310.659+1745037.665/ + -364507.193+1745111.689/ + -364631.820+1744914.689/ + -365614.498+1743316.636/ + -365719.124+1742842.681/ + -365627.296+1742719.145/ + -365521.579+1742602.530/ + -365412.278+1742456.335/ + -365246.316+1742355.564/ + -365150.053+1742323.164/ + -365125.090+1742309.701/ + -365125.880+1742312.186 - + -404422.300+1750658.700/ -405337.800+1750142.600/ @@ -1055,71 +948,71 @@ -441730.400+1674103.200 - + BAYS - + KAIKOURA - + TARANAKI - + OCEANIC_RADAR RAGLAN - + OHAKEA - + SOUTH - + AATMA - + CHTMA - + HNTMA - + QNTMA - + WNTMA OHTMA - - + + NZAA_TWR-SCL - + NZCH_TWR-SCL - + NZDN_TWR-SCL - + NZGS_TWR-SCL - + NZHN_TWR-SCL - + NZNP_TWR-SCL NZNR_TWR-SCL - + NZNS_TWR-SCL - + NZNV_TWR-SCL @@ -1134,26 +1027,26 @@ NZRO_TWR-SCL - + NZTG_TWR-SCL - + NZWB_TWR-SCL - + NZWN_TWR-SCL NZWP_TWR-SCL - + - - NZPP_FIS - + + NZPP_FIS + + + + NZMF_FIS + - - NZMF_FIS - - \ No newline at end of file From f7e220af8335807dd368a79117c1ff79317628d1 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Mon, 2 Jan 2023 16:39:03 +1300 Subject: [PATCH 22/50] Update 2023.md --- .github/changelogs/2023.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/changelogs/2023.md b/.github/changelogs/2023.md index 46d961f..37a9c21 100644 --- a/.github/changelogs/2023.md +++ b/.github/changelogs/2023.md @@ -36,4 +36,5 @@ We have made the following changes to ENR sectors: - AA TMA: Added `DAVEE` TMA step on the border with RAN. - HN TMA: Realigned the eastern border to the RAN/BAY border, and extended further south. - OCR/RAN/BAY: Realigned border to better match surrounding ENRs and TMAs. - - ENR and TMA sector maps updated. \ No newline at end of file + - ENR and TMA sector maps updated. + - Slight realignment of the underlying Sector Volume definitions. \ No newline at end of file From cb3d033cec7119d5933c67a1d6362200e01231fe Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Mon, 2 Jan 2023 16:40:26 +1300 Subject: [PATCH 23/50] Update Profile.xml --- Profile.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Profile.xml b/Profile.xml index c429abb..4ee8ce0 100644 --- a/Profile.xml +++ b/Profile.xml @@ -1,6 +1,7 @@ - + From 349e6ffac7b661e445e38d04c9760a1b234bfef3 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Wed, 4 Jan 2023 00:25:21 +1300 Subject: [PATCH 24/50] feat: Improve arc draws for ENR/TMA/Proc --- .github/changelogs/2023.md | 1 + Maps/Airspace/ENR Sectors.xml | 49 +++ Maps/Airspace/ProceduralTowers.xml | 545 +++++++++++++++-------------- Maps/Airspace/TMA Sectors.xml | 73 ++++ Volumes.xml | 271 +++++++------- 5 files changed, 553 insertions(+), 386 deletions(-) diff --git a/.github/changelogs/2023.md b/.github/changelogs/2023.md index 37a9c21..9770875 100644 --- a/.github/changelogs/2023.md +++ b/.github/changelogs/2023.md @@ -37,4 +37,5 @@ We have made the following changes to ENR sectors: - HN TMA: Realigned the eastern border to the RAN/BAY border, and extended further south. - OCR/RAN/BAY: Realigned border to better match surrounding ENRs and TMAs. - ENR and TMA sector maps updated. + - Re-export of existing TMA and Procedural Tower bounds to produce a smoother arc (vertex every 5 degrees now.) - Slight realignment of the underlying Sector Volume definitions. \ No newline at end of file diff --git a/Maps/Airspace/ENR Sectors.xml b/Maps/Airspace/ENR Sectors.xml index 97876a4..db28c74 100644 --- a/Maps/Airspace/ENR Sectors.xml +++ b/Maps/Airspace/ENR Sectors.xml @@ -4,28 +4,51 @@ -390738.032+1713321.982/ +-385155.489+1711823.997/ -383652.034+1710707.458/ +-382105.251+1705738.593/ -380442.756+1705000.757/ +-374752.362+1704416.310/ -373042.007+1704026.636/ +-371319.693+1703832.181/ -365553.417+1703832.490/ +-363831.115+1704026.251/ -362120.605+1704411.346/ +-360429.530+1704944.901/ -354805.314+1705703.339/ +-353215.108+1710602.430/ -351705.755+1711637.346/ +-350243.744+1712842.715/ -344915.175+1714212.663/ +-343645.730+1715700.871/ -342520.636+1721300.618/ +-341504.645+1723004.825/ -340602.003+1724806.102/ +-335816.434+1730656.788/ -335151.121+1732628.993/ +-334648.687+1734634.639/ -334311.188+1740705.496/ +-334100.096+1742753.221/ -334016.300+1744849.400/ +-334100.096+1750945.579/ -334311.188+1753033.304/ +-334648.687+1755104.161/ -335151.121+1761109.807/ +-335816.434+1763042.012/ -340602.003+1764932.698/ +-341504.645+1770733.975/ -342520.636+1772438.182/ +-343645.730+1774037.929/ -344915.175+1775526.137/ +-350243.744+1780856.085/ -351705.755+1782101.454/ +-353215.108+1783136.370/ -354805.314+1784035.461/ +-360429.530+1784753.899/ -362120.605+1785327.454/ +-363831.115+1785712.549/ -365553.417+1785906.310/ +-371319.693+1785906.619/ -373042.007+1785712.164/ -373230.000+1785609.000/ -365931.000+1754510.000/ @@ -35,10 +58,16 @@ -373342.624+1750929.700/ -373424.024+1745852.212/ -374439.768+1745832.664/ +-374516.704+1744849.104/ +-374506.327+1744351.491/ -374435.277+1743856.212/ +-374343.798+1743405.579/ -374232.293+1742921.868/ +-374101.322+1742447.292/ -373911.597+1742023.990/ +-373703.976+1741614.004/ -373439.454+1741219.263/ +-373159.159+1740841.571/ -373115.000+1740755.000/ -390231.000+1733239.000/ -390738.032+1713321.982 @@ -52,10 +81,16 @@ -390026.071+1741102.159/ -390231.000+1733239.000/ -373115.000+1740755.000/ +-373439.051+1741219.562/ +-373703.573+1741614.302/ -373911.194+1742024.288/ +-374100.919+1742447.590/ -374231.890+1742922.165/ +-374343.395+1743405.876/ -374434.874+1743856.508/ +-374505.924+1744351.787/ -374516.301+1744849.399/ +-374505.924+1745347.011/ -374439.768+1745832.664/ -373424.024+1745852.212/ -373342.624+1750929.700/ @@ -101,15 +136,25 @@ -480854.985+1681559.987/ -455459.994+1651800.000/ -453013.003+1654842.991/ +-450756.160+1654320.832/ -445635.871+1654315.205/ +-444517.814+1654433.072/ -443407.095+1654713.035/ +-442308.718+1655113.127/ -441227.547+1655630.837/ +-440208.278+1660303.155/ -435215.409+1661046.605/ +-434253.211+1661937.284/ -433405.701+1662930.902/ +-432556.625+1664022.815/ -431829.432+1665208.064/ +-431147.256+1670441.408/ -430552.901+1671757.360/ +-430048.828+1673150.221/ -425637.138+1674614.112/ +-425319.565+1680103.003/ -425057.466+1681610.746/ +-424931.815+1683131.106/ -424903.200+1684657.790/ -424916.997+1685447.894/ -413400.000+1701435.005/ @@ -141,9 +186,13 @@ -420645.000+1720150.000/ -413400.000+1701435.005/ -412527.005+1702324.000/ +-405745.212+1702504.710/ -404036.022+1702913.548/ +-402346.853+1703516.936/ -400725.064+1704310.833/ +-395137.731+1705250.543/ -393631.609+1710410.771/ +-392213.092+1711705.684/ -390848.177+1713128.965/ -390738.100+1713321.701 diff --git a/Maps/Airspace/ProceduralTowers.xml b/Maps/Airspace/ProceduralTowers.xml index 716cff3..5d4988b 100644 --- a/Maps/Airspace/ProceduralTowers.xml +++ b/Maps/Airspace/ProceduralTowers.xml @@ -3,288 +3,299 @@ - -382408.900+1774229.500/ - -382913.700+1774739.800/ - -382830.710+1774851.401/ - -382753.273+1775007.949/ - -382721.188+1775128.352/ - -382654.695+1775252.000/ - -382633.996+1775418.269/ - -382619.245+1775546.499/ - -382610.555+1775716.028/ - -382607.991+1775846.180/ - -382611.572+1780016.276/ - -382613.000+1780045.000/ - -385704.200+1781039.400/ - -390446.700+1775427.800/ - -390908.000+1774518.800/ - -385542.700+1772614.800/ - -385033.800+1773641.000/ - -384653.100+1774406.100/ - -384630.077+1774344.969/ - -384605.471+1774327.110/ - -384540.392+1774310.367/ - -384514.873+1774254.760/ - -384448.944+1774240.307/ - -384422.637+1774227.026/ - -384355.984+1774214.933/ - -384329.018+1774204.042/ - -384301.772+1774154.367/ - -384247.900+1774153.600/ - -384418.600+1773348.700/ - -384236.689+1773318.555/ - -384052.564+1773304.693/ - -383907.892+1773302.515/ - -383723.469+1773312.025/ - -383540.091+1773333.134/ - -383358.542+1773405.670/ - -383219.592+1773449.372/ - -383043.991+1773543.897/ - -382912.462+1773648.819/ - -382745.697+1773803.639/ - -382624.352+1773927.781/ - -382509.040+1774100.602/ - -382408.900+1774229.500/ - -382408.900+1774229.500 + -385542.708+1772614.784/ + -384653.364+1774405.568/ + -384519.110+1774257.804/ + -384413.747+1774223.375/ + -384306.291+1774156.397/ + -384248.204+1774152.008/ + -384418.708+1773348.024/ + -384119.650+1773307.653/ + -383935.043+1773302.426/ + -383750.479+1773308.895/ + -383606.753+1773326.994/ + -383424.652+1773356.574/ + -383244.952+1773437.396/ + -383108.407+1773529.138/ + -382935.749+1773631.396/ + -382807.678+1773743.689/ + -382644.860+1773905.461/ + -382527.919+1774036.085/ + -382417.435+1774214.872/ + -382410.584+1774231.140/ + -382913.380+1774739.516/ + -382756.039+1775001.928/ + -382723.500+1775122.034/ + -382656.537+1775245.440/ + -382635.351+1775411.514/ + -382620.104+1775539.607/ + -382610.909+1775709.054/ + -382607.836+1775839.180/ + -382610.909+1780009.306/ + -382613.956+1780045.324/ + -385704.212+1781039.396/ + -390908.028+1774518.792/ + -385542.708+1772614.784 - -460437.000+1704350.100/ - -462901.400+1701408.600/ - -462007.100+1694240.100/ - -461825.444+1693946.989/ - -461631.643+1693710.404/ - -461428.794+1693448.945/ - -461217.848+1693243.680/ - -460959.817+1693055.541/ - -460735.764+1692925.326/ - -460506.798+1692813.689/ - -460234.063+1692721.137/ - -455959.700+1692657.200/ - -455446.636+1692640.657/ - -454936.765+1692751.354/ - -454440.110+1693017.870/ - -454005.607+1693355.471/ - -453601.490+1693837.356/ - -453235.052+1694414.887/ - -452952.444+1695037.860/ - -452758.495+1695734.805/ - -452656.583+1700453.316/ - -452652.500+1700558.600/ - -452742.900+1703021.400/ - -452812.990+1703516.492/ - -452918.810+1703959.658/ - -453057.934+1704422.463/ - -453307.395+1704817.009/ - -453543.313+1705136.207/ - -453841.008+1705413.987/ - -454155.129+1705605.486/ - -454519.816+1705707.201/ - -454848.875+1705717.110/ - -455215.956+1705634.751/ - -455534.751+1705501.256/ - -455839.188+1705239.334/ - -460123.614+1704933.206/ - -460342.980+1704548.488/ - -460437.000+1704350.100/ - -460437.000+1704350.100 + -462901.428+1701408.592/ + -462009.096+1694241.292/ + -461753.867+1693900.734/ + -461557.386+1693628.358/ + -461352.121+1693411.427/ + -461139.044+1693210.969/ + -460919.180+1693027.880/ + -460653.607+1692902.917/ + -460423.445+1692756.693/ + -460149.846+1692709.671/ + -455913.984+1692642.168/ + -455637.051+1692634.347/ + -455400.240+1692646.222/ + -455124.745+1692717.656/ + -454851.743+1692808.366/ + -454622.393+1692917.925/ + -454357.821+1693045.766/ + -454139.116+1693231.189/ + -453927.320+1693433.367/ + -453723.423+1693651.352/ + -453528.351+1693924.083/ + -453342.964+1694210.394/ + -453208.049+1694509.025/ + -453044.313+1694818.629/ + -452932.380+1695137.782/ + -452832.782+1695504.995/ + -452745.964+1695838.723/ + -452712.272+1700217.377/ + -452651.957+1700559.334/ + -452657.336+1700813.776/ + -452742.300+1703021.816/ + -452758.395+1703335.000/ + -452820.922+1703600.780/ + -452852.224+1703823.245/ + -452932.066+1704041.330/ + -453020.150+1704254.000/ + -453116.116+1704500.249/ + -453219.545+1704659.134/ + -453329.959+1704849.751/ + -453446.831+1705031.261/ + -453609.583+1705202.890/ + -453737.591+1705323.936/ + -453910.192+1705433.774/ + -454046.687+1705531.860/ + -454226.348+1705617.740/ + -454408.418+1705651.047/ + -454552.126+1705711.509/ + -454736.683+1705718.951/ + -454921.295+1705713.296/ + -455105.164+1705654.567/ + -455247.500+1705622.887/ + -455427.519+1705538.477/ + -455604.456+1705441.660/ + -455737.570+1705332.851/ + -455906.145+1705212.563/ + -460029.500+1705041.399/ + -460146.996+1704900.045/ + -460258.034+1704709.272/ + -460402.066+1704509.923/ + -460438.712+1704349.260/ + -462901.428+1701408.592 - -390149.400+1734327.000/ - -385956.966+1734322.586/ - -385804.694+1734332.526/ - -385613.522+1734355.000/ - -385424.294+1734429.819/ - -385237.838+1734516.705/ - -385054.960+1734615.288/ - -384916.439+1734725.111/ - -384743.018+1734845.634/ - -384700.100+1734927.800/ - -384535.590+1735103.129/ - -384417.767+1735247.362/ - -384307.296+1735439.834/ - -384204.707+1735639.691/ - -384110.472+1735846.028/ - -384024.996+1740057.892/ - -383948.621+1740314.291/ - -383921.621+1740534.199/ - -383904.198+1740756.567/ - -383856.482+1741020.327/ - -383858.531+1741244.400/ - -383910.331+1741507.706/ - -383917.800+1741644.000/ - -384222.200+1743647.900/ - -390013.400+1744149.200/ - -391224.400+1743328.400/ - -391533.400+1742817.400/ - -391834.300+1741958.000/ - -391822.700+1741410.800/ - -391748.000+1741050.500/ - -391459.800+1741021.700/ - -391106.900+1740942.200/ - -390923.800+1740101.000/ - -391207.000+1735839.400/ - -391838.500+1735857.900/ - -391844.200+1735335.200/ - -390149.400+1734327.000 + -384222.212+1743647.916/ + -390013.392+1744149.236/ + -391224.408+1743328.404/ + -391533.408+1742817.400/ + -391834.308+1741958.008/ + -391822.716+1741410.788/ + -391747.976+1741050.484/ + -391106.900+1740942.228/ + -390923.796+1740100.984/ + -391207.020+1735839.432/ + -391838.520+1735857.936/ + -391844.208+1735335.196/ + -391146.104+1734732.424/ + -390639.708+1734434.332/ + -390406.897+1734345.852/ + -390215.250+1734327.659/ + -390022.797+1734322.072/ + -385830.393+1734329.119/ + -385638.893+1734348.729/ + -385449.145+1734420.735/ + -385301.980+1734504.881/ + -385118.211+1734600.817/ + -384938.623+1734708.105/ + -384803.968+1734826.224/ + -384634.960+1734954.572/ + -384512.271+1735132.474/ + -384356.525+1735319.183/ + -384248.290+1735513.889/ + -384148.080+1735715.722/ + -384056.347+1735923.764/ + -384013.481+1740137.048/ + -383939.802+1740354.572/ + -383915.564+1740615.304/ + -383900.948+1740838.186/ + -383856.064+1741102.148/ + -383900.948+1741326.110/ + -383915.564+1741548.992/ + -383924.804+1741642.132/ + -384222.212+1743647.916 - -390719.200+1764927.000/ - -390714.281+1765141.879/ - -390717.064+1765356.768/ - -390728.914+1765610.841/ - -390749.742+1765823.092/ - -390819.392+1770032.529/ - -390857.642+1770238.177/ - -390944.204+1770439.092/ - -391038.728+1770634.362/ - -391140.804+1770823.116/ - -391249.965+1771004.531/ - -391405.691+1771137.838/ - -391527.411+1771302.325/ - -391654.507+1771417.347/ - -391826.324+1771522.327/ - -392001.400+1771612.300/ - -392200.800+1770935.600/ - -392425.617+1771033.091/ - -392656.362+1771054.521/ - -392927.691+1771041.731/ - -393155.003+1770955.051/ - -393413.811+1770835.842/ - -393619.881+1770646.471/ - -393809.360+1770430.236/ - -393938.897+1770151.274/ - -394045.750+1765854.433/ - -394127.868+1765545.125/ - -394143.958+1765229.155/ - -394133.527+1764912.536/ - -394113.500+1764712.000/ - -395611.400+1764153.200/ - -395522.849+1763838.424/ - -395421.900+1763529.746/ - -395308.489+1763228.816/ - -395143.189+1762937.030/ - -395006.658+1762655.708/ - -394819.645+1762426.087/ - -394622.978+1762209.308/ - -394417.556+1762006.407/ - -394204.347+1761818.310/ - -393944.377+1761645.826/ - -393718.721+1761529.637/ - -393448.496+1761430.300/ - -393214.854+1761348.237/ - -392938.967+1761323.738/ - -392702.027+1761316.958/ - -392425.227+1761327.914/ - -392354.200+1761339.500/ - -392538.800+1763332.000/ - -392508.369+1763333.415/ - -392438.411+1763339.840/ - -392408.643+1763347.612/ - -392339.104+1763356.723/ - -392309.827+1763407.159/ - -392240.850+1763418.909/ - -392212.207+1763431.957/ - -392143.933+1763446.287/ - -392116.062+1763501.881/ - -392050.400+1763520.400/ - -390555.300+1761939.800/ - -390347.144+1762208.805/ - -390151.400+1762453.896/ - -390007.197+1762751.200/ - -385835.316+1763059.379/ - -385716.441+1763417.019/ - -385611.160+1763742.638/ - -385519.960+1764114.700/ - -385443.222+1764451.623/ - -385422.700+1764743.000/ - -390719.200+1764927.000 + -390554.564+1761938.676/ + -390153.710+1762449.740/ + -390009.211+1762746.757/ + -385837.014+1763054.682/ + -385717.808+1763412.104/ + -385612.184+1763737.543/ + -385520.629+1764109.464/ + -385443.528+1764446.285/ + -385426.136+1764743.404/ + -390718.480+1764926.904/ + -390713.680+1765208.148/ + -390718.225+1765422.958/ + -390731.825+1765636.756/ + -390754.378+1765848.538/ + -390825.715+1770057.315/ + -390905.601+1770302.118/ + -390953.736+1770502.008/ + -391049.758+1770656.081/ + -391153.246+1770843.475/ + -391303.723+1771023.376/ + -391420.657+1771155.027/ + -391543.469+1771317.727/ + -391711.533+1771430.844/ + -391844.186+1771533.816/ + -391959.628+1771618.120/ + -392200.588+1770936.288/ + -392327.100+1771015.517/ + -392441.143+1771037.100/ + -392556.357+1771050.259/ + -392712.170+1771054.886/ + -392828.006+1771050.938/ + -392943.288+1771038.438/ + -393057.442+1771017.473/ + -393209.902+1770948.195/ + -393320.115+1770910.822/ + -393427.545+1770825.631/ + -393531.675+1770732.962/ + -393632.016+1770633.213/ + -393728.105+1770526.837/ + -393819.512+1770414.337/ + -393905.843+1770256.266/ + -393946.743+1770133.220/ + -394021.897+1770005.835/ + -394051.035+1765834.780/ + -394113.934+1765700.753/ + -394130.417+1765524.477/ + -394140.358+1765346.691/ + -394143.680+1765208.148/ + -394140.358+1765029.605/ + -394130.417+1764851.819/ + -394113.934+1764715.543/ + -394111.508+1764712.732/ + -395612.408+1764152.836/ + -395423.868+1763536.471/ + -395310.895+1763235.240/ + -395146.008+1762943.103/ + -395009.867+1762701.386/ + -394823.216+1762431.326/ + -394626.878+1762214.069/ + -394421.754+1762010.655/ + -394208.806+1761822.014/ + -393949.060+1761648.959/ + -393723.588+1761532.177/ + -393453.507+1761432.229/ + -393219.966+1761349.542/ + -392944.140+1761324.412/ + -392707.216+1761316.996/ + -392430.391+1761327.319/ + -392353.340+1761329.748/ + -392538.748+1763331.392/ + -392327.100+1763400.779/ + -392214.791+1763430.615/ + -392104.765+1763508.470/ + -392050.604+1763520.652/ + -390554.564+1761938.676 - -405142.100+1734319.900/ - -410045.200+1733710.500/ - -410614.300+1734231.100/ - -412604.200+1733625.000/ - -412604.200+1733625.000/ - -412649.100+1733611.300/ - -412837.200+1733415.000/ - -413207.000+1732935.200/ - -413732.400+1733027.400/ - -413727.400+1733302.000/ - -414529.500+1732615.800/ - -414438.900+1730018.900/ - -414107.300+1724644.400/ - -413217.300+1723919.500/ - -412542.600+1723649.400/ - -411756.200+1723601.900/ - -411708.200+1724923.000/ - -411118.000+1725841.100/ - -411129.000+1730459.100/ - -410750.400+1730458.400/ - -410352.400+1730337.000/ - -410222.900+1730305.400/ - -404450.800+1725902.000/ - -404403.179+1730255.456/ - -404331.419+1730653.548/ - -404315.366+1731054.345/ - -404315.139+1731456.065/ - -404330.739+1731856.914/ - -404402.051+1732255.107/ - -404448.843+1732648.878/ - -404550.767+1733036.488/ - -404707.364+1733416.243/ - -404838.065+1733746.501/ - -405022.195+1734105.689/ - -405142.100+1734319.900/ - -405142.100+1734319.900 + -404448.804+1725901.212/ + -404344.872+1730457.443/ + -404321.169+1730857.149/ + -404313.248+1731258.644/ + -404321.169+1731700.139/ + -404344.872+1732059.845/ + -404424.182+1732455.982/ + -404518.808+1732846.799/ + -404628.343+1733230.577/ + -404752.272+1733605.649/ + -404929.971+1733930.405/ + -405120.712+1734243.309/ + -405141.436+1734319.092/ + -410045.180+1733710.488/ + -410614.292+1734231.068/ + -412649.092+1733611.268/ + -412837.164+1733414.988/ + -413207.008+1732935.232/ + -413732.412+1733027.396/ + -413727.408+1733301.980/ + -414529.484+1732615.828/ + -414438.904+1730018.900/ + -414107.296+1724644.436/ + -413217.304+1723919.476/ + -412542.600+1723649.392/ + -411756.184+1723601.872/ + -411708.196+1724923.016/ + -411117.988+1725841.124/ + -411129.004+1730459.088/ + -410750.376+1730458.404/ + -410222.740+1730305.220/ + -404448.804+1725901.212 - -460323.200+1690106.900/ - -460006.000+1692039.900/ - -455959.700+1692657.200/ - -460235.660+1692721.627/ - -460508.363+1692814.375/ - -460737.284+1692926.205/ - -461001.281+1693056.607/ - -461219.245+1693244.925/ - -461430.113+1693450.362/ - -461632.875+1693711.980/ - -461826.578+1693948.714/ - -462007.100+1694240.100/ - -462654.300+1685047.000/ - -464950.000+1684800.000/ - -465250.500+1683253.600/ - -465148.600+1681354.500/ - -464616.200+1675751.000/ - -462138.600+1674709.300/ - -461844.500+1675907.100/ - -461733.770+1675956.382/ - -461626.469+1680054.893/ - -461522.939+1680201.627/ - -461423.658+1680316.073/ - -461329.074+1680437.660/ - -461239.599+1680605.771/ - -461155.604+1680739.735/ - -461117.422+1680918.843/ - -461045.339+1681102.346/ - -461019.596+1681249.465/ - -461000.387+1681439.394/ - -460952.900+1681540.600/ - -455604.300+1681139.600/ - -455038.100+1681351.900/ - -454512.400+1682343.900/ - -454829.200+1684248.100/ - -455321.550+1684429.550/ - -455457.855+1684822.116/ - -455650.277+1685159.540/ - -455855.347+1685522.303/ - -460112.136+1685828.869/ - -460325.570+1690052.780/ - -460323.200+1690106.900 + -455959.820+1692655.932/ + -460423.445+1692756.693/ + -460653.607+1692902.917/ + -460919.180+1693027.880/ + -461139.044+1693210.969/ + -461352.121+1693411.427/ + -461557.386+1693628.358/ + -461753.867+1693900.734/ + -461940.663+1694147.399/ + -462009.096+1694241.292/ + -462654.312+1685047.004/ + -464949.980+1684800.000/ + -465250.520+1683253.592/ + -465148.600+1681354.516/ + -464616.212+1675751.012/ + -462138.592+1674709.312/ + -461843.236+1675910.788/ + -461710.074+1680015.524/ + -461604.018+1680116.927/ + -461501.901+1680226.384/ + -461404.193+1680343.361/ + -461311.328+1680507.272/ + -461223.704+1680637.481/ + -461141.680+1680813.303/ + -461105.573+1680954.014/ + -461035.653+1681138.855/ + -461012.145+1681327.036/ + -460955.227+1681517.743/ + -460954.900+1681541.040/ + -455604.308+1681139.624/ + -455038.112+1681351.888/ + -454512.384+1682343.872/ + -454829.196+1684248.096/ + -455319.608+1684430.048/ + -455855.704+1685520.496/ + -460324.192+1690059.868/ + -460006.012+1692039.912/ + -455959.820+1692655.932 \ No newline at end of file diff --git a/Maps/Airspace/TMA Sectors.xml b/Maps/Airspace/TMA Sectors.xml index 1e5fa81..989b74c 100644 --- a/Maps/Airspace/TMA Sectors.xml +++ b/Maps/Airspace/TMA Sectors.xml @@ -5,77 +5,133 @@ -365906.720+1734005.304/ -365850.088+1735007.512/ +-365359.050+1734836.851/ +-365031.244+1734804.933/ -364702.004+1734755.797/ +-364332.922+1734809.460/ -364005.587+1734845.768/ +-363641.572+1734944.395/ -363322.420+1735104.848/ +-363009.635+1735246.476/ -362704.668+1735448.468/ +-362408.911+1735709.870/ -362123.681+1735949.583/ +-361850.218+1740246.382/ -361629.669+1740558.917/ -361515.408+1740804.272/ -360118.192+1741302.280/ +-355853.592+1742152.965/ -355757.537+1742708.840/ -355727.576+1743109.228/ -360707.788+1743715.924/ +-360721.499+1744211.415/ -360748.595+1744628.444/ +-360833.532+1745041.645/ -360935.976+1745449.136/ +-361055.464+1745849.075/ -361231.404+1750239.671/ +-361423.083+1750619.199/ -361629.669+1750946.011/ +-361850.218+1751258.546/ -362013.632+1751443.728/ +-362320.667+1752052.857/ -362542.946+1752446.094/ +-362820.930+1752823.280/ -363113.440+1753142.771/ +-363419.191+1753443.044/ -363736.793+1753722.712/ +-364104.767+1753940.534/ -364441.552+1754135.426/ +-364825.517+1754306.470/ -365214.972+1754412.919/ +-365608.185+1754454.211/ -370003.386+1754509.967/ +-370358.789+1754500.000/ -370752.602+1754424.326/ +-371143.039+1754323.145/ -371526.604+1754150.964/ -373047.664+1752322.344/ -373047.628+1751914.988/ -373342.624+1750929.700/ -373424.024+1745852.212/ -374439.768+1745832.664/ +-374516.704+1744849.104/ +-374506.327+1744351.491/ -374435.277+1743856.212/ +-374343.798+1743405.579/ -374232.293+1742921.868/ +-374101.322+1742447.292/ -373911.597+1742023.990/ +-373703.976+1741614.004/ -373439.454+1741219.263/ +-373159.159+1740841.571/ -372904.336+1740522.588/ +-372556.343+1740223.822/ -372236.637+1735946.612/ -372151.372+1735916.836/ -372538.784+1734738.904/ +-371847.687+1734350.062/ +-371412.153+1734205.273/ -370930.384+1734051.227/ +-370444.541+1734008.394/ -365956.809+1733957.004/ -365906.720+1734005.304 -434354.012+1723500.420/ -440920.304+1724247.448/ +-441005.561+1723544.275/ -441014.796+1723052.668/ +-441005.561+1722601.061/ -440937.929+1722111.748/ +-440852.117+1721627.004/ -440748.486+1721149.063/ +-440627.535+1720720.103/ -440449.900+1720302.222/ +-440256.347+1715857.426/ -440033.948+1715525.932/ -440816.296+1714557.996/ +-440210.859+1713735.912/ -435910.248+1713429.496/ -435320.220+1714614.088/ +-435004.782+1714251.256/ +-434658.125+1714039.837/ -434343.882+1713851.664/ +-434023.549+1713727.505/ -433658.666+1713627.940/ +-433330.802+1713553.354/ -433227.456+1713546.392/ -433212.048+1714249.536/ +-432701.712+1714250.946/ -432400.318+1714326.258/ +-432101.842+1714423.118/ -431807.635+1714541.044/ +-431519.010+1714719.399/ -431237.237+1714917.396/ +-431003.529+1715134.109/ -430739.038+1715408.474/ +-430524.846+1715659.304/ -430321.953+1720005.295/ +-430131.275+1720325.039/ -425953.635+1720657.029/ +-425829.759+1721039.676/ -425720.269+1721431.317/ +-425625.681+1721830.228/ -425546.398+1722234.636/ -425533.564+1722551.780/ -425013.776+1723201.248/ +-425050.864+1724021.088/ +-425135.699+1724500.059/ -425238.005+1724932.781/ +-425357.322+1725357.237/ -425533.065+1725811.465/ +-425724.525+1730213.570/ -425930.877+1730601.742/ +-430151.184+1730934.264/ -430424.404+1731249.525/ +-430709.397+1731546.036/ -431004.932+1731822.437/ +-431309.697+1732037.510/ -431453.592+1732144.172/ -434354.012+1723500.420 @@ -104,10 +160,16 @@ -401025.212+1755506.240/ -401148.192+1755647.148/ -401143.944+1761332.484/ +-401415.550+1761423.604/ +-401640.721+1761449.972/ -401907.094+1761459.678/ +-402133.554+1761452.617/ -402358.988+1761428.813/ +-402622.284+1761348.418/ -402842.349+1761251.711/ +-403058.109+1761139.099/ -403308.523+1761011.112/ +-403512.590+1760828.401/ -403559.964+1760735.616/ -402849.404+1755459.904/ -403846.644+1754219.116/ @@ -150,16 +212,27 @@ -412554.912+1751300.912/ -413335.784+1750848.120/ -413636.756+1751410.932/ +-413921.098+1751031.531/ +-414041.166+1750812.978/ -414151.857+1750545.518/ +-414252.626+1750310.286/ -414343.000+1750028.477/ +-414422.592+1745741.341/ -414451.094+1745450.171/ +-414508.283+1745156.293/ -414514.028+1744901.056/ +-414508.283+1744605.819/ -414454.852+1744400.852/ -414457.120+1744400.348/ -420358.968+1743441.700/ +-420229.351+1742817.643/ +-420058.241+1742325.235/ -415908.354+1741844.890/ +-415700.555+1741418.788/ -415435.843+1741008.989/ +-415155.352+1740617.414/ -414900.335+1740245.830/ +-414552.154+1735935.838/ -414232.273+1735648.859/ -414223.688+1735640.560/ -414227.576+1734858.608/ diff --git a/Volumes.xml b/Volumes.xml index a1d0316..6c12d3f 100644 --- a/Volumes.xml +++ b/Volumes.xml @@ -194,55 +194,52 @@ - -412639.900+1735254.500/ - -412218.200+1735627.300/ - -411746.000+1740007.800/ - -410914.800+1741201.300/ - -405942.000+1741849.100/ - -405417.400+1741820.900/ - -403753.800+1745231.600/ - -403753.800+1745948.000/ - -404100.000+1751037.000/ - -404238.500+1751622.200/ - -405706.800+1751656.600/ - -411118.400+1751851.000/ - -411712.100+1751605.900/ - -412554.900+1751300.900/ - -413335.800+1750848.100/ - -413636.200+1751410.100/ - -413812.865+1751212.270/ - -413939.788+1751001.365/ - -414057.809+1750740.724/ - -414206.325+1750511.424/ - -414304.806+1750234.615/ - -414352.800+1745951.504/ - -414429.934+1745703.352/ - -414455.920+1745411.460/ - -414510.557+1745117.160/ - -414513.732+1744821.804/ - -414505.420+1744526.753/ - -414457.800+1744400.000/ - -415112.300+1744056.700/ - -420357.500+1743442.200/ - -420250.537+1742938.015/ - -420124.602+1742442.751/ - -415939.684+1741958.944/ - -415736.607+1741528.805/ - -415516.336+1741114.429/ - -415239.969+1740717.775/ - -414948.727+1740340.652/ - -414643.945+1740024.709/ - -414327.060+1735731.415/ - -414223.500+1735652.000/ - -414227.600+1734858.600/ - -413656.700+1734858.100/ - -413732.400+1733027.400/ - -413207.000+1732935.200/ - -412837.200+1733415.000/ - -412649.100+1733611.300/ - -412704.600+1734310.500/ - -412701.900+1734638.600/ - -412639.900+1735254.500 + -40.710690+175.272830/ + -40.951890+175.282390/ + -41.188450+175.314160/ + -41.286700+175.268310/ + -41.431920+175.216920/ + -41.559940+175.146700/ + -41.610210+175.236370/ + -41.655861+175.175425/ + -41.678102+175.136938/ + -41.697738+175.095977/ + -41.714618+175.052857/ + -41.728611+175.007910/ + -41.739609+174.961484/ + -41.747526+174.913936/ + -41.752301+174.865637/ + -41.753897+174.816960/ + -41.752301+174.768283/ + -41.748570+174.733570/ + -41.749200+174.733430/ + -42.066380+174.578250/ + -42.041486+174.471567/ + -42.016178+174.390343/ + -41.985654+174.312469/ + -41.950154+174.238552/ + -41.909956+174.169164/ + -41.865376+174.104837/ + -41.816760+174.046064/ + -41.764487+173.993288/ + -41.708965+173.946905/ + -41.706580+173.944600/ + -41.707660+173.816280/ + -41.615750+173.816130/ + -41.625670+173.507610/ + -41.535280+173.493120/ + -41.477000+173.570830/ + -41.446980+173.603130/ + -41.451280+173.719590/ + -41.450530+173.777400/ + -41.444460+173.881760/ + -41.296110+174.002170/ + -41.154110+174.200360/ + -40.995000+174.313640/ + -40.904830+174.305800/ + -40.631610+174.875440/ + -40.631610+174.996670/ + -40.710690+175.272830 @@ -264,44 +261,75 @@ -36.985200+173.668140/ -36.980580+173.835420/ + -36.899736+173.810237/ + -36.842012+173.801370/ -36.783890+173.798832/ + -36.725812+173.802628/ -36.668219+173.812713/ + -36.611548+173.828999/ -36.556228+173.851347/ + -36.502676+173.879577/ -36.451297+173.913463/ + -36.402475+173.952742/ -36.356578+173.997106/ + -36.313950+174.046217/ -36.274908+174.099699/ -36.254280+174.134520/ -36.021720+174.217300/ + -35.981553+174.364712/ -35.965983+174.452456/ -35.957660+174.519230/ -36.118830+174.621090/ + -36.122638+174.703171/ -36.130165+174.774568/ + -36.142648+174.844901/ -36.159993+174.913649/ + -36.182073+174.980299/ -36.208723+175.044353/ + -36.239745+175.105333/ -36.274908+175.162781/ + -36.313950+175.216263/ -36.337120+175.245480/ + -36.389074+175.348016/ -36.428596+175.412804/ + -36.472480+175.473133/ -36.520400+175.528547/ + -36.571997+175.578623/ -36.626887+175.622975/ + -36.684658+175.661259/ -36.744876+175.693174/ + -36.807088+175.718464/ -36.870826+175.736922/ + -36.935607+175.748392/ -37.000941+175.752769/ + -37.066330+175.750001/ -37.131278+175.740091/ + -37.195289+175.723096/ -37.257390+175.697490/ -37.513240+175.389540/ -37.513230+175.320830/ -37.561840+175.158250/ -37.573340+174.981170/ -37.744380+174.975740/ + -37.754640+174.813640/ + -37.751757+174.730970/ -37.743133+174.648948/ + -37.728833+174.568216/ -37.708970+174.489408/ + -37.683701+174.413137/ -37.653221+174.339997/ + -37.617771+174.270557/ -37.577626+174.205351/ + -37.533100+174.144881/ -37.484538+174.089608/ + -37.432317+174.039950/ -37.376843+173.996281/ -37.364270+173.988010/ -37.427440+173.794140/ + -37.313246+173.730573/ + -37.236709+173.701465/ -37.158440+173.680896/ + -37.079039+173.668998/ -36.999114+173.665835/ -36.985200+173.668140 @@ -309,111 +337,116 @@ -43.731670+172.583450/ -44.155640+172.713180/ + -44.168211+172.595632/ -44.170777+172.514630/ + -44.168211+172.433628/ -44.160536+172.353263/ + -44.147810+172.274168/ -44.130135+172.196962/ + -44.107649+172.122251/ -44.080528+172.050617/ + -44.048985+171.982618/ -44.009430+171.923870/ -44.137860+171.766110/ + -44.036350+171.626642/ -43.986180+171.574860/ -43.888950+171.770580/ + -43.834662+171.714238/ + -43.782813+171.677733/ -43.728856+171.647684/ + -43.673208+171.624307/ -43.616296+171.607761/ + -43.558556+171.598154/ -43.540960+171.596220/ -43.536680+171.713760/ + -43.450476+171.714152/ -43.400088+171.723961/ + -43.350512+171.739755/ -43.302121+171.761401/ + -43.255281+171.788722/ -43.210344+171.821499/ + -43.167647+171.859475/ -43.127511+171.902354/ + -43.090235+171.949807/ -43.056098+172.001471/ + -43.025354+172.056955/ -42.998232+172.115841/ + -42.974933+172.177688/ -42.955630+172.242033/ + -42.940467+172.308397/ -42.929555+172.376288/ -42.925990+172.431050/ -42.837160+172.533680/ + -42.847462+172.672524/ + -42.859916+172.750016/ -42.877224+172.825772/ + -42.899256+172.899233/ -42.925851+172.969851/ + -42.956812+173.037103/ -42.991910+173.100484/ + -43.030884+173.159518/ -43.073446+173.213757/ + -43.119277+173.262788/ -43.168037+173.306233/ + -43.219360+173.343753/ -43.248220+173.362270/ -43.731670+172.583450 - -445815.300+1681338.800/ - -445622.400+1680548.900/ - -443758.400+1680006.400/ - -442805.600+1674952.900/ - -441108.700+1682153.100/ - -443247.300+1691003.100/ - -442630.100+1693219.500/ - -443106.700+1693534.200/ - -444359.900+1694442.100/ - -445353.200+1693940.500/ - -445804.500+1692850.400/ - -445808.300+1692836.400/ - -452005.200+1690942.100/ - -452805.500+1690247.300/ - -453529.100+1685417.600/ - -454208.100+1685147.000/ - -454531.900+1684527.900/ - -454829.200+1684248.100/ - -454512.400+1682343.900/ - -455038.100+1681351.900/ - -451213.400+1681524.000/ - -451007.400+1681359.600/ - -450840.900+1681301.600/ - -450515.000+1681035.000/ - -450022.100+1681314.700/ - -445815.300+1681338.800 + -44.468220+167.831360/ + -44.185750+168.364750/ + -44.546470+169.167530/ + -44.441700+169.538760/ + -44.733310+169.745030/ + -44.898110+169.661250/ + -44.967920+169.480670/ + -45.468190+169.046480/ + -45.591420+168.904890/ + -45.702250+168.863050/ + -45.758860+168.757750/ + -45.808110+168.713360/ + -45.753440+168.395520/ + -45.843920+168.231080/ + -45.203720+168.256670/ + -45.087500+168.176390/ + -45.006140+168.220750/ + -44.970920+168.227450/ + -44.939550+168.096920/ + -44.632890+168.001790/ + -44.468220+167.831360 - -402849.900+1755501.100/ - -403847.000+1754219.600/ - -404033.600+1753900.000/ - -404109.700+1752801.000/ - -404011.400+1752125.600/ - -404238.500+1751622.200/ - -403753.800+1745948.000/ - -403753.800+1745231.600/ - -394745.200+1744603.200/ - -394643.902+1744709.271/ - -394546.695+1744821.249/ - -394451.441+1744935.747/ - -394358.205+1745052.675/ - -394307.052+1745211.939/ - -394218.041+1745333.443/ - -394131.232+1745457.090/ - -394128.300+1745505.000/ - -394150.700+1752210.200/ - -394256.000+1753525.200/ - -394316.962+1753645.112/ - -394339.189+1753804.421/ - -394403.517+1753922.688/ - -394429.916+1754039.820/ - -394458.355+1754155.724/ - -394528.800+1754310.309/ - -394601.215+1754423.485/ - -394635.561+1754535.165/ - -394711.796+1754645.262/ - -394719.000+1754656.300/ - -401024.900+1755506.700/ - -401148.600+1755648.600/ - -401144.400+1761331.400/ - -401405.802+1761421.217/ - -401630.853+1761448.704/ - -401857.179+1761459.540/ - -402123.669+1761453.612/ - -402349.207+1761430.936/ - -402612.682+1761351.655/ - -402833.000+1761256.039/ - -403049.083+1761144.486/ - -403259.891+1761017.518/ - -403504.417+1760835.780/ - -403601.000+1760737.800/ - -402849.900+1755501.100 + -39.795910+174.767040/ + -39.690900+174.917910/ + -39.697250+175.369690/ + -39.715050+175.590330/ + -39.771190+175.750240/ + -39.787860+175.782170/ + -40.173670+175.918400/ + -40.196720+175.946430/ + -40.195540+176.225690/ + -40.237653+176.239890/ + -40.277978+176.247215/ + -40.318637+176.249911/ + -40.359321+176.247949/ + -40.399719+176.241337/ + -40.439523+176.230116/ + -40.478430+176.214364/ + -40.516141+176.194194/ + -40.552368+176.169753/ + -40.586830+176.141223/ + -40.599990+176.126560/ + -40.480390+175.916640/ + -40.646290+175.705310/ + -40.676180+175.650510/ + -40.686290+175.466770/ + -40.670010+175.357270/ + -40.710870+175.272460/ + -40.631300+174.996540/ + -40.631670+174.914950/ + -39.795910+174.767040 -370105.200+1743705.400/ From 982600516db22e2f0ee02d7d4697e21a333e0e95 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Thu, 12 Jan 2023 16:47:29 +1300 Subject: [PATCH 25/50] 2302 AIP Changes --- Airspace.xml | 142 +++++++++++++--------- Maps/Airspace/ALL_RNAV.xml | 42 +++---- Maps/NZGT/GT_ACU.xml | 46 +++++-- Maps/NZNP/NP_ACU.xml | 141 ++++++++++----------- Maps/NZNS/NS_ACU.xml | 26 ++-- Maps/NZOH/OH_ACU.xml | 20 +-- Maps/NZRO/RO_ACU.xml | 29 ++--- Maps/NZTG/TG_ACU.xml | 40 +++--- Maps/NZWN/WN_ACU.xml | 2 +- Maps/NZWU/WU_ACU.xml | 14 +-- Maps/Navaids/ATS Routes.xml | 69 ++++++----- Maps/Navaids/Holding.xml | 236 ++++++++++++++++++++++++------------ 12 files changed, 470 insertions(+), 337 deletions(-) diff --git a/Airspace.xml b/Airspace.xml index aceabf5..798c888 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -286,7 +286,7 @@ - + @@ -456,24 +456,25 @@ - - - - - + + + + + - - + + + - + - + - - - + + + @@ -739,8 +740,8 @@ - - + + @@ -753,8 +754,8 @@ - - + + @@ -1023,13 +1024,13 @@ AA VOR/ SALAG/ IGLET/ TEKEP/ -PADDY +VEMLA AA VOR/ UPLAR/ RIGMI/ -ELLAS +DUBUD AA VOR/ @@ -1741,6 +1742,16 @@ TUT NDB/ CLAIB/ DOROS/ GOTSO + + +WN VOR/ +OH VOR/ +EGEVI/ +NP VOR + + +CH VOR/ +HK NDB GS VOR/ @@ -2158,33 +2169,39 @@ RUNOD/ TESAS -COOPS/ +KAGRI/ OMKIN/ EKODA/ KABIN/ MOLGI/ CH VOR/ OKTOM/ -OLBAD +OLBAD/ +NOKAK/ +BOMTI/ +VEMET/ +PABGO/ +ISPAK/ +RG VOR AA VOR/ VELMO/ UNTET/ MIDAT/ -TUBBY +TUVBI AA VOR/ LUNBI/ LEGAN/ -WALTZ +REPUD WN VOR/ GOPLU/ TOMAR/ -GILLY +BOTGU WN VOR/ @@ -2211,7 +2228,7 @@ SULON/ BOKED -MIKEL/ +MIKEG/ SASRO/ PEBLU/ AA VOR @@ -2244,14 +2261,14 @@ SMIFF ADKOS/ DADLU/ OMKIN/ -MIKEL +MIKEG QN VOR/ LIBLA/ MADOK/ NUMSA/ -JUMPA +SAKBI WB VOR/ @@ -3229,6 +3246,11 @@ WAPOU WAPOU/ ATNUV/ NP VOR + + +BIKOT/ +UKLAV/ +MERAS NUKTO/ @@ -3585,6 +3607,7 @@ RILEY -364744.730+1754804.620 -421813.280+1713901.390 -212959.110-1601347.230 + -402240.800+1564645.000 -461344.120+1693411.590 -465204.190+1681308.190 -363303.270+1751207.010 @@ -3672,7 +3695,6 @@ RILEY -391920.000+1734539.000 -412741.230+1723823.030 -385410.770+1780323.650 - -412754.310+1575000.539 -411633.860+1744837.160 -395045.410+1732039.190 -383353.820+1774057.990 @@ -3770,6 +3792,7 @@ RILEY -352846.890+1743141.520 -422231.820+1735126.900 -433000.130+1705815.530 + -290030.398+1564139.000 -355018.880+1742133.050 -395210.410+1745144.000 -382639.380+1754213.260 @@ -3800,6 +3823,7 @@ RILEY +023511.004-1643719.020 -463206.460+1681006.560 -250000.000+1771957.780 + -392414.130+1743434.830 -370032.660+1755741.410 -411624.650+1730502.000 -380113.270+1752151.040 @@ -3836,7 +3860,6 @@ RILEY -390304.540+1731830.740 -380224.150+1762122.030 -413005.070+1740511.710 - -290030.431+1564139.041 -050000.000-1670407.000 -410421.820+1732037.700 -384046.650+1773543.030 @@ -3937,7 +3960,6 @@ RILEY -370201.720+1740833.300 -361146.340+1742824.290 -364721.390+1742028.470 - -402240.840+1564644.969 -350808.720+1730826.990 -370933.920+1743416.510 -445930.330+1690340.670 @@ -4176,7 +4198,6 @@ RILEY -741000.000+1665206.000 -412939.190+1744104.360 -141631.000-1703249.180 - -350558.319+1591141.150 -450236.830+1684052.600 -205659.740-1592009.820 -431528.700+1725832.590 @@ -4190,6 +4211,7 @@ RILEY -362836.480+1743010.150 -455223.890+1700843.970 -365612.530+1754153.360 + -412754.299+1575000.499 -462829.250+1680740.100 -455616.130+1693940.120 -412528.400+1714532.010 @@ -4460,7 +4482,7 @@ RILEY -402158.000+1630000.000 -415142.600+1711141.010 -122745.680-1705253.810 - -383544.790+1573204.650 + -383544.801+1573204.700 -375527.590+1753703.510 -175110.000-1513942.000 -393736.940+1765730.270 @@ -4661,7 +4683,6 @@ RILEY -364717.000+1740032.000 -460816.440+1685327.320 -450356.600+1683730.650 - -435644.610+1700856.970 -411714.060+1730346.520 -440730.170+1703022.530 -445455.180+1690436.000 @@ -4729,7 +4750,6 @@ RILEY -360426.771+1752720.880 -264604.090-1650000.000 -433136.480+1722457.220 - -265244.231+1582515.049 -393712.340+1741647.800 -370532.150+1744602.460 -182411.000-1781551.000 @@ -4909,6 +4929,7 @@ RILEY -433028.350+1725647.520 -402634.720+1753053.430 -250000.000-1771431.640 + -354650.902+1580455.301 -365355.700+1755644.290 -374007.620+1751211.440 -362254.590+1753657.390 @@ -4992,6 +5013,7 @@ RILEY -410732.340+1730740.710 -211710.000-1593244.240 -403513.460+1750521.010 + -350558.301+1591141.201 -274720.150+1760926.920 -445843.680+1695209.200 -401305.390+1753402.780 @@ -5159,7 +5181,6 @@ RILEY -443623.000+1705916.000 -444105.000+1704653.980 -442902.501+1710725.612 - -405355.799+1604237.141 -384945.070+1752259.930 -391122.500+1742614.580 -372646.560+1752420.450 @@ -5177,6 +5198,7 @@ RILEY -365816.880+1745559.110 -443447.730+1712105.610 -395951.600+1753509.140 + -405355.799+1604237.102 -461726.760+1681414.260 -142030.210-1704328.240 -285434.070+1654827.160 @@ -5214,6 +5236,7 @@ RILEY -461214.430+1695538.630 -374040.940+1761734.100 -455522.180+1691719.090 + -371926.470+1753049.850 -411742.940+1743408.740 -385058.600+1775051.070 -412954.630+1744743.120 @@ -5297,6 +5320,7 @@ RILEY -381617.840+1705550.700 -401657.860+1752425.680 -313006.720-1700000.000 + -265244.198+1582515.100 -375901.260+1761025.240 -411532.820+1730943.860 -415018.900+1743752.260 @@ -5338,7 +5362,6 @@ RILEY -365949.080+1751802.760 -415252.740+1741535.340 -380555.940+1754613.120 - -354650.948+1580455.351 -142740.680-1705614.130 -394254.580+1742035.200 -415032.320+1741006.050 @@ -6122,8 +6145,8 @@ RILEY -444648.160+1691823.210 -445948.600+1684206.700 -411702.800+1730755.500 - -412004.800+1731050.500 -374355.600+1760719.700 + -412004.800+1731050.500 -392539.800+1751654.900 -415229.400+1725138.800 -384417.600+1760100.700 @@ -6764,8 +6787,8 @@ RILEY - - OMUBU/MAMUS + + MAMUS AGULA @@ -6925,7 +6948,10 @@ RILEY PP NDB WEBER - + + VARMA/PEXUR/LATIG/VANSA/ISPAG/BUGNO + + GUSUR LIGDO/VANSA/ISPAG/BUGNO DOVAT/DAPNO @@ -6936,10 +6962,10 @@ RILEY DOVAT/INGLE/ANDOM/SELTA NUTMI/MUMOX/VELGA - + IGDIL/ATRUG/HARVO - + IDMAT/SEGMI/RUVMO/UBSUK/HARVO @@ -6950,7 +6976,7 @@ RILEY TUIHU/MANGA TUIHU/SELTA - + SAVLO ISPAG/BUGNO INGLE/ENVAG/TOKES/DAPNO @@ -6959,7 +6985,7 @@ RILEY INGLE/ANDOM/MANGA INGLE/ANDOM/SELTA - + NP VOR AKAVI ALADA @@ -7301,27 +7327,25 @@ RILEY DOTAR - + TENIX/MORTA FALLS GOBUK - ODOLO BATAT/OLDON TODAN/PIBOV - + TENIX/RUSTA NOBAR - + PATMO/TODAN FALLS GOBUK - ODOLO OLDON PIBOV - + PATMO/UBSET NOBAR @@ -8235,10 +8259,10 @@ RILEY BUGNO/ISPAG/UPDAL - + HARVO/ATRUG/UPDAL - + MUMOX/NUTMI/BEMLI/VARMA RUPNU VELGA @@ -8249,17 +8273,17 @@ RILEY RUPNU SELTA - + PEXUR/VARMA DOBBO HARVO/ATRUG/BOKUL NP VOR/BOKUL UPDAL/LATIG/BOKUL - + SELTA/TUIHU/VANSA/UPDAL - + SUBRA/UPDAL DOBBO/IPNAB/OLMOT NP VOR/RITGI @@ -8267,14 +8291,14 @@ RILEY RUPNU/MUMOX/NUTMI/VARMA/LATIG/RITGI VELGA/MUMOX/NUTMI/VARMA/LATIG/RITGI - + VANSA/UPDAL IGDOT/TUIHU MANGA/TUIHU NP VOR/LIGDO SELTA/ANDOM - + VISAD/VARMA IGDOT/TUIHU/INGLE/DOVAT MANGA/ANDOM/INGLE/DOVAT @@ -9710,8 +9734,8 @@ RILEY - - + + diff --git a/Maps/Airspace/ALL_RNAV.xml b/Maps/Airspace/ALL_RNAV.xml index fad061f..a22adf7 100644 --- a/Maps/Airspace/ALL_RNAV.xml +++ b/Maps/Airspace/ALL_RNAV.xml @@ -120,6 +120,7 @@ QN770 QN779 QN774 + BONLI ADKAG RO366 RO364 @@ -260,6 +261,7 @@ KOPUA COOKS UKLIP + ATMAS MAMUS NUKTO UPVOK @@ -286,6 +288,7 @@ PANGO UPLIN BOLOR + VARMA AROPA ELBOW NANUA @@ -331,6 +334,8 @@ DABGU NILID SEBSA + TOTRA + NIKOR OKERE TENIX MORTA @@ -379,8 +384,10 @@ PILUP IGOVU OLVOL + DUDED AVLOR BUPKA + BASEP ADGAT BELVO IGPOL @@ -416,7 +423,6 @@ LUTUX DOVED NOPEM - PATRU ISLOP NILIB PALTU @@ -460,7 +466,6 @@ ESKAT OMGET PAROA - ATMAS WAPOU MAKOS TAYLA @@ -469,13 +474,9 @@ GUNDA LUGDU SADUN - VARMA - UPDAL PAMOA ORBEL OLNAN - TOTRA - NIKOR WAIPA AMURI TU593 @@ -488,8 +489,6 @@ BURKI WS408 UGSAP - DUDED - BASEP @@ -503,6 +502,7 @@ OVSED IDPON GM483 + GT403 -39.722220+176.710770 -39.649380+176.763350 -39.582160+176.811770 @@ -516,7 +516,6 @@ MS572 -36.667425+174.640756 -39.449436+176.869419 - ORUBA SAKOG PP414 PP421 @@ -578,6 +577,7 @@ KOPUA COOKS UKLIP + ATMAS MAMUS NUKTO UPVOK @@ -604,6 +604,7 @@ PANGO UPLIN BOLOR + VARMA AROPA ELBOW NANUA @@ -649,6 +650,8 @@ DABGU NILID SEBSA + TOTRA + NIKOR OKERE TENIX MORTA @@ -697,8 +700,10 @@ PILUP IGOVU OLVOL + DUDED AVLOR BUPKA + BASEP ADGAT BELVO @@ -743,7 +748,6 @@ -39.378392+176.915156 -39.536822+176.859764 NOPEM - PATRU ISLOP NILIB PALTU @@ -795,7 +799,6 @@ ESKAT OMGET PAROA - ATMAS WAPOU MAKOS TAYLA @@ -804,13 +807,9 @@ GUNDA LUGDU SADUN - VARMA - UPDAL PAMOA ORBEL OLNAN - TOTRA - NIKOR WAIPA AMURI TU593 @@ -823,8 +822,6 @@ BURKI WS408 UGSAP - DUDED - BASEP LENGU/UGRUS/IGPOL/-370058.741+1744614.819 EMRAG/ORESO/UGOMU/-370023.962+1744820.671 @@ -875,8 +872,9 @@ KOPUA/VESAV/-384010.870+1775844.540 COOKS/KOPUA UKLIP/KOPUA - ATMAS/IDPAX/-435421.931+1700739.900 + ATMAS/IDPAX/GT403/-435421.931+1700739.900 MAMUS/ATMAS + GT403/-435455.541+1700747.791 WAPOU/HA906/-393328.181+1741610.988 NUKTO/WAPOU UPVOK/WAPOU @@ -942,10 +940,10 @@ BOBIT/NUTGO DOTGO/NUTGO LELUK/NUTGO - GUPIL/DOXIN/-401159.032+1752309.622 + GUPIL/DOXIN/-401158.931+1752309.751 ADKIS/GUPIL BOBIT/GUPIL - SOSLA/VELSU/-401302.150+1752325.670 + SOSLA/VELSU/-401302.039+1752325.789 NOBED/SOSLA VARNO/SOSLA ENDIX/SAKOG/PEDBA/-401233.710+1752359.179 @@ -968,8 +966,8 @@ DABGU/LEVBI NILID/LEVBI SEBSA/ANGEB/RC401/-465354.460+1680617.482 - TOTRA/IGOBA/-38.125190+176.293950/-380601.598+1761913.238 - -38.125190+176.293950/-380655.750+1761841.170 + TOTRA/IGOBA/RO563/-380601.598+1761913.238 + RO563/-380655.750+1761841.170 NIKOR/ELKOB/-380601.598+1761913.238 OKERE/NIKOR TENIX/RIPSA/-374021.900+1761118.200 diff --git a/Maps/NZGT/GT_ACU.xml b/Maps/NZGT/GT_ACU.xml index 6b770e8..1408043 100644 --- a/Maps/NZGT/GT_ACU.xml +++ b/Maps/NZGT/GT_ACU.xml @@ -2,12 +2,13 @@ - - -43.915428+170.129942/GT15T/OMUBU/MAMUS + + -43.915428+170.129942/GT15T/MAMUS - + GT15T - OMUBU + + MAMUS - + + GT403 + + ATMAS MAMUS @@ -26,17 +30,41 @@ IDPAX - - ATMAS - - ATMAS/IDPAX/-435421.931+1700739.900 + + ATMAS/IDPAX/GT403/-435421.931+1700739.900 MAMUS/ATMAS + + + + + GT403 + + + + ATMAS + MAMUS + + + + IDPAX + + + + ATMAS/IDPAX/GT403/-435455.541+1700747.791 + MAMUS/ATMAS + + + diff --git a/Maps/NZNP/NP_ACU.xml b/Maps/NZNP/NP_ACU.xml index ea256e1..228bdea 100644 --- a/Maps/NZNP/NP_ACU.xml +++ b/Maps/NZNP/NP_ACU.xml @@ -2,43 +2,45 @@ - + -39.005644+174.183889/NP05T/IGDIL/ATRUG/HARVO - + NP05T/SAVLO - + SAVLO/ISPAG/BUGNO - + SAVLO/INGLE/ENVAG/TOKES/DAPNO - + SAVLO/UPDAL/OSTOG/MOPMI/HARVO - + SAVLO/TUIHU/IGDOT - + INGLE/ANDOM/MANGA - + ANDOM/SELTA + + SAVLO + NP05T IGDIL ATRUG HARVO - SAVLO ISPAG BUGNO INGLE @@ -66,55 +68,55 @@ - + RUPNU/MUMOX - + VELGA/MUMOX - + MUMOX/NUTMI/BEMLI/VARMA - + DOBBO/PEXUR - + HARVO/ATRUG/BOKUL/PEXUR - + NP VOR/BOKUL - + UPDAL/LATIG/BOKUL - + PEXUR/VARMA - + IGDOT/TUIHU/INGLE/DOVAT/VISAD - + MANGA/ANDOM/INGLE - + SELTA/ANDOM - + BUGNO/ISPAG/VISAD - + VISAD/VARMA @@ -168,67 +170,71 @@ - + + VARMA + LUTUX - - VARMA - + VARMA/LUTUX/-390037.609+1741012.241 - - -39.010447+174.170067/NP23T/GUSUR + + -39.010447+174.170067/NP23T/VARMA/PEXUR/LATIG/VANSA/ISPAG/BUGNO - + + NP23T/GUSUR + + + GUSUR/LIGDO/VANSA/ISPAG/BUGNO - + GUSUR/DOVAT/DAPNO - + VANSA/TOMEP/HARVO - + DOVAT/INGLE/TUIHU/IGDOT - + INGLE/ANDOM/MANGA - + GUSUR/NUTMI/MUMOX/RUPNU - + ANDOM/SELTA - + MUMOX/VELGA - + NP23T/-39.025278+174.115000/IDMAT/SEGMI/RUVMO/UBSUK/HARVO - NP23T/VARMA/PEXUR/BOKUL/LATIG + PEXUR/BOKUL/LATIG @@ -251,36 +257,41 @@ TUIHU/SELTA - + NP23T/NP05T/-39.019020+174.144470/-38.994540+174.106800/-38.982730+174.130690/-38.987760+174.162190/NP VOR/-39.359100+174.578660 - + -39.359100+174.578660/AKAVI - + -39.359100+174.578660/ALADA - + -39.359100+174.578660/LEDOR - + -39.359100+174.578660/TELIM - + -39.359100+174.578660/TPAPA + + VARMA + GUSUR + NP23T - GUSUR - LIGDO + PEXUR + LATIG VANSA ISPAG BUGNO + LIGDO DOVAT DAPNO TOMEP @@ -299,10 +310,7 @@ SEGMI RUVMO UBSUK - VARMA - PEXUR BOKUL - LATIG ATRUG NP05T NP VOR @@ -313,10 +321,10 @@ TPAPA diff --git a/Maps/NZNS/NS_ACU.xml b/Maps/NZNS/NS_ACU.xml index b180d9c..c488398 100644 --- a/Maps/NZNS/NS_ACU.xml +++ b/Maps/NZNS/NS_ACU.xml @@ -3,7 +3,7 @@ - -41.292228+173.229461/NS02T/NS20T/-41.255556+173.258889/RIKRU/DUMIK + -41.292228+173.229461/NS20T/-41.255556+173.258889/RIKRU/DUMIK @@ -22,7 +22,7 @@ - NS20T/GUSMI/LEMUT + -41.292228+173.229461/NS02T/NS20T/GUSMI/LEMUT @@ -46,10 +46,9 @@ - -41.292228+173.229461/NS20T/NS02T/-41.279750+173.243550/-40.998670+173.386370 + NS20T/NS02T/-41.279750+173.243550/-40.998670+173.386370 - NS02T NS20T RIKRU DUMIK @@ -59,6 +58,7 @@ NESTA BISEB CONOR + NS02T GUSMI LEMUT SEBGI @@ -164,9 +164,7 @@ - - ORUBA - + ELMAX @@ -181,7 +179,6 @@ NOPEM - PATRU ISLOP @@ -206,7 +203,6 @@ TUMGO ESNED NOPEM - PATRU ISLOP @@ -371,9 +367,7 @@ - - ORUBA - + ELMAX @@ -400,9 +394,7 @@ - - ORUBA - + ELMAX @@ -429,9 +421,7 @@ - - ORUBA - + ELMAX diff --git a/Maps/NZOH/OH_ACU.xml b/Maps/NZOH/OH_ACU.xml index f1b0aa5..d455015 100644 --- a/Maps/NZOH/OH_ACU.xml +++ b/Maps/NZOH/OH_ACU.xml @@ -24,10 +24,12 @@ + + DANPO + OH09T OH27T - DANPO SOTVO ABTOL NUNGI @@ -125,9 +127,11 @@ OH27T/OH09T + + ENGOK + OH27T - ENGOK IDSEN ABTOL SANUB @@ -200,7 +204,7 @@ PEDBA - + @@ -215,11 +219,11 @@ - GUPIL/DOXIN/-401159.032+1752309.622 + GUPIL/DOXIN/-401158.931+1752309.751 ADKIS/GUPIL BOBIT/GUPIL - + - + @@ -242,11 +246,11 @@ - SOSLA/VELSU/-401302.150+1752325.670 + SOSLA/VELSU/-401302.039+1752325.789 NOBED/SOSLA VARNO/SOSLA - + - + + BONLI + OKERE @@ -367,21 +368,21 @@ - + + TOTRA + IGOBA - - TOTRA - - TOTRA/IGOBA/-38.125190+176.293950/-380655.750+1761841.170 + + TOTRA/IGOBA/RO563/-380655.750+1761841.170 diff --git a/Maps/NZTG/TG_ACU.xml b/Maps/NZTG/TG_ACU.xml index 99e34fe..14b67f9 100644 --- a/Maps/NZTG/TG_ACU.xml +++ b/Maps/NZTG/TG_ACU.xml @@ -6,35 +6,31 @@ -37.673806+176.209056/TG07T/-37.677222+176.288889/BELET - + TG07T/PATMO/TODAN - + TODAN/FALLS - + TODAN/GOBUK - - TODAN/ODOLO - - - + TODAN/OLDON - + TODAN/PIBOV - + PATMO/UBSET - + UBSET/NOBAR @@ -44,7 +40,6 @@ TODAN FALLS GOBUK - ODOLO OLDON PIBOV UBSET @@ -56,7 +51,6 @@ UBSET FALLS GOBUK - ODOLO OLDON PIBOV NOBAR @@ -155,35 +149,31 @@ -37.672750+176.188389/TG25T/-37.668333+176.112778/DOTAR - + TG25T/TENIX/MORTA - + MORTA/FALLS - + MORTA/GOBUK - - MORTA/ODOLO - - - + MORTA/BATAT/OLDON - + MORTA/TODAN/PIBOV - + TENIX/RUSTA - + RUSTA/NOBAR @@ -193,7 +183,6 @@ MORTA FALLS GOBUK - ODOLO BATAT OLDON TODAN @@ -207,7 +196,6 @@ RUSTA FALLS GOBUK - ODOLO OLDON PIBOV NOBAR diff --git a/Maps/NZWN/WN_ACU.xml b/Maps/NZWN/WN_ACU.xml index bc347bd..ea00ddf 100644 --- a/Maps/NZWN/WN_ACU.xml +++ b/Maps/NZWN/WN_ACU.xml @@ -510,7 +510,6 @@ GANJI COUBY UPLUD - LAXIV URGEV @@ -545,6 +544,7 @@ SABDA TANEN VANDA + LAXIV IRNIL GAMJU AKTAN diff --git a/Maps/NZWU/WU_ACU.xml b/Maps/NZWU/WU_ACU.xml index 238699f..d815747 100644 --- a/Maps/NZWU/WU_ACU.xml +++ b/Maps/NZWU/WU_ACU.xml @@ -29,6 +29,7 @@ + DUDED AVLOR BUPKA @@ -37,18 +38,16 @@ -39.914692+174.940081 - - DUDED - + DUDED/-39.914692+174.940081/-395735.179+1750104.951 AVLOR/DUDED BUPKA/DUDED @@ -80,6 +79,7 @@ + BASEP ADGAT BELVO @@ -88,19 +88,17 @@ BUSBI - - BASEP - + BASEP/BUSBI/-395801.808+1750151.071 ADGAT/BASEP BELVO/BASEP diff --git a/Maps/Navaids/ATS Routes.xml b/Maps/Navaids/ATS Routes.xml index bdb8860..46f8677 100644 --- a/Maps/Navaids/ATS Routes.xml +++ b/Maps/Navaids/ATS Routes.xml @@ -3,8 +3,8 @@ NU NDB.A212.PUPIS NOBEY.A338.CH VOR - AA VOR.A346.PADDY - AA VOR.A464.ELLAS + AA VOR.A346.VEMLA + AA VOR.A464.DUBUD AA VOR.A578.AGTEM AA VOR.A580.FA VOR TBU VOR.A584.FU NDB @@ -97,6 +97,8 @@ WN VOR.H534.PM VOR FA VOR.H901.TUT NDB TUT NDB.H969.GOTSO + WN VOR.J142.NP VOR + CH VOR.J203.HK NDB GS VOR.R327.NU NDB GOKIT.R453.FA VOR NF VOR.R582.KRILL @@ -171,20 +173,20 @@ ELDIB.KZ877.TASAM CH VOR.L326.NF VOR CH VOR.L503.TESAS - COOPS.L508.OLBAD - AA VOR.L513.TUBBY - AA VOR.L521.WALTZ - WN VOR.M625.GILLY + KAGRI.L508.RG VOR + AA VOR.L513.TUVBI + AA VOR.L521.REPUD + WN VOR.M625.BOTGU WN VOR.M636.VELKU WN VOR.M639.LHI NDB KABIN.M643.FONLO CH VOR.N750.BOKED - MIKEL.N759.AA VOR + MIKEG.N759.AA VOR AA VOR.N774.AKALU BYRRD.P640.HELGE QN VOR.P753.SMIFF - ADKOS.P766.MIKEL - QN VOR.P880.JUMPA + ADKOS.P766.MIKEG + QN VOR.P880.SAKBI WB VOR.Q100.WN VOR MAHIA.Q101.WK NDB RUGVI.Q102.OPABI @@ -363,6 +365,7 @@ TPAPA.Z172.RIWUT AKAVI.Z187.WAPOU WAPOU.Z258.NP VOR + BIKOT.Z500.MERAS NUKTO.Z515.MANGA MANGA.Z630.OPABI CH VOR.Z865.RILEY @@ -392,10 +395,10 @@ SALAG IGLET TEKEP - PADDY + VEMLA UPLAR RIGMI - ELLAS + DUBUD KALAG NISET POREN @@ -741,6 +744,7 @@ ANITR DOROS CLAIB + EGEVI IBESO AUTEL IDNIP @@ -896,17 +900,22 @@ MOLGI OKTOM OLBAD - COOPS + NOKAK + BOMTI + VEMET + PABGO + ISPAK + KAGRI VELMO MIDAT UNTET - TUBBY + TUVBI LUNBI LEGAN - WALTZ + REPUD GOPLU TOMAR - GILLY + BOTGU TANEN SASRO VELKU @@ -919,7 +928,7 @@ SULON BOKED PEBLU - MIKEL + MIKEG MADEP OLREL AKALU @@ -937,7 +946,7 @@ DADLU LIBLA NUMSA - JUMPA + SAKBI LUTKA IGMUL GOVDU @@ -1055,7 +1064,6 @@ LANIB NUPDO NODAD - NOKAK NONAT ATOLI TAZEY @@ -1154,6 +1162,7 @@ UPVAP RIWUT ATNUV + UKLAV NUKTO ERVAX @@ -1186,10 +1195,10 @@ SALAG IGLET TEKEP - PADDY + VEMLA UPLAR RIGMI - ELLAS + DUBUD KALAG NISET POREN @@ -1535,6 +1544,7 @@ ANITR DOROS CLAIB + EGEVI IBESO AUTEL IDNIP @@ -1690,17 +1700,22 @@ MOLGI OKTOM OLBAD - COOPS + NOKAK + BOMTI + VEMET + PABGO + ISPAK + KAGRI VELMO MIDAT UNTET - TUBBY + TUVBI LUNBI LEGAN - WALTZ + REPUD GOPLU TOMAR - GILLY + BOTGU TANEN SASRO VELKU @@ -1713,7 +1728,7 @@ SULON BOKED PEBLU - MIKEL + MIKEG MADEP OLREL AKALU @@ -1731,7 +1746,7 @@ DADLU LIBLA NUMSA - JUMPA + SAKBI LUTKA IGMUL GOVDU @@ -1849,7 +1864,6 @@ LANIB NUPDO NODAD - NOKAK NONAT ATOLI TAZEY @@ -1948,6 +1962,7 @@ UPVAP RIWUT ATNUV + UKLAV NUKTO ERVAX diff --git a/Maps/Navaids/Holding.xml b/Maps/Navaids/Holding.xml index 217122e..d933fb2 100644 --- a/Maps/Navaids/Holding.xml +++ b/Maps/Navaids/Holding.xml @@ -1327,6 +1327,84 @@ -440206.856+1685739.102/ -440206.750+1685738.985/ -440933.480+1685623.530 + +-392414.130+1743434.830/ +-392403.710+1743425.759/ +-392352.725+1743418.050/ +-392341.263+1743411.610/ +-392329.411+1743406.487/ +-392317.258+1743402.722/ +-392304.898+1743400.341/ +-392252.425+1743359.363/ +-392239.934+1743359.795/ +-392227.519+1743401.635/ +-392215.275+1743404.866/ +-392203.295+1743409.465/ +-392151.671+1743415.397/ +-392140.491+1743422.616/ +-392129.840+1743431.068/ +-392119.798+1743440.687/ +-392110.443+1743451.400/ +-392101.844+1743503.127/ +-392054.069+1743515.777/ +-392047.175+1743529.254/ +-392041.216+1743543.457/ +-392036.235+1743558.276/ +-392032.272+1743613.600/ +-392029.357+1743629.312/ +-392027.511+1743645.292/ +-392026.748+1743701.420/ +-392027.075+1743717.572/ +-392028.489+1743733.626/ +-392030.979+1743749.459/ +-392034.526+1743804.952/ +-392039.104+1743819.988/ +-392044.677+1743834.450/ +-392051.202+1743848.230/ +-392058.632+1743901.223/ +-392106.909+1743913.330/ +-392115.969+1743924.459/ +-392125.745+1743934.525/ +-392125.749+1743934.374/ +-392729.421+1744516.724/ +-392739.728+1744525.714/ +-392750.707+1744533.445/ +-392802.164+1744539.907/ +-392814.012+1744545.051/ +-392826.161+1744548.839/ +-392838.519+1744551.241/ +-392850.991+1744552.239/ +-392903.483+1744551.824/ +-392915.900+1744550.000/ +-392928.146+1744546.781/ +-392940.129+1744542.191/ +-392951.758+1744536.264/ +-393002.944+1744529.045/ +-393013.602+1744520.590/ +-393023.651+1744510.963/ +-393033.013+1744500.236/ +-393041.618+1744448.491/ +-393049.401+1744435.819/ +-393056.301+1744422.314/ +-393102.267+1744408.081/ +-393107.252+1744353.228/ +-393111.219+1744337.867/ +-393114.138+1744322.116/ +-393115.986+1744306.094/ +-393116.750+1744249.925/ +-393116.422+1744233.731/ +-393115.007+1744217.636/ +-393112.514+1744201.763/ +-393108.963+1744146.231/ +-393104.381+1744131.161/ +-393058.802+1744116.666/ +-393052.270+1744102.858/ +-393044.834+1744049.841/ +-393036.550+1744037.714/ +-393027.482+1744026.570/ +-393017.699+1744016.493/ +-393017.589+1744016.544/ +-392414.130+1743434.830 -410421.820+1732037.700/ -410433.066+1732030.731/ @@ -2343,81 +2421,81 @@ -435553.040+1674034.010 -392146.160+1742340.030/ --392134.021+1742344.259/ --392122.319+1742349.927/ --392111.043+1742356.892/ --392100.279+1742405.100/ --392050.109+1742414.490/ --392040.611+1742424.990/ --392031.855+1742436.519/ --392023.911+1742448.990/ --392016.836+1742502.309/ --392010.686+1742516.373/ --392005.506+1742531.076/ --392001.337+1742546.307/ --391958.210+1742601.948/ --391956.149+1742617.883/ --391955.169+1742633.988/ --391955.278+1742650.143/ --391956.475+1742706.224/ --391958.751+1742722.110/ --392002.089+1742737.679/ --392006.463+1742752.813/ --392011.839+1742807.397/ --392018.179+1742821.320/ --392025.432+1742834.477/ --392033.544+1742846.768/ --392042.453+1742858.098/ --392052.092+1742908.381/ --392102.387+1742917.540/ --392113.260+1742925.505/ --392124.628+1742932.214/ --392136.405+1742937.617/ --392148.501+1742941.673/ --392200.825+1742944.349/ --392213.282+1742945.627/ --392225.777+1742945.495/ --392238.216+1742943.955/ --392250.505+1742941.018/ --392250.405+1742940.919/ --393008.555+1742729.815/ --393020.543+1742725.641/ --393032.250+1742719.977/ --393043.531+1742713.011/ --393054.301+1742704.797/ --393104.478+1742655.397/ --393113.984+1742644.882/ --393122.746+1742633.332/ --393130.698+1742620.836/ --393137.779+1742607.487/ --393143.935+1742553.389/ --393149.120+1742538.648/ --393153.293+1742523.377/ --393156.424+1742507.691/ --393158.488+1742451.712/ --393159.469+1742435.560/ --393159.359+1742419.358/ --393158.161+1742403.231/ --393155.883+1742347.300/ --393152.541+1742331.688/ --393148.163+1742316.514/ --393142.780+1742301.893/ --393136.435+1742247.936/ --393129.175+1742234.750/ --393121.056+1742222.435/ --393112.140+1742211.086/ --393102.494+1742200.787/ --393052.192+1742151.619/ --393041.313+1742143.650/ --393029.940+1742136.941/ --393018.158+1742131.543/ --393006.058+1742127.497/ --392953.733+1742124.833/ --392941.274+1742123.571/ --392928.779+1742123.722/ --392916.341+1742125.283/ --392904.056+1742128.243/ --392904.000+1742128.388/ +-392133.966+1742343.984/ +-392122.189+1742349.387/ +-392110.820+1742356.097/ +-392059.947+1742404.061/ +-392049.652+1742413.220/ +-392040.014+1742423.504/ +-392031.104+1742434.834/ +-392022.992+1742447.124/ +-392015.739+1742500.281/ +-392009.400+1742514.204/ +-392004.023+1742528.788/ +-391959.649+1742543.922/ +-391956.312+1742559.491/ +-391954.036+1742615.376/ +-391952.839+1742631.457/ +-391952.730+1742647.612/ +-391953.710+1742703.717/ +-391955.771+1742719.652/ +-391958.898+1742735.293/ +-392003.067+1742750.523/ +-392008.246+1742805.226/ +-392014.397+1742819.290/ +-392021.471+1742832.609/ +-392029.416+1742845.080/ +-392038.171+1742856.609/ +-392047.670+1742907.109/ +-392057.840+1742916.498/ +-392108.603+1742924.707/ +-392119.879+1742931.672/ +-392131.582+1742937.340/ +-392143.621+1742941.667/ +-392155.907+1742944.622/ +-392208.345+1742946.180/ +-392220.840+1742946.330/ +-392233.298+1742945.071/ +-392245.624+1742942.412/ +-392245.526+1742942.311/ +-393005.378+1742741.139/ +-393017.419+1742737.237/ +-393029.201+1742731.839/ +-393040.574+1742725.130/ +-393051.453+1742717.161/ +-393101.755+1742707.992/ +-393111.401+1742657.694/ +-393120.317+1742646.345/ +-393128.436+1742634.030/ +-393135.696+1742620.844/ +-393142.041+1742606.888/ +-393147.424+1742552.266/ +-393151.802+1742537.092/ +-393155.144+1742521.480/ +-393157.422+1742505.550/ +-393158.621+1742449.422/ +-393158.730+1742433.221/ +-393157.749+1742417.069/ +-393155.685+1742401.089/ +-393152.555+1742345.404/ +-393148.381+1742330.133/ +-393143.196+1742315.392/ +-393137.040+1742301.293/ +-393129.959+1742247.945/ +-393122.007+1742235.448/ +-393113.245+1742223.899/ +-393103.739+1742213.384/ +-393053.563+1742203.984/ +-393042.792+1742155.770/ +-393031.511+1742148.804/ +-393019.804+1742143.140/ +-393007.761+1742138.821/ +-392955.472+1742135.879/ +-392943.033+1742134.336/ +-392930.538+1742134.204/ +-392918.081+1742135.483/ +-392905.757+1742138.165/ +-392905.699+1742138.309/ -392146.160+1742340.030 -451444.770+1704529.480/ @@ -4153,6 +4231,7 @@ DOMON DOPKI DOVOT + EGEVI ELMAX ELRUV FALLS @@ -4225,6 +4304,8 @@ -434336.459+1713047.484 -440532.814+1685343.658 -440732.814+1685238.301 + -392551.837+1743955.761 + -392751.837+1743855.079 -405958.863+1731939.368 -410158.863+1731837.173 -443722.603+1695610.779 @@ -4251,8 +4332,8 @@ -410255.819+1751702.346 -435127.250+1674005.022 -435327.250+1673859.916 - -392557.402+1742534.965 - -392757.402+1742434.319 + -392555.812+1742540.623 + -392755.812+1742439.978 -451155.103+1705021.484 -451355.103+1704914.889 -403539.460+1732808.307 @@ -4316,6 +4397,7 @@ -391337.370+1771102.700 -434148.100+1713800.580 -440933.480+1685623.530 + -392414.130+1743434.830 -410421.820+1732037.700 -443701.880+1694957.380 -375637.710+1755843.960 From 1eddfddaeda9b0629f6895bb73f95c1976e4bf00 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Thu, 12 Jan 2023 16:48:39 +1300 Subject: [PATCH 26/50] fix: Change some IFs to IAFs. --- Maps/Airspace/ALL_RNAV.xml | 40 +++++++++++++++++++++----------------- Maps/NZDN/DN_ACU.xml | 20 +++++++++---------- Maps/NZLX/LX_ACU.xml | 28 ++++++++++++-------------- Maps/NZNP/NP_ACU.xml | 5 ++++- Maps/NZOU/Ou_ACU.xml | 16 +++++++-------- Maps/NZTU/TU_ACU.xml | 7 +++---- Maps/NZWS/WS_ACU.xml | 32 +++++++++++++++--------------- 7 files changed, 75 insertions(+), 73 deletions(-) diff --git a/Maps/Airspace/ALL_RNAV.xml b/Maps/Airspace/ALL_RNAV.xml index a22adf7..615ee63 100644 --- a/Maps/Airspace/ALL_RNAV.xml +++ b/Maps/Airspace/ALL_RNAV.xml @@ -249,6 +249,8 @@ BIDEV MABAK ODISI + AKLAR + ESKAT LUVOG VARSI ELPAM @@ -276,6 +278,7 @@ OPARE STEED PERIA + LUGDU BESMO KAKIT GULAN @@ -289,6 +292,7 @@ UPLIN BOLOR VARMA + UPDAL AROPA ELBOW NANUA @@ -320,6 +324,8 @@ VARNO ENDIX LUXUL + PAMOA + ORBEL ADGOP EKODU GUTNI @@ -349,6 +355,7 @@ MIKER ARIKA GOSTI + TU593 DOPOP SUNPA BIDNI @@ -378,8 +385,10 @@ LEECH OTUHI BIRAX + BURKI AVMAK GUNOM + WS408 ANSIS PILUP IGOVU @@ -457,13 +466,13 @@ ADKES DUDAP MONSU + WS404 + WS411 VETUM BUSBI AP706 AP506 ALBAD - AKLAR - ESKAT OMGET PAROA WAPOU @@ -472,22 +481,16 @@ BUDEN VATNA GUNDA - LUGDU SADUN - PAMOA - ORBEL OLNAN WAIPA AMURI - TU593 ELBEV REGAT AVMEB MARKS WYTAK BAYES - BURKI - WS408 UGSAP @@ -534,8 +537,6 @@ WR601 WR431 WR983 - WS404 - WS411 WT423 @@ -565,6 +566,8 @@ BIDEV MABAK ODISI + AKLAR + ESKAT LUVOG VARSI ELPAM @@ -592,6 +595,7 @@ OPARE STEED PERIA + LUGDU BESMO KAKIT GULAN @@ -605,6 +609,7 @@ UPLIN BOLOR VARMA + UPDAL AROPA ELBOW NANUA @@ -636,6 +641,8 @@ VARNO ENDIX LUXUL + PAMOA + ORBEL ADGOP EKODU GUTNI @@ -665,6 +672,7 @@ MIKER ARIKA GOSTI + TU593 DOPOP SUNPA BIDNI @@ -694,8 +702,10 @@ LEECH OTUHI BIRAX + BURKI AVMAK GUNOM + WS408 ANSIS PILUP IGOVU @@ -786,6 +796,8 @@ ADKES DUDAP MONSU + WS404 + WS411 VETUM -39.914692+174.940081 BUSBI @@ -795,8 +807,6 @@ AP706 AP506 ALBAD - AKLAR - ESKAT OMGET PAROA WAPOU @@ -805,22 +815,16 @@ BUDEN VATNA GUNDA - LUGDU SADUN - PAMOA - ORBEL OLNAN WAIPA AMURI - TU593 ELBEV REGAT AVMEB MARKS WYTAK BAYES - BURKI - WS408 UGSAP LENGU/UGRUS/IGPOL/-370058.741+1744614.819 diff --git a/Maps/NZDN/DN_ACU.xml b/Maps/NZDN/DN_ACU.xml index 8822a66..2360c60 100644 --- a/Maps/NZDN/DN_ACU.xml +++ b/Maps/NZDN/DN_ACU.xml @@ -193,21 +193,21 @@ OVSED - + + AKLAR + AGESO - - AKLAR - + AKLAR/OVSED/AGESO/-455602.130+1701114.899 @@ -393,21 +393,21 @@ IDPON - + + ESKAT + BENRU - - ESKAT - + ESKAT/IDPON/BENRU/-455527.761+1701228.030 diff --git a/Maps/NZLX/LX_ACU.xml b/Maps/NZLX/LX_ACU.xml index 27e07c5..58c6733 100644 --- a/Maps/NZLX/LX_ACU.xml +++ b/Maps/NZLX/LX_ACU.xml @@ -55,6 +55,7 @@ + LUGDU BESMO KAKIT @@ -63,19 +64,17 @@ PORUT - - LUGDU - + LUGDU/PORUT/-451249.460+1692206.539 BESMO/LUGDU KAKIT/LUGDU @@ -133,6 +132,7 @@ + LUGDU BESMO KAKIT @@ -141,19 +141,17 @@ PORUT - - LUGDU - + LUGDU/PORUT/-451233.000+1692219.409 BESMO/LUGDU KAKIT/LUGDU @@ -211,6 +209,7 @@ + LUGDU BESMO KAKIT @@ -219,19 +218,17 @@ PORUT - - LUGDU - + LUGDU/PORUT/-451222.770+1692208.350 BESMO/LUGDU KAKIT/LUGDU @@ -289,6 +286,7 @@ + LUGDU BESMO KAKIT @@ -297,19 +295,17 @@ PORUT - - LUGDU - + LUGDU/PORUT/-451259.198+1692227.592 BESMO/LUGDU KAKIT/LUGDU diff --git a/Maps/NZNP/NP_ACU.xml b/Maps/NZNP/NP_ACU.xml index 228bdea..c4af0da 100644 --- a/Maps/NZNP/NP_ACU.xml +++ b/Maps/NZNP/NP_ACU.xml @@ -461,7 +461,9 @@ - + + UPDAL + DOVED @@ -472,6 +474,7 @@ diff --git a/Maps/NZOU/Ou_ACU.xml b/Maps/NZOU/Ou_ACU.xml index 04e1b26..7372f69 100644 --- a/Maps/NZOU/Ou_ACU.xml +++ b/Maps/NZOU/Ou_ACU.xml @@ -4,15 +4,15 @@ - + + PAMOA + -44.887389+171.137850 - - PAMOA - + PAMOA/-44.887389+171.137850/-445742.660+1710506.619 @@ -24,15 +24,15 @@ - + + ORBEL + -45.046594+171.025025 - - ORBEL - + ORBEL/-45.046594+171.025025/-445819.801+1710440.300 diff --git a/Maps/NZTU/TU_ACU.xml b/Maps/NZTU/TU_ACU.xml index 5f02adc..a399b26 100644 --- a/Maps/NZTU/TU_ACU.xml +++ b/Maps/NZTU/TU_ACU.xml @@ -92,6 +92,7 @@ + TU593 DOPOP @@ -99,17 +100,15 @@ REKID - - TU593 - + TU593/REKID/TU402/-441811.779+1711314.300 DOPOP/TU593 diff --git a/Maps/NZWS/WS_ACU.xml b/Maps/NZWS/WS_ACU.xml index f10384a..3b58857 100644 --- a/Maps/NZWS/WS_ACU.xml +++ b/Maps/NZWS/WS_ACU.xml @@ -44,29 +44,29 @@ - - WS404 - + + BURKI AVMAK GUNOM - - - - BURKI + + WS404 + + BURKI/WS404/-414424.922+1713421.389 AVMAK/BURKI GUNOM/BURKI @@ -102,29 +102,29 @@ - - WS411 - + + WS408 ANSIS PILUP - - - - WS408 + + WS411 + + WS408/WS411/-414402.069+1713507.681 ANSIS/WS408 PILUP/WS408 \ No newline at end of file From ad69bfc9799408e925166c15b76ce0998ecc4723 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Thu, 12 Jan 2023 16:58:50 +1300 Subject: [PATCH 27/50] fix: Swap RWY IDs for SIDs at NZWS --- Airspace.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Airspace.xml b/Airspace.xml index 798c888..d88b1d6 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -959,14 +959,14 @@ - + - + @@ -7616,12 +7616,12 @@ RILEY SF NDB - - KAKET - - + KAKET + + KAKET + OVTAP OBKIT From 8f33cb01b60a5874ad252d347287d269aa600ee6 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Sat, 14 Jan 2023 15:52:25 +1300 Subject: [PATCH 28/50] Update Changelog --- .github/changelogs/2023.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/changelogs/2023.md b/.github/changelogs/2023.md index 9770875..bce9372 100644 --- a/.github/changelogs/2023.md +++ b/.github/changelogs/2023.md @@ -11,10 +11,30 @@ Not released due to a lack of applicable changes. #### ANR Updates +**Glentanner** + + - Amendment to the existing `RNP A`. + - `MAMUS 3` resequenced after review. + - Runway bearing update. + +**Nelson** + + - MAGVAR update. + +**New Plymouth** + + - All SIDs and STARs have been resequenced by one, following minor track and minima changes. + +**Tauranga** + + - Removal of the `ODOLO` transition from all SIDs. + #### Dataset Updates - Addition of minor translations to the ATIS parser. Thanks to @zkaviator. - Amendment of DefaultJurisdiction to include better automatic sector ownership for TMAs. + - Amended some procedures where an IAF was incorrectly entered as an IF. + - Amended some procedures where a mandatory fly-over fix had been entered, instead of a fly-by fix. **Procedure Checker** From 4e85b134e9ca3537cd2061c292be87b57ce9aa7f Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Tue, 7 Feb 2023 17:16:43 +1300 Subject: [PATCH 29/50] feat: Add SRC changes to changelog --- .github/changelogs/2023.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/changelogs/2023.md b/.github/changelogs/2023.md index bce9372..1a3e252 100644 --- a/.github/changelogs/2023.md +++ b/.github/changelogs/2023.md @@ -29,6 +29,13 @@ Not released due to a lack of applicable changes. - Removal of the `ODOLO` transition from all SIDs. +**Standard Routes** + + - The following Standard Routes have been updated: `PMWN1`, `NPAA3`, `NPCH1`, `NPWN1`, `NPWN5`, `WNCH3`, `WNCH4`, `WNDN1`, `WNDN7`, `WNNV2`, `WNNV4`, `WNNP1`, `WNWP2`, `WNWP4`. + - The following Standard Routes have been removed: `HNAR3` + - These have been updated in the Standard Route tool, and will update next time you launch the vatSys plugin, or standalone application. + + #### Dataset Updates - Addition of minor translations to the ATIS parser. Thanks to @zkaviator. From 85f8f3ece1c3b4f748a8dcc7d38e7a8555759081 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Fri, 10 Feb 2023 16:41:59 +1300 Subject: [PATCH 30/50] Fixes OPS-92 OPS-93 - NZQN 3nm Separation --- AlertParameters.xml | 48 ++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/AlertParameters.xml b/AlertParameters.xml index dcacce7..425bc2b 100644 --- a/AlertParameters.xml +++ b/AlertParameters.xml @@ -1,37 +1,37 @@  - - - - - ATMA,WTMA,CTMA + + + + + ATMA,WTMA,CTMA, QTMA - - - - - HTMA,QTMA + + + + + HTMA - - - - + + + + OCR,RAN,BAY,OHA,NAK,KAI,STH - - - + + + OCR,RAN,BAY,OHA,NAK,KAI,STH - - - - - + + + + + - - + + \ No newline at end of file From a75cffc45d9954ea8edb567ce0f79ce8ec237cdd Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Fri, 10 Feb 2023 16:58:51 +1300 Subject: [PATCH 31/50] Fixes OPS-91: Change OH MOAs to enable by exclusion --- RestrictedAreas.xml | 2530 ++++++++++++++++++++++--------------------- 1 file changed, 1293 insertions(+), 1237 deletions(-) diff --git a/RestrictedAreas.xml b/RestrictedAreas.xml index aca5577..8682e70 100644 --- a/RestrictedAreas.xml +++ b/RestrictedAreas.xml @@ -1,1474 +1,1530 @@  - - --343000.000+1745000.000/ --350000.000+1745000.000/ --350000.000+1741500.000/ --343000.000+1741500.000/ --343000.000+1745000.000 + + + -343000.000+1745000.000/ + -350000.000+1745000.000/ + -350000.000+1741500.000/ + -343000.000+1741500.000/ + -343000.000+1745000.000 - - --362539.110+1740938.400/ --362541.843+1741017.247/ --362549.959+1741054.917/ --362603.211+1741130.265/ --362621.198+1741202.220/ --362643.374+1741229.812/ --362709.066+1741252.202/ --362737.495+1741308.709/ --362807.797+1741318.830/ --362839.052+1741322.255/ --362910.310+1741318.879/ --362940.622+1741308.802/ --363009.066+1741252.327/ --363034.778+1741229.954/ --363056.974+1741202.363/ --363114.980+1741130.390/ --363128.248+1741055.010/ --363136.374+1741017.297/ --363139.110+1740938.400/ --363136.374+1740859.503/ --363128.248+1740821.790/ --363114.980+1740746.410/ --363056.974+1740714.437/ --363034.778+1740646.846/ --363009.066+1740624.473/ --362940.622+1740608.000/ --362910.310+1740557.921/ --362839.052+1740554.545/ --362807.797+1740557.970/ --362737.495+1740608.091/ --362709.066+1740624.598/ --362643.374+1740646.988/ --362621.198+1740714.580/ --362603.211+1740746.535/ --362549.959+1740821.883/ --362541.843+1740859.553/ --362539.110+1740938.400 + + + -362539.110+1740938.400/ + -362541.843+1741017.247/ + -362549.959+1741054.917/ + -362603.211+1741130.265/ + -362621.198+1741202.220/ + -362643.374+1741229.812/ + -362709.066+1741252.202/ + -362737.495+1741308.709/ + -362807.797+1741318.830/ + -362839.052+1741322.255/ + -362910.310+1741318.879/ + -362940.622+1741308.802/ + -363009.066+1741252.327/ + -363034.778+1741229.954/ + -363056.974+1741202.363/ + -363114.980+1741130.390/ + -363128.248+1741055.010/ + -363136.374+1741017.297/ + -363139.110+1740938.400/ + -363136.374+1740859.503/ + -363128.248+1740821.790/ + -363114.980+1740746.410/ + -363056.974+1740714.437/ + -363034.778+1740646.846/ + -363009.066+1740624.473/ + -362940.622+1740608.000/ + -362910.310+1740557.921/ + -362839.052+1740554.545/ + -362807.797+1740557.970/ + -362737.495+1740608.091/ + -362709.066+1740624.598/ + -362643.374+1740646.988/ + -362621.198+1740714.580/ + -362603.211+1740746.535/ + -362549.959+1740821.883/ + -362541.843+1740859.553/ + -362539.110+1740938.400 - - --362102.800+1741807.800/ --363237.400+1742050.200/ --363419.580+1741847.830/ --363542.414+1741728.111/ --363653.000+1741633.800/ --363800.000+1740900.000/ --363300.000+1735800.000/ --362005.900+1740100.400/ --361838.900+1740946.200/ --362102.800+1741807.800 + + + -362102.800+1741807.800/ + -363237.400+1742050.200/ + -363419.580+1741847.830/ + -363542.414+1741728.111/ + -363653.000+1741633.800/ + -363800.000+1740900.000/ + -363300.000+1735800.000/ + -362005.900+1740100.400/ + -361838.900+1740946.200/ + -362102.800+1741807.800 - - --364412.510+1743752.400/ --364415.243+1743831.403/ --364423.358+1743909.224/ --364436.611+1743944.714/ --364454.598+1744016.798/ --364516.774+1744044.501/ --364542.466+1744106.981/ --364610.895+1744123.554/ --364641.196+1744133.716/ --364712.451+1744137.156/ --364743.710+1744133.766/ --364814.022+1744123.648/ --364842.466+1744107.108/ --364908.177+1744044.645/ --364930.374+1744016.942/ --364948.380+1743944.841/ --365001.648+1743909.318/ --365009.774+1743831.454/ --365012.510+1743752.400/ --365009.774+1743713.346/ --365001.648+1743635.482/ --364948.380+1743559.959/ --364930.374+1743527.858/ --364908.177+1743500.155/ --364842.466+1743437.692/ --364814.022+1743421.152/ --364743.710+1743411.034/ --364712.451+1743407.644/ --364641.196+1743411.084/ --364610.895+1743421.246/ --364542.466+1743437.819/ --364516.774+1743500.299/ --364454.598+1743528.000/ --364436.611+1743600.086/ --364423.358+1743635.576/ --364415.243+1743713.397/ --364412.510+1743752.400 + + + -364412.510+1743752.400/ + -364415.243+1743831.403/ + -364423.358+1743909.224/ + -364436.611+1743944.714/ + -364454.598+1744016.798/ + -364516.774+1744044.501/ + -364542.466+1744106.981/ + -364610.895+1744123.554/ + -364641.196+1744133.716/ + -364712.451+1744137.156/ + -364743.710+1744133.766/ + -364814.022+1744123.648/ + -364842.466+1744107.108/ + -364908.177+1744044.645/ + -364930.374+1744016.942/ + -364948.380+1743944.841/ + -365001.648+1743909.318/ + -365009.774+1743831.454/ + -365012.510+1743752.400/ + -365009.774+1743713.346/ + -365001.648+1743635.482/ + -364948.380+1743559.959/ + -364930.374+1743527.858/ + -364908.177+1743500.155/ + -364842.466+1743437.692/ + -364814.022+1743421.152/ + -364743.710+1743411.034/ + -364712.451+1743407.644/ + -364641.196+1743411.084/ + -364610.895+1743421.246/ + -364542.466+1743437.819/ + -364516.774+1743500.299/ + -364454.598+1743528.000/ + -364436.611+1743600.086/ + -364423.358+1743635.576/ + -364415.243+1743713.397/ + -364412.510+1743752.400 - - --370251.400+1750056.500/ --370324.000+1750055.200/ --370331.000+1750031.900/ --370347.900+1750046.900/ --370439.300+1750040.800/ --370436.700+1745952.800/ --370435.300+1745936.400/ --370316.700+1745918.500/ --370253.200+1745936.800/ --370241.300+1750014.200/ --370251.400+1750056.500 + + + -370251.400+1750056.500/ + -370324.000+1750055.200/ + -370331.000+1750031.900/ + -370347.900+1750046.900/ + -370439.300+1750040.800/ + -370436.700+1745952.800/ + -370435.300+1745936.400/ + -370316.700+1745918.500/ + -370253.200+1745936.800/ + -370241.300+1750014.200/ + -370251.400+1750056.500 - + --355000.000+1762500.000/ --362000.000+1762500.000/ --362000.000+1755000.000/ --355000.000+1755000.000/ --355000.000+1762500.000 + -355000.000+1762500.000/ + -362000.000+1762500.000/ + -362000.000+1755000.000/ + -355000.000+1755000.000/ + -355000.000+1762500.000 - + --352000.000+1771730.000/ --362000.000+1771730.000/ --362000.000+1762500.000/ --355000.000+1762500.000/ --355000.000+1755000.000/ --352000.000+1762500.000/ --352000.000+1771730.000 + -352000.000+1771730.000/ + -362000.000+1771730.000/ + -362000.000+1762500.000/ + -355000.000+1762500.000/ + -355000.000+1755000.000/ + -352000.000+1762500.000/ + -352000.000+1771730.000 - + --352000.000+1781000.000/ --362000.000+1781000.000/ --362000.000+1771730.000/ --352000.000+1771730.000/ --352000.000+1781000.000 + -352000.000+1781000.000/ + -362000.000+1781000.000/ + -362000.000+1771730.000/ + -352000.000+1771730.000/ + -352000.000+1781000.000 - + --362000.000+1771730.000/ --372000.000+1771730.000/ --372020.000+1762500.000/ --362000.000+1762500.000/ --362000.000+1771730.000 + -362000.000+1771730.000/ + -372000.000+1771730.000/ + -372020.000+1762500.000/ + -362000.000+1762500.000/ + -362000.000+1771730.000 - + --362000.000+1781000.000/ --372000.000+1781000.000/ --372000.000+1771730.000/ --362000.000+1771730.000/ --362000.000+1781000.000 + -362000.000+1781000.000/ + -372000.000+1781000.000/ + -372000.000+1771730.000/ + -362000.000+1771730.000/ + -362000.000+1781000.000 - - --391743.700+1754353.700/ --391838.700+1754305.700/ --392313.700+1754140.700/ --392313.700+1754115.700/ --392153.700+1754050.700/ --392153.700+1753955.700/ --391953.700+1753840.700/ --391858.700+1753715.700/ --391733.700+1753850.700/ --391748.700+1754015.700/ --391719.700+1754216.700/ --391743.700+1754353.700 + + + -391743.700+1754353.700/ + -391838.700+1754305.700/ + -392313.700+1754140.700/ + -392313.700+1754115.700/ + -392153.700+1754050.700/ + -392153.700+1753955.700/ + -391953.700+1753840.700/ + -391858.700+1753715.700/ + -391733.700+1753850.700/ + -391748.700+1754015.700/ + -391719.700+1754216.700/ + -391743.700+1754353.700 - - --391532.700+1755619.700/ --391610.700+1755852.700/ --391710.700+1760015.700/ --391710.700+1755830.700/ --392113.700+1755830.700/ --392115.700+1760155.700/ --392448.700+1760029.700/ --393003.700+1755403.700/ --393113.700+1755200.700/ --393016.700+1755000.700/ --393117.700+1754204.700/ --393039.700+1754151.400/ --393003.700+1754119.600/ --392934.900+1754110.700/ --392833.700+1754105.700/ --392803.700+1754115.700/ --392753.700+1754110.700/ --392503.700+1754155.700/ --392328.700+1754315.700/ --392253.700+1754320.700/ --391913.700+1754430.700/ --391833.700+1754512.700/ --391715.700+1754506.700/ --391736.700+1755147.700/ --391651.700+1755535.700/ --391532.700+1755619.700 + + + -391532.700+1755619.700/ + -391610.700+1755852.700/ + -391710.700+1760015.700/ + -391710.700+1755830.700/ + -392113.700+1755830.700/ + -392115.700+1760155.700/ + -392448.700+1760029.700/ + -393003.700+1755403.700/ + -393113.700+1755200.700/ + -393016.700+1755000.700/ + -393117.700+1754204.700/ + -393039.700+1754151.400/ + -393003.700+1754119.600/ + -392934.900+1754110.700/ + -392833.700+1754105.700/ + -392803.700+1754115.700/ + -392753.700+1754110.700/ + -392503.700+1754155.700/ + -392328.700+1754315.700/ + -392253.700+1754320.700/ + -391913.700+1754430.700/ + -391833.700+1754512.700/ + -391715.700+1754506.700/ + -391736.700+1755147.700/ + -391651.700+1755535.700/ + -391532.700+1755619.700 - - --400547.700+1750146.200/ --400752.829+1750046.617/ --400924.724+1750019.422/ --401058.081+1750002.793/ --401232.190+1745956.869/ --401406.335+1750001.706/ --401539.799+1750017.281/ --401711.871+1750043.488/ --401841.846+1750120.137/ --401934.800+1750151.200/ --403539.600+1741100.900/ --402741.412+1740720.534/ --402233.862+1740557.089/ --401721.937+1740509.310/ --401208.025+1740457.424/ --400654.515+1740521.383/ --400143.788+1740620.870/ --395638.193+1740755.300/ --395140.031+1741003.835/ --394942.400+1741118.300/ --400547.700+1750146.200 - - - + + + -400547.700+1750146.200/ + -400752.829+1750046.617/ + -400924.724+1750019.422/ + -401058.081+1750002.793/ + -401232.190+1745956.869/ + -401406.335+1750001.706/ + -401539.799+1750017.281/ + -401711.871+1750043.488/ + -401841.846+1750120.137/ + -401934.800+1750151.200/ + -403539.600+1741100.900/ + -402741.412+1740720.534/ + -402233.862+1740557.089/ + -401721.937+1740509.310/ + -401208.025+1740457.424/ + -400654.515+1740521.383/ + -400143.788+1740620.870/ + -395638.193+1740755.300/ + -395140.031+1741003.835/ + -394942.400+1741118.300/ + -400547.700+1750146.200 + - - --391743.700+1754353.700/ --391838.700+1754305.700/ --392313.700+1754140.700/ --392313.700+1754115.700/ --392153.700+1754050.700/ --392153.700+1753955.700/ --391953.700+1753840.700/ --391858.700+1753715.700/ --391733.700+1753850.700/ --391748.700+1754015.700/ --391719.700+1754216.700/ --391743.700+1754353.700 + + + -391743.700+1754353.700/ + -391838.700+1754305.700/ + -392313.700+1754140.700/ + -392313.700+1754115.700/ + -392153.700+1754050.700/ + -392153.700+1753955.700/ + -391953.700+1753840.700/ + -391858.700+1753715.700/ + -391733.700+1753850.700/ + -391748.700+1754015.700/ + -391719.700+1754216.700/ + -391743.700+1754353.700 - - --391532.700+1755619.700/ --391610.700+1755852.700/ --391710.700+1760015.700/ --391710.700+1755830.700/ --392113.700+1755830.700/ --392115.700+1760155.700/ --392448.700+1760029.700/ --393003.700+1755403.700/ --393113.700+1755200.700/ --393016.700+1755000.700/ --393117.700+1754204.700/ --393039.700+1754151.400/ --393003.700+1754119.600/ --392934.900+1754110.700/ --392833.700+1754105.700/ --392803.700+1754115.700/ --392753.700+1754110.700/ --392503.700+1754155.700/ --392328.700+1754315.700/ --392253.700+1754320.700/ --391913.700+1754430.700/ --391833.700+1754512.700/ --391715.700+1754506.700/ --391736.700+1755147.700/ --391651.700+1755535.700/ --391532.700+1755619.700 + + + -391532.700+1755619.700/ + -391610.700+1755852.700/ + -391710.700+1760015.700/ + -391710.700+1755830.700/ + -392113.700+1755830.700/ + -392115.700+1760155.700/ + -392448.700+1760029.700/ + -393003.700+1755403.700/ + -393113.700+1755200.700/ + -393016.700+1755000.700/ + -393117.700+1754204.700/ + -393039.700+1754151.400/ + -393003.700+1754119.600/ + -392934.900+1754110.700/ + -392833.700+1754105.700/ + -392803.700+1754115.700/ + -392753.700+1754110.700/ + -392503.700+1754155.700/ + -392328.700+1754315.700/ + -392253.700+1754320.700/ + -391913.700+1754430.700/ + -391833.700+1754512.700/ + -391715.700+1754506.700/ + -391736.700+1755147.700/ + -391651.700+1755535.700/ + -391532.700+1755619.700 - - --391858.700+1753715.700/ --391953.700+1753840.700/ --392153.700+1753955.700/ --392153.700+1754050.700/ --392313.700+1754115.700/ --392348.700+1754116.600/ --392614.200+1753859.100/ --392709.000+1753951.600/ --392756.500+1753932.200/ --392802.500+1753522.300/ --392653.800+1753054.700/ --391858.700+1753715.700 + + + -391858.700+1753715.700/ + -391953.700+1753840.700/ + -392153.700+1753955.700/ + -392153.700+1754050.700/ + -392313.700+1754115.700/ + -392348.700+1754116.600/ + -392614.200+1753859.100/ + -392709.000+1753951.600/ + -392756.500+1753932.200/ + -392802.500+1753522.300/ + -392653.800+1753054.700/ + -391858.700+1753715.700 - - --400816.030+1751329.400/ --400819.673+1751423.915/ --400830.490+1751516.777/ --400848.154+1751606.387/ --400912.131+1751651.238/ --400941.692+1751729.970/ --401015.942+1751801.407/ --401053.841+1751824.590/ --401134.240+1751838.814/ --401215.912+1751843.641/ --401257.591+1751838.919/ --401338.011+1751824.789/ --401415.941+1751801.674/ --401450.230+1751730.275/ --401519.832+1751651.542/ --401543.847+1751606.654/ --401601.542+1751516.976/ --401612.380+1751424.020/ --401616.030+1751329.400/ --401612.380+1751234.780/ --401601.542+1751141.824/ --401543.847+1751052.146/ --401519.832+1751007.258/ --401450.230+1750928.525/ --401415.941+1750857.126/ --401338.011+1750834.011/ --401257.591+1750819.881/ --401215.912+1750815.159/ --401134.240+1750819.986/ --401053.841+1750834.210/ --401015.942+1750857.393/ --400941.692+1750928.830/ --400912.131+1751007.562/ --400848.154+1751052.413/ --400830.490+1751142.023/ --400819.673+1751234.885/ --400816.030+1751329.400 - - - + + + -400816.030+1751329.400/ + -400819.673+1751423.915/ + -400830.490+1751516.777/ + -400848.154+1751606.387/ + -400912.131+1751651.238/ + -400941.692+1751729.970/ + -401015.942+1751801.407/ + -401053.841+1751824.590/ + -401134.240+1751838.814/ + -401215.912+1751843.641/ + -401257.591+1751838.919/ + -401338.011+1751824.789/ + -401415.941+1751801.674/ + -401450.230+1751730.275/ + -401519.832+1751651.542/ + -401543.847+1751606.654/ + -401601.542+1751516.976/ + -401612.380+1751424.020/ + -401616.030+1751329.400/ + -401612.380+1751234.780/ + -401601.542+1751141.824/ + -401543.847+1751052.146/ + -401519.832+1751007.258/ + -401450.230+1750928.525/ + -401415.941+1750857.126/ + -401338.011+1750834.011/ + -401257.591+1750819.881/ + -401215.912+1750815.159/ + -401134.240+1750819.986/ + -401053.841+1750834.210/ + -401015.942+1750857.393/ + -400941.692+1750928.830/ + -400912.131+1751007.562/ + -400848.154+1751052.413/ + -400830.490+1751142.023/ + -400819.673+1751234.885/ + -400816.030+1751329.400 + - - --401301.900+1753230.500/ --401508.500+1753158.800/ --401651.700+1752752.600/ --401931.000+1752242.000/ --402327.200+1752128.200/ --402328.300+1751854.300/ --402223.800+1751340.600/ --400355.100+1750732.400/ --400158.600+1750939.300/ --400222.300+1751032.700/ --400249.000+1751251.500/ --400329.000+1751840.200/ --400505.400+1752229.600/ --400515.300+1752329.500/ --401045.800+1753029.500/ --401301.900+1753230.500 + + + -401301.900+1753230.500/ + -401508.500+1753158.800/ + -401651.700+1752752.600/ + -401931.000+1752242.000/ + -402327.200+1752128.200/ + -402328.300+1751854.300/ + -402223.800+1751340.600/ + -400355.100+1750732.400/ + -400158.600+1750939.300/ + -400222.300+1751032.700/ + -400249.000+1751251.500/ + -400329.000+1751840.200/ + -400505.400+1752229.600/ + -400515.300+1752329.500/ + -401045.800+1753029.500/ + -401301.900+1753230.500 - - --402331.800+1753522.700/ --402340.200+1753536.000/ --402408.000+1753527.100/ --402435.800+1753548.600/ --402455.800+1753519.600/ --402345.800+1753351.100/ --402334.400+1753411.200/ --402331.800+1753522.700 + + + -402331.800+1753522.700/ + -402340.200+1753536.000/ + -402408.000+1753527.100/ + -402435.800+1753548.600/ + -402455.800+1753519.600/ + -402345.800+1753351.100/ + -402334.400+1753411.200/ + -402331.800+1753522.700 - - --400834.630+1752331.100/ --400838.273+1752425.619/ --400849.090+1752518.486/ --400906.754+1752608.099/ --400930.731+1752652.953/ --401000.292+1752731.689/ --401034.542+1752803.127/ --401112.441+1752826.313/ --401152.840+1752840.537/ --401234.512+1752845.365/ --401316.191+1752840.643/ --401356.611+1752826.511/ --401434.541+1752803.395/ --401508.830+1752731.993/ --401538.432+1752653.258/ --401602.447+1752608.366/ --401620.142+1752518.684/ --401630.980+1752425.724/ --401634.630+1752331.100/ --401630.980+1752236.476/ --401620.142+1752143.516/ --401602.447+1752053.834/ --401538.432+1752008.942/ --401508.830+1751930.207/ --401434.541+1751858.805/ --401356.611+1751835.689/ --401316.191+1751821.557/ --401234.512+1751816.835/ --401152.840+1751821.663/ --401112.441+1751835.887/ --401034.542+1751859.073/ --401000.292+1751930.511/ --400930.731+1752009.247/ --400906.754+1752054.101/ --400849.090+1752143.714/ --400838.273+1752236.581/ --400834.630+1752331.100 - - - + + + -400834.630+1752331.100/ + -400838.273+1752425.619/ + -400849.090+1752518.486/ + -400906.754+1752608.099/ + -400930.731+1752652.953/ + -401000.292+1752731.689/ + -401034.542+1752803.127/ + -401112.441+1752826.313/ + -401152.840+1752840.537/ + -401234.512+1752845.365/ + -401316.191+1752840.643/ + -401356.611+1752826.511/ + -401434.541+1752803.395/ + -401508.830+1752731.993/ + -401538.432+1752653.258/ + -401602.447+1752608.366/ + -401620.142+1752518.684/ + -401630.980+1752425.724/ + -401634.630+1752331.100/ + -401630.980+1752236.476/ + -401620.142+1752143.516/ + -401602.447+1752053.834/ + -401538.432+1752008.942/ + -401508.830+1751930.207/ + -401434.541+1751858.805/ + -401356.611+1751835.689/ + -401316.191+1751821.557/ + -401234.512+1751816.835/ + -401152.840+1751821.663/ + -401112.441+1751835.887/ + -401034.542+1751859.073/ + -401000.292+1751930.511/ + -400930.731+1752009.247/ + -400906.754+1752054.101/ + -400849.090+1752143.714/ + -400838.273+1752236.581/ + -400834.630+1752331.100 + - - --400131.200+1752200.300/ --400505.400+1752229.600/ --400835.700+1752258.300/ --400842.750+1752209.790/ --400849.040+1752143.664/ --400857.045+1752118.354/ --400906.704+1752054.051/ --400917.945+1752030.940/ --400930.681+1752009.197/ --400944.815+1751948.986/ --401000.242+1751930.462/ --401016.843+1751913.765/ --401034.492+1751859.023/ --401053.055+1751846.348/ --401112.391+1751835.837/ --401132.353+1751827.571/ --401152.790+1751821.613/ --401213.545+1751818.008/ --401234.462+1751816.786/ --401255.380+1751817.955/ --401316.141+1751821.507/ --401336.586+1751827.417/ --401356.561+1751835.639/ --401415.911+1751846.111/ --401434.491+1751858.755/ --401452.159+1751913.474/ --401508.780+1751930.157/ --401524.227+1751948.677/ --401527.300+1751953.300/ --402321.600+1750952.800/ --402212.111+1750826.127/ --402109.682+1750723.640/ --402003.332+1750628.562/ --401853.570+1750541.309/ --401740.930+1750502.235/ --401625.966+1750431.631/ --401509.252+1750409.723/ --401351.372+1750356.670/ --401232.920+1750352.563/ --401114.493+1750357.425/ --400956.688+1750411.210/ --400840.096+1750433.804/ --400725.299+1750505.029/ --400612.863+1750544.639/ --400503.338+1750632.327/ --400357.251+1750727.725/ --400255.100+1750830.408/ --400157.357+1750939.897/ --400104.457+1751055.663/ --400016.799+1751217.129/ --395934.744+1751343.678/ --395858.608+1751514.655/ --395836.400+1751621.800/ --400131.200+1752200.300 - - - + + + -400131.200+1752200.300/ + -400505.400+1752229.600/ + -400835.700+1752258.300/ + -400842.750+1752209.790/ + -400849.040+1752143.664/ + -400857.045+1752118.354/ + -400906.704+1752054.051/ + -400917.945+1752030.940/ + -400930.681+1752009.197/ + -400944.815+1751948.986/ + -401000.242+1751930.462/ + -401016.843+1751913.765/ + -401034.492+1751859.023/ + -401053.055+1751846.348/ + -401112.391+1751835.837/ + -401132.353+1751827.571/ + -401152.790+1751821.613/ + -401213.545+1751818.008/ + -401234.462+1751816.786/ + -401255.380+1751817.955/ + -401316.141+1751821.507/ + -401336.586+1751827.417/ + -401356.561+1751835.639/ + -401415.911+1751846.111/ + -401434.491+1751858.755/ + -401452.159+1751913.474/ + -401508.780+1751930.157/ + -401524.227+1751948.677/ + -401527.300+1751953.300/ + -402321.600+1750952.800/ + -402212.111+1750826.127/ + -402109.682+1750723.640/ + -402003.332+1750628.562/ + -401853.570+1750541.309/ + -401740.930+1750502.235/ + -401625.966+1750431.631/ + -401509.252+1750409.723/ + -401351.372+1750356.670/ + -401232.920+1750352.563/ + -401114.493+1750357.425/ + -400956.688+1750411.210/ + -400840.096+1750433.804/ + -400725.299+1750505.029/ + -400612.863+1750544.639/ + -400503.338+1750632.327/ + -400357.251+1750727.725/ + -400255.100+1750830.408/ + -400157.357+1750939.897/ + -400104.457+1751055.663/ + -400016.799+1751217.129/ + -395934.744+1751343.678/ + -395858.608+1751514.655/ + -395836.400+1751621.800/ + -400131.200+1752200.300 + - + --402546.900+1780211.000/ --410203.900+1771850.100/ --404244.500+1765027.500/ --400617.700+1773351.500/ --402546.900+1780211.000 + -402546.900+1780211.000/ + -410203.900+1771850.100/ + -404244.500+1765027.500/ + -400617.700+1773351.500/ + -402546.900+1780211.000 - - --395736.600+1772545.100/ --401128.015+1772753.476/ --401945.111+1772740.261/ --402759.430+1772630.117/ --403607.187+1772423.234/ --404404.619+1772120.247/ --405148.024+1771722.243/ --405913.785+1771230.761/ --410618.404+1770647.792/ --411258.527+1770015.772/ --411910.979+1765257.564/ --412452.788+1764456.450/ --412634.800+1764212.200/ --411732.700+1755210.400/ --411258.700+1752740.900/ --405823.800+1753800.600/ --404141.800+1755118.600/ --403731.600+1755540.700/ --403459.088+1755849.248/ --403232.983+1760114.729/ --402957.759+1760322.727/ --402714.616+1760512.291/ --402424.808+1760642.613/ --402129.641+1760753.041/ --401830.458+1760843.080/ --401627.200+1760856.600/ --400545.300+1762131.700/ --395736.600+1772545.100 + + + -395736.600+1772545.100/ + -401128.015+1772753.476/ + -401945.111+1772740.261/ + -402759.430+1772630.117/ + -403607.187+1772423.234/ + -404404.619+1772120.247/ + -405148.024+1771722.243/ + -405913.785+1771230.761/ + -410618.404+1770647.792/ + -411258.527+1770015.772/ + -411910.979+1765257.564/ + -412452.788+1764456.450/ + -412634.800+1764212.200/ + -411732.700+1755210.400/ + -411258.700+1752740.900/ + -405823.800+1753800.600/ + -404141.800+1755118.600/ + -403731.600+1755540.700/ + -403459.088+1755849.248/ + -403232.983+1760114.729/ + -402957.759+1760322.727/ + -402714.616+1760512.291/ + -402424.808+1760642.613/ + -402129.641+1760753.041/ + -401830.458+1760843.080/ + -401627.200+1760856.600/ + -400545.300+1762131.700/ + -395736.600+1772545.100 - - --432851.600+1715212.400/ --432852.338+1715224.031/ --432854.530+1715235.308/ --432858.110+1715245.890/ --432902.968+1715255.455/ --432908.957+1715303.713/ --432915.896+1715310.412/ --432923.573+1715315.349/ --432931.755+1715318.373/ --432940.195+1715319.394/ --432948.634+1715318.379/ --432956.817+1715315.358/ --433004.496+1715310.425/ --433011.436+1715303.728/ --433017.428+1715255.470/ --433022.287+1715245.903/ --433025.868+1715235.318/ --433028.061+1715224.036/ --433028.800+1715212.400/ --433028.061+1715200.764/ --433025.868+1715149.482/ --433022.287+1715138.897/ --433017.428+1715129.330/ --433011.436+1715121.072/ --433004.496+1715114.375/ --432956.817+1715109.442/ --432948.634+1715106.421/ --432940.195+1715105.406/ --432931.755+1715106.427/ --432923.573+1715109.451/ --432915.896+1715114.388/ --432908.957+1715121.087/ --432902.968+1715129.345/ --432858.110+1715138.910/ --432854.530+1715149.492/ --432852.338+1715200.769/ --432851.600+1715212.400 + + + -432851.600+1715212.400/ + -432852.338+1715224.031/ + -432854.530+1715235.308/ + -432858.110+1715245.890/ + -432902.968+1715255.455/ + -432908.957+1715303.713/ + -432915.896+1715310.412/ + -432923.573+1715315.349/ + -432931.755+1715318.373/ + -432940.195+1715319.394/ + -432948.634+1715318.379/ + -432956.817+1715315.358/ + -433004.496+1715310.425/ + -433011.436+1715303.728/ + -433017.428+1715255.470/ + -433022.287+1715245.903/ + -433025.868+1715235.318/ + -433028.061+1715224.036/ + -433028.800+1715212.400/ + -433028.061+1715200.764/ + -433025.868+1715149.482/ + -433022.287+1715138.897/ + -433017.428+1715129.330/ + -433011.436+1715121.072/ + -433004.496+1715114.375/ + -432956.817+1715109.442/ + -432948.634+1715106.421/ + -432940.195+1715105.406/ + -432931.755+1715106.427/ + -432923.573+1715109.451/ + -432915.896+1715114.388/ + -432908.957+1715121.087/ + -432902.968+1715129.345/ + -432858.110+1715138.910/ + -432854.530+1715149.492/ + -432852.338+1715200.769/ + -432851.600+1715212.400 - + --433551.000+1722018.400/ --433618.000+1722032.400/ --433717.000+1721748.400/ --433654.000+1721733.400/ --433648.000+1721747.400/ --433627.000+1721732.400/ --433551.000+1722018.400 + -433551.000+1722018.400/ + -433618.000+1722032.400/ + -433717.000+1721748.400/ + -433654.000+1721733.400/ + -433648.000+1721747.400/ + -433627.000+1721732.400/ + -433551.000+1722018.400 - - --364905.800+1744150.000/ --364906.046+1744153.514/ --364906.777+1744156.921/ --364907.970+1744200.118/ --364909.590+1744203.008/ --364911.587+1744205.502/ --364913.900+1744207.526/ --364916.459+1744209.017/ --364919.186+1744209.930/ --364922.000+1744210.238/ --364924.813+1744209.930/ --364927.540+1744209.017/ --364930.100+1744207.527/ --364932.413+1744205.503/ --364934.410+1744203.009/ --364936.029+1744200.119/ --364937.223+1744156.922/ --364937.954+1744153.514/ --364938.200+1744150.000/ --364937.954+1744146.486/ --364937.223+1744143.078/ --364936.029+1744139.881/ --364934.410+1744136.991/ --364932.413+1744134.497/ --364930.100+1744132.473/ --364927.540+1744130.983/ --364924.813+1744130.070/ --364922.000+1744129.762/ --364919.186+1744130.070/ --364916.459+1744130.983/ --364913.900+1744132.474/ --364911.587+1744134.498/ --364909.590+1744136.992/ --364907.970+1744139.882/ --364906.777+1744143.079/ --364906.046+1744146.486/ --364905.800+1744150.000 + + + -364905.800+1744150.000/ + -364906.046+1744153.514/ + -364906.777+1744156.921/ + -364907.970+1744200.118/ + -364909.590+1744203.008/ + -364911.587+1744205.502/ + -364913.900+1744207.526/ + -364916.459+1744209.017/ + -364919.186+1744209.930/ + -364922.000+1744210.238/ + -364924.813+1744209.930/ + -364927.540+1744209.017/ + -364930.100+1744207.527/ + -364932.413+1744205.503/ + -364934.410+1744203.009/ + -364936.029+1744200.119/ + -364937.223+1744156.922/ + -364937.954+1744153.514/ + -364938.200+1744150.000/ + -364937.954+1744146.486/ + -364937.223+1744143.078/ + -364936.029+1744139.881/ + -364934.410+1744136.991/ + -364932.413+1744134.497/ + -364930.100+1744132.473/ + -364927.540+1744130.983/ + -364924.813+1744130.070/ + -364922.000+1744129.762/ + -364919.186+1744130.070/ + -364916.459+1744130.983/ + -364913.900+1744132.474/ + -364911.587+1744134.498/ + -364909.590+1744136.992/ + -364907.970+1744139.882/ + -364906.777+1744143.079/ + -364906.046+1744146.486/ + -364905.800+1744150.000 - - --363131.800+1745456.900/ --363530.000+1745456.900/ --363530.000+1745240.400/ --363636.300+1745240.400/ --363617.500+1745020.000/ --363542.000+1744900.000/ --363131.800+1744900.000/ --363131.800+1745456.900 + + + -363131.800+1745456.900/ + -363530.000+1745456.900/ + -363530.000+1745240.400/ + -363636.300+1745240.400/ + -363617.500+1745020.000/ + -363542.000+1744900.000/ + -363131.800+1744900.000/ + -363131.800+1745456.900 - + --363350.200+1745240.400/ --363636.300+1745240.400/ --363617.500+1745020.000/ --363542.000+1744900.000/ --363350.200+1744900.000/ --363350.200+1745240.400 + -363350.200+1745240.400/ + -363636.300+1745240.400/ + -363617.500+1745020.000/ + -363542.000+1744900.000/ + -363350.200+1744900.000/ + -363350.200+1745240.400 - - --370447.200+1745831.800/ --370448.111+1745844.860/ --370450.818+1745857.523/ --370455.237+1745909.405/ --370501.235+1745920.145/ --370508.629+1745929.417/ --370517.195+1745936.938/ --370526.673+1745942.482/ --370536.775+1745945.878/ --370547.193+1745947.024/ --370557.612+1745945.884/ --370607.715+1745942.492/ --370617.195+1745936.953/ --370625.763+1745929.433/ --370633.160+1745920.161/ --370639.160+1745909.419/ --370643.581+1745857.533/ --370646.288+1745844.865/ --370647.200+1745831.800/ --370646.288+1745818.735/ --370643.581+1745806.067/ --370639.160+1745754.181/ --370633.160+1745743.439/ --370625.763+1745734.167/ --370617.195+1745726.647/ --370607.715+1745721.108/ --370557.612+1745717.716/ --370547.193+1745716.576/ --370536.775+1745717.722/ --370526.673+1745721.118/ --370517.195+1745726.662/ --370508.629+1745734.183/ --370501.235+1745743.455/ --370455.237+1745754.195/ --370450.818+1745806.077/ --370448.111+1745818.740/ --370447.200+1745831.800 + + + -370447.200+1745831.800/ + -370448.111+1745844.860/ + -370450.818+1745857.523/ + -370455.237+1745909.405/ + -370501.235+1745920.145/ + -370508.629+1745929.417/ + -370517.195+1745936.938/ + -370526.673+1745942.482/ + -370536.775+1745945.878/ + -370547.193+1745947.024/ + -370557.612+1745945.884/ + -370607.715+1745942.492/ + -370617.195+1745936.953/ + -370625.763+1745929.433/ + -370633.160+1745920.161/ + -370639.160+1745909.419/ + -370643.581+1745857.533/ + -370646.288+1745844.865/ + -370647.200+1745831.800/ + -370646.288+1745818.735/ + -370643.581+1745806.067/ + -370639.160+1745754.181/ + -370633.160+1745743.439/ + -370625.763+1745734.167/ + -370617.195+1745726.647/ + -370607.715+1745721.108/ + -370557.612+1745717.716/ + -370547.193+1745716.576/ + -370536.775+1745717.722/ + -370526.673+1745721.118/ + -370517.195+1745726.662/ + -370508.629+1745734.183/ + -370501.235+1745743.455/ + -370455.237+1745754.195/ + -370450.818+1745806.077/ + -370448.111+1745818.740/ + -370447.200+1745831.800 - + --393243.700+1743406.600/ --393703.700+1743132.600/ --393541.700+1742634.600/ --393458.700+1742659.600/ --393157.700+1742808.600/ --393144.700+1743003.600/ --393243.700+1743406.600 + -393243.700+1743406.600/ + -393703.700+1743132.600/ + -393541.700+1742634.600/ + -393458.700+1742659.600/ + -393157.700+1742808.600/ + -393144.700+1743003.600/ + -393243.700+1743406.600 - - --402644.700+1754848.800/ --402928.000+1754552.000/ --402910.200+1754341.700/ --402800.300+1754059.200/ --402640.800+1754130.500/ --402610.100+1754221.100/ --402544.400+1754717.600/ --402644.700+1754848.800 + + + -402644.700+1754848.800/ + -402928.000+1754552.000/ + -402910.200+1754341.700/ + -402800.300+1754059.200/ + -402640.800+1754130.500/ + -402610.100+1754221.100/ + -402544.400+1754717.600/ + -402644.700+1754848.800 - - --410836.500+1750244.790/ --410902.810+1750310.110/ --410950.560+1750224.460/ --410933.760+1750217.220/ --410919.440+1750220.270/ --410851.490+1750212.360/ --410847.790+1750210.020/ --410846.070+1750212.440/ --410847.240+1750220.020/ --410836.500+1750244.790 + + + -410836.500+1750244.790/ + -410902.810+1750310.110/ + -410950.560+1750224.460/ + -410933.760+1750217.220/ + -410919.440+1750220.270/ + -410851.490+1750212.360/ + -410847.790+1750210.020/ + -410846.070+1750212.440/ + -410847.240+1750220.020/ + -410836.500+1750244.790 - + --414020.200+1725234.300/ --414707.100+1725337.700/ --414625.900+1724636.300/ --414401.500+1724242.600/ --414106.400+1724603.300/ --414028.900+1724736.600/ --414020.200+1725234.300 + -414020.200+1725234.300/ + -414707.100+1725337.700/ + -414625.900+1724636.300/ + -414401.500+1724242.600/ + -414106.400+1724603.300/ + -414028.900+1724736.600/ + -414020.200+1725234.300 - + --422344.100+1714926.300/ --422620.200+1714732.800/ --422350.500+1714122.800/ --422117.100+1714319.800/ --422344.100+1714926.300 + -422344.100+1714926.300/ + -422620.200+1714732.800/ + -422350.500+1714122.800/ + -422117.100+1714319.800/ + -422344.100+1714926.300 - + --421803.300+1714025.600/ --422051.000+1714052.200/ --422216.100+1713827.300/ --422132.600+1713518.600/ --421851.300+1713524.000/ --421803.300+1714025.600 + -421803.300+1714025.600/ + -422051.000+1714052.200/ + -422216.100+1713827.300/ + -422132.600+1713518.600/ + -421851.300+1713524.000/ + -421803.300+1714025.600 - + --414442.700+1715914.400/ --415004.400+1715810.800/ --414916.800+1715224.800/ --414714.800+1715154.900/ --414510.500+1715534.400/ --414442.700+1715914.400 + -414442.700+1715914.400/ + -415004.400+1715810.800/ + -414916.800+1715224.800/ + -414714.800+1715154.900/ + -414510.500+1715534.400/ + -414442.700+1715914.400 - - --421212.900+1713322.800/ --421318.000+1713316.700/ --421903.200+1713219.900/ --422045.600+1712606.700/ --421716.800+1712410.000/ --421423.700+1712618.200/ --421147.800+1712750.400/ --421212.900+1713322.800 + + + -421212.900+1713322.800/ + -421318.000+1713316.700/ + -421903.200+1713219.900/ + -422045.600+1712606.700/ + -421716.800+1712410.000/ + -421423.700+1712618.200/ + -421147.800+1712750.400/ + -421212.900+1713322.800 - - --453014.410+1681754.000/ --453016.378+1681826.111/ --453022.221+1681857.247/ --453031.763+1681926.466/ --453044.714+1681952.879/ --453100.680+1682015.686/ --453119.179+1682034.193/ --453139.648+1682047.837/ --453201.465+1682056.203/ --453223.969+1682059.034/ --453246.475+1682056.243/ --453308.299+1682047.913/ --453328.779+1682034.296/ --453347.291+1682015.803/ --453403.272+1681952.996/ --453416.237+1681926.568/ --453425.789+1681857.324/ --453431.640+1681826.151/ --453433.610+1681754.000/ --453431.640+1681721.849/ --453425.789+1681650.676/ --453416.237+1681621.432/ --453403.272+1681555.004/ --453347.291+1681532.197/ --453328.779+1681513.704/ --453308.299+1681500.087/ --453246.475+1681451.757/ --453223.969+1681448.966/ --453201.465+1681451.797/ --453139.648+1681500.163/ --453119.179+1681513.807/ --453100.680+1681532.314/ --453044.714+1681555.121/ --453031.763+1681621.534/ --453022.221+1681650.753/ --453016.378+1681721.889/ --453014.410+1681754.000 + + + -453014.410+1681754.000/ + -453016.378+1681826.111/ + -453022.221+1681857.247/ + -453031.763+1681926.466/ + -453044.714+1681952.879/ + -453100.680+1682015.686/ + -453119.179+1682034.193/ + -453139.648+1682047.837/ + -453201.465+1682056.203/ + -453223.969+1682059.034/ + -453246.475+1682056.243/ + -453308.299+1682047.913/ + -453328.779+1682034.296/ + -453347.291+1682015.803/ + -453403.272+1681952.996/ + -453416.237+1681926.568/ + -453425.789+1681857.324/ + -453431.640+1681826.151/ + -453433.610+1681754.000/ + -453431.640+1681721.849/ + -453425.789+1681650.676/ + -453416.237+1681621.432/ + -453403.272+1681555.004/ + -453347.291+1681532.197/ + -453328.779+1681513.704/ + -453308.299+1681500.087/ + -453246.475+1681451.757/ + -453223.969+1681448.966/ + -453201.465+1681451.797/ + -453139.648+1681500.163/ + -453119.179+1681513.807/ + -453100.680+1681532.314/ + -453044.714+1681555.121/ + -453031.763+1681621.534/ + -453022.221+1681650.753/ + -453016.378+1681721.889/ + -453014.410+1681754.000 - - --424544.800+1711715.900/ --424622.600+1711838.700/ --424812.000+1712045.100/ --425053.900+1711853.100/ --424954.000+1711615.500/ --424845.000+1711437.700/ --424709.700+1711259.800/ --424536.900+1711427.200/ --424544.800+1711715.900 + + + -424544.800+1711715.900/ + -424622.600+1711838.700/ + -424812.000+1712045.100/ + -425053.900+1711853.100/ + -424954.000+1711615.500/ + -424845.000+1711437.700/ + -424709.700+1711259.800/ + -424536.900+1711427.200/ + -424544.800+1711715.900 - + --420856.900+1722003.500/ --421132.900+1722032.500/ --421441.900+1722005.500/ --421536.900+1721313.500/ --420759.900+1721417.500/ --420856.900+1722003.500 + -420856.900+1722003.500/ + -421132.900+1722032.500/ + -421441.900+1722005.500/ + -421536.900+1721313.500/ + -420759.900+1721417.500/ + -420856.900+1722003.500 - + --415753.900+1723100.500/ --420008.900+1723030.500/ --415953.900+1722612.500/ --415844.900+1722518.500/ --415726.900+1722618.500/ --415720.900+1722736.500/ --415753.900+1723100.500 + -415753.900+1723100.500/ + -420008.900+1723030.500/ + -415953.900+1722612.500/ + -415844.900+1722518.500/ + -415726.900+1722618.500/ + -415720.900+1722736.500/ + -415753.900+1723100.500 - + --425628.700+1722403.800/ --425913.800+1722246.200/ --425918.000+1721635.200/ --425617.100+1721621.300/ --425628.700+1722403.800 + -425628.700+1722403.800/ + -425913.800+1722246.200/ + -425918.000+1721635.200/ + -425617.100+1721621.300/ + -425628.700+1722403.800 - + --423044.500+1720123.000/ --423521.800+1720358.900/ --423615.000+1715738.100/ --423526.800+1715312.600/ --423347.200+1715257.500/ --422950.500+1715658.000/ --423044.500+1720123.000 + -423044.500+1720123.000/ + -423521.800+1720358.900/ + -423615.000+1715738.100/ + -423526.800+1715312.600/ + -423347.200+1715257.500/ + -422950.500+1715658.000/ + -423044.500+1720123.000 - - --432800.000+1722211.200/ --432922.800+1722154.400/ --432928.600+1722150.800/ --432923.400+1722116.600/ --432912.000+1722119.600/ --432906.600+1722100.400/ --432856.400+1722044.800/ --432800.600+1722035.800/ --432800.000+1722211.200 + + + -432800.000+1722211.200/ + -432922.800+1722154.400/ + -432928.600+1722150.800/ + -432923.400+1722116.600/ + -432912.000+1722119.600/ + -432906.600+1722100.400/ + -432856.400+1722044.800/ + -432800.600+1722035.800/ + -432800.000+1722211.200 - + --453039.000+1695533.600/ --453159.300+1695620.300/ --453709.000+1695541.900/ --453818.500+1694814.600/ --453400.800+1694614.000/ --453145.400+1694916.100/ --453039.000+1695533.600 + -453039.000+1695533.600/ + -453159.300+1695620.300/ + -453709.000+1695541.900/ + -453818.500+1694814.600/ + -453400.800+1694614.000/ + -453145.400+1694916.100/ + -453039.000+1695533.600 - + --454546.200+1703230.300/ --454616.200+1703212.300/ --454559.200+1703106.300/ --454529.200+1703124.300/ --454546.200+1703230.300 + -454546.200+1703230.300/ + -454616.200+1703212.300/ + -454559.200+1703106.300/ + -454529.200+1703124.300/ + -454546.200+1703230.300 - + --435413.500+1702242.500/ --435517.600+1701949.800/ --435653.300+1701507.900/ --435416.700+1701358.100/ --435253.300+1701955.900/ --435413.500+1702242.500 + -435413.500+1702242.500/ + -435517.600+1701949.800/ + -435653.300+1701507.900/ + -435416.700+1701358.100/ + -435253.300+1701955.900/ + -435413.500+1702242.500 - + --435517.600+1701949.800/ --435831.800+1702015.300/ --435824.000+1701758.500/ --435858.600+1701603.800/ --435653.300+1701507.900/ --435517.600+1701949.800 + -435517.600+1701949.800/ + -435831.800+1702015.300/ + -435824.000+1701758.500/ + -435858.600+1701603.800/ + -435653.300+1701507.900/ + -435517.600+1701949.800 - - --435504.000+1702603.000/ --435656.500+1702625.700/ --435807.700+1702427.500/ --435751.900+1702252.500/ --435831.800+1702015.300/ --435517.600+1701949.800/ --435413.500+1702242.500/ --435450.900+1702338.500/ --435504.000+1702603.000 + + + -435504.000+1702603.000/ + -435656.500+1702625.700/ + -435807.700+1702427.500/ + -435751.900+1702252.500/ + -435831.800+1702015.300/ + -435517.600+1701949.800/ + -435413.500+1702242.500/ + -435450.900+1702338.500/ + -435504.000+1702603.000 - - --355003.000+1742935.500/ --355003.492+1742942.440/ --355004.954+1742949.169/ --355007.340+1742955.483/ --355010.579+1743001.190/ --355014.573+1743006.116/ --355019.199+1743010.112/ --355024.317+1743013.057/ --355029.772+1743014.861/ --355035.398+1743015.469/ --355041.024+1743014.863/ --355046.480+1743013.060/ --355051.599+1743010.116/ --355056.225+1743006.120/ --355100.219+1743001.194/ --355103.459+1742955.487/ --355105.846+1742949.172/ --355107.308+1742942.441/ --355107.800+1742935.500/ --355107.308+1742928.559/ --355105.846+1742921.828/ --355103.459+1742915.513/ --355100.219+1742909.806/ --355056.225+1742904.880/ --355051.599+1742900.884/ --355046.480+1742857.940/ --355041.024+1742856.137/ --355035.398+1742855.531/ --355029.772+1742856.139/ --355024.317+1742857.943/ --355019.199+1742900.888/ --355014.573+1742904.884/ --355010.579+1742909.810/ --355007.340+1742915.517/ --355004.954+1742921.831/ --355003.492+1742928.560/ --355003.000+1742935.500 + + + -355003.000+1742935.500/ + -355003.492+1742942.440/ + -355004.954+1742949.169/ + -355007.340+1742955.483/ + -355010.579+1743001.190/ + -355014.573+1743006.116/ + -355019.199+1743010.112/ + -355024.317+1743013.057/ + -355029.772+1743014.861/ + -355035.398+1743015.469/ + -355041.024+1743014.863/ + -355046.480+1743013.060/ + -355051.599+1743010.116/ + -355056.225+1743006.120/ + -355100.219+1743001.194/ + -355103.459+1742955.487/ + -355105.846+1742949.172/ + -355107.308+1742942.441/ + -355107.800+1742935.500/ + -355107.308+1742928.559/ + -355105.846+1742921.828/ + -355103.459+1742915.513/ + -355100.219+1742909.806/ + -355056.225+1742904.880/ + -355051.599+1742900.884/ + -355046.480+1742857.940/ + -355041.024+1742856.137/ + -355035.398+1742855.531/ + -355029.772+1742856.139/ + -355024.317+1742857.943/ + -355019.199+1742900.888/ + -355014.573+1742904.884/ + -355010.579+1742909.810/ + -355007.340+1742915.517/ + -355004.954+1742921.831/ + -355003.492+1742928.560/ + -355003.000+1742935.500 - - --360907.310+1750442.700/ --360909.770+1750517.539/ --360917.074+1750551.322/ --360929.000+1750623.023/ --360945.192+1750651.680/ --361005.151+1750716.423/ --361028.275+1750736.501/ --361053.862+1750751.302/ --361121.134+1750800.376/ --361149.263+1750803.446/ --361217.396+1750800.416/ --361244.676+1750751.376/ --361310.275+1750736.601/ --361333.414+1750716.537/ --361353.390+1750651.794/ --361409.594+1750623.123/ --361421.535+1750551.396/ --361428.847+1750517.579/ --361431.310+1750442.700/ --361428.847+1750407.821/ --361421.535+1750334.004/ --361409.594+1750302.277/ --361353.390+1750233.606/ --361333.414+1750208.863/ --361310.275+1750148.799/ --361244.676+1750134.024/ --361217.396+1750124.984/ --361149.263+1750121.954/ --361121.134+1750125.024/ --361053.862+1750134.098/ --361028.275+1750148.899/ --361005.151+1750208.977/ --360945.192+1750233.720/ --360929.000+1750302.377/ --360917.074+1750334.078/ --360909.770+1750407.861/ --360907.310+1750442.700 + + + -360907.310+1750442.700/ + -360909.770+1750517.539/ + -360917.074+1750551.322/ + -360929.000+1750623.023/ + -360945.192+1750651.680/ + -361005.151+1750716.423/ + -361028.275+1750736.501/ + -361053.862+1750751.302/ + -361121.134+1750800.376/ + -361149.263+1750803.446/ + -361217.396+1750800.416/ + -361244.676+1750751.376/ + -361310.275+1750736.601/ + -361333.414+1750716.537/ + -361353.390+1750651.794/ + -361409.594+1750623.123/ + -361421.535+1750551.396/ + -361428.847+1750517.579/ + -361431.310+1750442.700/ + -361428.847+1750407.821/ + -361421.535+1750334.004/ + -361409.594+1750302.277/ + -361353.390+1750233.606/ + -361333.414+1750208.863/ + -361310.275+1750148.799/ + -361244.676+1750134.024/ + -361217.396+1750124.984/ + -361149.263+1750121.954/ + -361121.134+1750125.024/ + -361053.862+1750134.098/ + -361028.275+1750148.899/ + -361005.151+1750208.977/ + -360945.192+1750233.720/ + -360929.000+1750302.377/ + -360917.074+1750334.078/ + -360909.770+1750407.861/ + -360907.310+1750442.700 - - --360120.300+1743031.500/ --360133.900+1743006.300/ --360123.600+1742959.000/ --355940.400+1742844.600/ --355908.900+1742823.200/ --355850.600+1742804.600/ --355823.100+1742845.300/ --360120.300+1743031.500 + + + -360120.300+1743031.500/ + -360133.900+1743006.300/ + -360123.600+1742959.000/ + -355940.400+1742844.600/ + -355908.900+1742823.200/ + -355850.600+1742804.600/ + -355823.100+1742845.300/ + -360120.300+1743031.500 - - --360653.300+1743716.400/ --360709.400+1743634.100/ --360703.700+1743634.300/ --360640.600+1743607.600/ --360632.200+1743547.500/ --360454.900+1743555.600/ --360456.600+1743612.200/ --360653.300+1743716.400 + + + -360653.300+1743716.400/ + -360709.400+1743634.100/ + -360703.700+1743634.300/ + -360640.600+1743607.600/ + -360632.200+1743547.500/ + -360454.900+1743555.600/ + -360456.600+1743612.200/ + -360653.300+1743716.400 - - --360925.400+1743909.700/ --360932.800+1743839.900/ --360917.700+1743825.300/ --360918.200+1743804.300/ --360906.800+1743749.500/ --360837.000+1743755.400/ --360807.000+1743734.800/ --360755.200+1743757.600/ --360925.400+1743909.700 + + + -360925.400+1743909.700/ + -360932.800+1743839.900/ + -360917.700+1743825.300/ + -360918.200+1743804.300/ + -360906.800+1743749.500/ + -360837.000+1743755.400/ + -360807.000+1743734.800/ + -360755.200+1743757.600/ + -360925.400+1743909.700 - - --393813.400+1770602.100/ --393816.989+1770607.650/ --393819.072+1770610.130/ --393821.315+1770612.365/ --393823.698+1770614.337/ --393826.205+1770616.033/ --393828.817+1770617.438/ --393831.512+1770618.542/ --393834.272+1770619.337/ --393837.074+1770619.816/ --393839.898+1770619.977/ --393842.722+1770619.817/ --393845.524+1770619.339/ --393848.284+1770618.545/ --393850.980+1770617.441/ --393853.591+1770616.037/ --393856.098+1770614.342/ --393858.482+1770612.370/ --393900.725+1770610.135/ --393902.809+1770607.656/ --393904.719+1770604.949/ --393906.440+1770602.037/ --393907.959+1770558.941/ --393909.264+1770555.685/ --393910.346+1770552.293/ --393911.196+1770548.792/ --393911.808+1770545.208/ --393912.177+1770541.568/ --393912.300+1770537.900/ --393912.177+1770534.232/ --393911.808+1770530.592/ --393911.196+1770527.008/ --393910.346+1770523.507/ --393909.264+1770520.115/ --393907.959+1770516.859/ --393906.440+1770513.763/ --393906.100+1770513.300/ --393832.100+1770411.300/ --393828.609+1770405.748/ --393826.525+1770403.269/ --393824.282+1770401.035/ --393821.898+1770359.063/ --393819.391+1770357.369/ --393816.780+1770355.964/ --393814.084+1770354.861/ --393811.324+1770354.067/ --393808.522+1770353.589/ --393805.698+1770353.429/ --393802.874+1770353.589/ --393800.072+1770354.069/ --393757.312+1770354.864/ --393754.617+1770355.968/ --393752.005+1770357.373/ --393749.498+1770359.068/ --393747.115+1770401.040/ --393744.872+1770403.274/ --393742.789+1770405.754/ --393740.879+1770408.460/ --393739.159+1770411.372/ --393737.640+1770414.467/ --393736.335+1770417.722/ --393735.254+1770421.113/ --393734.404+1770424.613/ --393733.792+1770428.195/ --393733.423+1770431.834/ --393733.300+1770435.500/ --393733.423+1770439.166/ --393733.792+1770442.805/ --393734.404+1770446.387/ --393735.254+1770449.887/ --393736.335+1770453.278/ --393737.640+1770456.533/ --393739.159+1770459.628/ --393739.300+1770500.100/ --393813.400+1770602.100 + + + -393813.400+1770602.100/ + -393816.989+1770607.650/ + -393819.072+1770610.130/ + -393821.315+1770612.365/ + -393823.698+1770614.337/ + -393826.205+1770616.033/ + -393828.817+1770617.438/ + -393831.512+1770618.542/ + -393834.272+1770619.337/ + -393837.074+1770619.816/ + -393839.898+1770619.977/ + -393842.722+1770619.817/ + -393845.524+1770619.339/ + -393848.284+1770618.545/ + -393850.980+1770617.441/ + -393853.591+1770616.037/ + -393856.098+1770614.342/ + -393858.482+1770612.370/ + -393900.725+1770610.135/ + -393902.809+1770607.656/ + -393904.719+1770604.949/ + -393906.440+1770602.037/ + -393907.959+1770558.941/ + -393909.264+1770555.685/ + -393910.346+1770552.293/ + -393911.196+1770548.792/ + -393911.808+1770545.208/ + -393912.177+1770541.568/ + -393912.300+1770537.900/ + -393912.177+1770534.232/ + -393911.808+1770530.592/ + -393911.196+1770527.008/ + -393910.346+1770523.507/ + -393909.264+1770520.115/ + -393907.959+1770516.859/ + -393906.440+1770513.763/ + -393906.100+1770513.300/ + -393832.100+1770411.300/ + -393828.609+1770405.748/ + -393826.525+1770403.269/ + -393824.282+1770401.035/ + -393821.898+1770359.063/ + -393819.391+1770357.369/ + -393816.780+1770355.964/ + -393814.084+1770354.861/ + -393811.324+1770354.067/ + -393808.522+1770353.589/ + -393805.698+1770353.429/ + -393802.874+1770353.589/ + -393800.072+1770354.069/ + -393757.312+1770354.864/ + -393754.617+1770355.968/ + -393752.005+1770357.373/ + -393749.498+1770359.068/ + -393747.115+1770401.040/ + -393744.872+1770403.274/ + -393742.789+1770405.754/ + -393740.879+1770408.460/ + -393739.159+1770411.372/ + -393737.640+1770414.467/ + -393736.335+1770417.722/ + -393735.254+1770421.113/ + -393734.404+1770424.613/ + -393733.792+1770428.195/ + -393733.423+1770431.834/ + -393733.300+1770435.500/ + -393733.423+1770439.166/ + -393733.792+1770442.805/ + -393734.404+1770446.387/ + -393735.254+1770449.887/ + -393736.335+1770453.278/ + -393737.640+1770456.533/ + -393739.159+1770459.628/ + -393739.300+1770500.100/ + -393813.400+1770602.100 - - --385900.000+1781400.000/ --390803.900+1781631.500/ --392342.200+1780544.900/ --392510.783+1780437.866/ --392600.702+1780348.511/ --392647.101+1780253.690/ --392729.626+1780153.822/ --392807.950+1780049.362/ --392841.780+1775940.802/ --392910.857+1775828.666/ --392934.958+1775713.505/ --392953.897+1775555.897/ --393007.530+1775436.435/ --393015.752+1775315.730/ --393018.500+1775154.400/ --393015.752+1775033.070/ --393007.530+1774912.365/ --392953.897+1774752.903/ --392934.958+1774635.295/ --392910.857+1774520.134/ --392841.780+1774408.000/ --392807.950+1774259.438/ --392729.626+1774154.978/ --392647.101+1774055.110/ --392600.702+1774000.289/ --392510.783+1773910.934/ --392417.727+1773827.417/ --392321.939+1773750.069/ --392223.845+1773719.169/ --392123.889+1773654.950/ --392022.528+1773637.591/ --392017.300+1773632.800/ --390600.000+1773632.800/ --390600.000+1775400.000/ --385900.000+1781400.000 + + + -385900.000+1781400.000/ + -390803.900+1781631.500/ + -392342.200+1780544.900/ + -392510.783+1780437.866/ + -392600.702+1780348.511/ + -392647.101+1780253.690/ + -392729.626+1780153.822/ + -392807.950+1780049.362/ + -392841.780+1775940.802/ + -392910.857+1775828.666/ + -392934.958+1775713.505/ + -392953.897+1775555.897/ + -393007.530+1775436.435/ + -393015.752+1775315.730/ + -393018.500+1775154.400/ + -393015.752+1775033.070/ + -393007.530+1774912.365/ + -392953.897+1774752.903/ + -392934.958+1774635.295/ + -392910.857+1774520.134/ + -392841.780+1774408.000/ + -392807.950+1774259.438/ + -392729.626+1774154.978/ + -392647.101+1774055.110/ + -392600.702+1774000.289/ + -392510.783+1773910.934/ + -392417.727+1773827.417/ + -392321.939+1773750.069/ + -392223.845+1773719.169/ + -392123.889+1773654.950/ + -392022.528+1773637.591/ + -392017.300+1773632.800/ + -390600.000+1773632.800/ + -390600.000+1775400.000/ + -385900.000+1781400.000 - - --404146.600+1753815.600/ --404148.076+1753837.862/ --404152.460+1753859.449/ --404159.617+1753919.705/ --404209.332+1753938.015/ --404221.309+1753953.823/ --404235.185+1754006.649/ --404250.538+1754016.103/ --404306.902+1754021.897/ --404323.780+1754023.854/ --404340.659+1754021.915/ --404357.027+1754016.136/ --404412.385+1754006.694/ --404426.267+1753953.874/ --404438.251+1753938.066/ --404447.973+1753919.750/ --404455.136+1753859.482/ --404459.523+1753837.880/ --404501.000+1753815.600/ --404459.523+1753753.320/ --404455.136+1753731.718/ --404447.973+1753711.450/ --404438.251+1753653.134/ --404426.267+1753637.326/ --404412.385+1753624.506/ --404357.027+1753615.064/ --404340.659+1753609.285/ --404323.780+1753607.346/ --404306.902+1753609.303/ --404250.538+1753615.097/ --404235.185+1753624.551/ --404221.309+1753637.377/ --404209.332+1753653.185/ --404159.617+1753711.495/ --404152.460+1753731.751/ --404148.076+1753753.338/ --404146.600+1753815.600 + + + -404146.600+1753815.600/ + -404148.076+1753837.862/ + -404152.460+1753859.449/ + -404159.617+1753919.705/ + -404209.332+1753938.015/ + -404221.309+1753953.823/ + -404235.185+1754006.649/ + -404250.538+1754016.103/ + -404306.902+1754021.897/ + -404323.780+1754023.854/ + -404340.659+1754021.915/ + -404357.027+1754016.136/ + -404412.385+1754006.694/ + -404426.267+1753953.874/ + -404438.251+1753938.066/ + -404447.973+1753919.750/ + -404455.136+1753859.482/ + -404459.523+1753837.880/ + -404501.000+1753815.600/ + -404459.523+1753753.320/ + -404455.136+1753731.718/ + -404447.973+1753711.450/ + -404438.251+1753653.134/ + -404426.267+1753637.326/ + -404412.385+1753624.506/ + -404357.027+1753615.064/ + -404340.659+1753609.285/ + -404323.780+1753607.346/ + -404306.902+1753609.303/ + -404250.538+1753615.097/ + -404235.185+1753624.551/ + -404221.309+1753637.377/ + -404209.332+1753653.185/ + -404159.617+1753711.495/ + -404152.460+1753731.751/ + -404148.076+1753753.338/ + -404146.600+1753815.600 - - --402958.800+1724426.500/ --402942.491+1724701.923/ --402938.400+1724905.700/ --402942.491+1725109.477/ --402954.735+1725312.325/ --403015.038+1725513.321/ --403043.248+1725711.554/ --403119.154+1725906.137/ --403202.486+1730056.206/ --403252.917+1730240.930/ --403350.069+1730419.517/ --403453.510+1730551.222/ --403500.500+1730557.600/ --403507.142+1730605.864/ --403511.626+1730610.396/ --403516.393+1730614.398/ --403521.407+1730617.836/ --403526.629+1730620.687/ --403532.020+1730622.927/ --403537.539+1730624.541/ --403543.144+1730625.514/ --403548.791+1730625.841/ --403554.439+1730625.518/ --403600.044+1730624.548/ --403605.563+1730622.939/ --403610.955+1730620.702/ --403616.178+1730617.854/ --403621.193+1730614.417/ --403625.962+1730610.418/ --403630.448+1730605.886/ --403634.616+1730600.857/ --403638.436+1730555.367/ --403641.878+1730549.460/ --403644.916+1730543.180/ --403647.527+1730536.575/ --403649.691+1730529.696/ --403651.391+1730522.594/ --403652.615+1730515.323/ --403653.353+1730507.940/ --403653.800+1730500.500/ --403653.800+1725137.400/ --402958.800+1724426.500 + + + -402958.800+1724426.500/ + -402942.491+1724701.923/ + -402938.400+1724905.700/ + -402942.491+1725109.477/ + -402954.735+1725312.325/ + -403015.038+1725513.321/ + -403043.248+1725711.554/ + -403119.154+1725906.137/ + -403202.486+1730056.206/ + -403252.917+1730240.930/ + -403350.069+1730419.517/ + -403453.510+1730551.222/ + -403500.500+1730557.600/ + -403507.142+1730605.864/ + -403511.626+1730610.396/ + -403516.393+1730614.398/ + -403521.407+1730617.836/ + -403526.629+1730620.687/ + -403532.020+1730622.927/ + -403537.539+1730624.541/ + -403543.144+1730625.514/ + -403548.791+1730625.841/ + -403554.439+1730625.518/ + -403600.044+1730624.548/ + -403605.563+1730622.939/ + -403610.955+1730620.702/ + -403616.178+1730617.854/ + -403621.193+1730614.417/ + -403625.962+1730610.418/ + -403630.448+1730605.886/ + -403634.616+1730600.857/ + -403638.436+1730555.367/ + -403641.878+1730549.460/ + -403644.916+1730543.180/ + -403647.527+1730536.575/ + -403649.691+1730529.696/ + -403651.391+1730522.594/ + -403652.615+1730515.323/ + -403653.353+1730507.940/ + -403653.800+1730500.500/ + -403653.800+1725137.400/ + -402958.800+1724426.500 - - --430517.900+1702348.400/ --430706.000+1702330.400/ --430723.000+1702018.400/ --431354.000+1701300.300/ --431333.000+1701021.300/ --430839.000+1701339.400/ --430630.400+1701539.600/ --430455.700+1702204.000/ --430517.900+1702348.400 + + + -430517.900+1702348.400/ + -430706.000+1702330.400/ + -430723.000+1702018.400/ + -431354.000+1701300.300/ + -431333.000+1701021.300/ + -430839.000+1701339.400/ + -430630.400+1701539.600/ + -430455.700+1702204.000/ + -430517.900+1702348.400 - - --444154.100+1675646.400/ --444215.100+1675851.200/ --444354.100+1675800.200/ --444604.900+1680124.200/ --444734.900+1680240.400/ --444810.300+1680526.000/ --444940.300+1680523.000/ --444940.300+1680032.000/ --444801.900+1680036.200/ --444631.900+1675920.000/ --444601.300+1675716.400/ --444354.100+1675520.000/ --444154.100+1675646.400 + + + -444154.100+1675646.400/ + -444215.100+1675851.200/ + -444354.100+1675800.200/ + -444604.900+1680124.200/ + -444734.900+1680240.400/ + -444810.300+1680526.000/ + -444940.300+1680523.000/ + -444940.300+1680032.000/ + -444801.900+1680036.200/ + -444631.900+1675920.000/ + -444601.300+1675716.400/ + -444354.100+1675520.000/ + -444154.100+1675646.400 - + --420935.900+1712223.400/ --421019.900+1712208.400/ --421103.800+1712142.400/ --420944.900+1711958.400/ --420722.900+1711959.400/ --420935.900+1712223.400 + -420935.900+1712223.400/ + -421019.900+1712208.400/ + -421103.800+1712142.400/ + -420944.900+1711958.400/ + -420722.900+1711959.400/ + -420935.900+1712223.400 - - --452114.000+1705151.300/ --452114.492+1705159.306/ --452115.954+1705207.069/ --452118.340+1705214.354/ --452121.579+1705220.938/ --452125.572+1705226.621/ --452130.198+1705231.232/ --452135.316+1705234.630/ --452140.771+1705236.712/ --452146.397+1705237.414/ --452152.024+1705236.714/ --452157.479+1705234.635/ --452202.598+1705231.239/ --452207.225+1705226.629/ --452211.219+1705220.945/ --452214.459+1705214.360/ --452216.846+1705207.074/ --452218.308+1705159.309/ --452218.800+1705151.300/ --452218.308+1705143.291/ --452216.846+1705135.526/ --452214.459+1705128.240/ --452211.219+1705121.655/ --452207.225+1705115.971/ --452202.598+1705111.361/ --452157.479+1705107.965/ --452152.024+1705105.886/ --452146.397+1705105.186/ --452140.771+1705105.888/ --452135.316+1705107.970/ --452130.198+1705111.368/ --452125.572+1705115.979/ --452121.579+1705121.662/ --452118.340+1705128.246/ --452115.954+1705135.531/ --452114.492+1705143.294/ --452114.000+1705151.300 + + + -452114.000+1705151.300/ + -452114.492+1705159.306/ + -452115.954+1705207.069/ + -452118.340+1705214.354/ + -452121.579+1705220.938/ + -452125.572+1705226.621/ + -452130.198+1705231.232/ + -452135.316+1705234.630/ + -452140.771+1705236.712/ + -452146.397+1705237.414/ + -452152.024+1705236.714/ + -452157.479+1705234.635/ + -452202.598+1705231.239/ + -452207.225+1705226.629/ + -452211.219+1705220.945/ + -452214.459+1705214.360/ + -452216.846+1705207.074/ + -452218.308+1705159.309/ + -452218.800+1705151.300/ + -452218.308+1705143.291/ + -452216.846+1705135.526/ + -452214.459+1705128.240/ + -452211.219+1705121.655/ + -452207.225+1705115.971/ + -452202.598+1705111.361/ + -452157.479+1705107.965/ + -452152.024+1705105.886/ + -452146.397+1705105.186/ + -452140.771+1705105.888/ + -452135.316+1705107.970/ + -452130.198+1705111.368/ + -452125.572+1705115.979/ + -452121.579+1705121.662/ + -452118.340+1705128.246/ + -452115.954+1705135.531/ + -452114.492+1705143.294/ + -452114.000+1705151.300 - + --434802.100+1724112.900/ --434937.300+1724152.400/ --434939.100+1724509.000/ --435313.200+1724509.000/ --435313.200+1723504.700/ --434802.100+1723314.900/ --434802.100+1724112.900 + -434802.100+1724112.900/ + -434937.300+1724152.400/ + -434939.100+1724509.000/ + -435313.200+1724509.000/ + -435313.200+1723504.700/ + -434802.100+1723314.900/ + -434802.100+1724112.900 - - --454551.800+1704342.300/ --454552.292+1704350.365/ --454553.754+1704358.185/ --454556.140+1704405.523/ --454559.379+1704412.155/ --454603.372+1704417.880/ --454608.000+1704422.525/ --454613.116+1704425.948/ --454618.571+1704428.045/ --454624.197+1704428.752/ --454629.824+1704428.047/ --454635.279+1704425.953/ --454640.398+1704422.532/ --454645.025+1704417.888/ --454649.019+1704412.162/ --454652.259+1704405.529/ --454654.646+1704358.190/ --454656.108+1704350.368/ --454656.600+1704342.300/ --454656.108+1704334.232/ --454654.646+1704326.410/ --454652.259+1704319.071/ --454649.019+1704312.438/ --454645.025+1704306.712/ --454640.398+1704302.068/ --454635.279+1704258.647/ --454629.824+1704256.553/ --454624.197+1704255.848/ --454618.571+1704256.555/ --454613.116+1704258.652/ --454608.000+1704302.075/ --454603.372+1704306.720/ --454559.379+1704312.445/ --454556.140+1704319.077/ --454553.754+1704326.415/ --454552.292+1704334.235/ --454551.800+1704342.300 + + + -454551.800+1704342.300/ + -454552.292+1704350.365/ + -454553.754+1704358.185/ + -454556.140+1704405.523/ + -454559.379+1704412.155/ + -454603.372+1704417.880/ + -454608.000+1704422.525/ + -454613.116+1704425.948/ + -454618.571+1704428.045/ + -454624.197+1704428.752/ + -454629.824+1704428.047/ + -454635.279+1704425.953/ + -454640.398+1704422.532/ + -454645.025+1704417.888/ + -454649.019+1704412.162/ + -454652.259+1704405.529/ + -454654.646+1704358.190/ + -454656.108+1704350.368/ + -454656.600+1704342.300/ + -454656.108+1704334.232/ + -454654.646+1704326.410/ + -454652.259+1704319.071/ + -454649.019+1704312.438/ + -454645.025+1704306.712/ + -454640.398+1704302.068/ + -454635.279+1704258.647/ + -454629.824+1704256.553/ + -454624.197+1704255.848/ + -454618.571+1704256.555/ + -454613.116+1704258.652/ + -454608.000+1704302.075/ + -454603.372+1704306.720/ + -454559.379+1704312.445/ + -454556.140+1704319.077/ + -454553.754+1704326.415/ + -454552.292+1704334.235/ + -454551.800+1704342.300 From 989391abe1b7cc266ea7dc093587ac9bc559d1de Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Fri, 10 Feb 2023 17:02:37 +1300 Subject: [PATCH 32/50] Fixes OPS-39: Bump to 2304 --- Profile.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Profile.xml b/Profile.xml index 4ee8ce0..d86deb5 100644 --- a/Profile.xml +++ b/Profile.xml @@ -1,6 +1,6 @@ - From 30a3bc31c019a787d32556ed4515604724a651a1 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Wed, 15 Feb 2023 12:40:50 +1300 Subject: [PATCH 33/50] Fixes OPS-104 - Remove NZAA-F --- Positions.xml | 1 - Sectors.xml | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Positions.xml b/Positions.xml index 858db86..c94b561 100644 --- a/Positions.xml +++ b/Positions.xml @@ -218,7 +218,6 @@ - diff --git a/Sectors.xml b/Sectors.xml index a07471d..122749f 100644 --- a/Sectors.xml +++ b/Sectors.xml @@ -1,5 +1,6 @@ - + STH QTMA,TDN,TNV, MFS @@ -52,9 +53,6 @@ ATMA - - ATMA - HTMA From 5977ab41fcf573cf7776657ac02a29dd47db4c3a Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Wed, 15 Feb 2023 14:12:57 +1300 Subject: [PATCH 34/50] Fixes OPS-109: Change _APP and _DEP frequencies --- AlertParameters.xml | 2 +- Maps/NZCH/CH_ACU.xml | 6 ++++-- Positions.xml | 6 ------ Sectors.xml | 7 +++---- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/AlertParameters.xml b/AlertParameters.xml index 425bc2b..aace49d 100644 --- a/AlertParameters.xml +++ b/AlertParameters.xml @@ -5,7 +5,7 @@ - ATMA,WTMA,CTMA, QTMA + ATMA,WTMA,CTMA,QTMA diff --git a/Maps/NZCH/CH_ACU.xml b/Maps/NZCH/CH_ACU.xml index 3dc7173..a5a32c7 100644 --- a/Maps/NZCH/CH_ACU.xml +++ b/Maps/NZCH/CH_ACU.xml @@ -412,7 +412,7 @@ - CH02T/MEBMU/ANULU/RUTOR/PEDMI + -43.497631+172.522114/CH02T/MEBMU/ANULU/RUTOR/PEDMI @@ -434,6 +434,9 @@ PEDMI/PORAM + + MEBMU + CH20T CH02T @@ -452,7 +455,6 @@ KIDAL MOLGI VANDA - MEBMU ANULU RUTOR PEDMI diff --git a/Positions.xml b/Positions.xml index c94b561..a7c8abd 100644 --- a/Positions.xml +++ b/Positions.xml @@ -252,12 +252,6 @@ Need local charts? - vats.im/nz/charts Provide Feedback - vats.im/nz/atc-fb - - Auckland Finals - Controls inbound aircraft under 5000ft within the AA TMA. - Need local charts? - vats.im/nz/charts - Provide Feedback - vats.im/nz/atc-fb - Auckland Tower - ATIS 127.800 Need local charts? - vats.im/nz/charts diff --git a/Sectors.xml b/Sectors.xml index 122749f..b773104 100644 --- a/Sectors.xml +++ b/Sectors.xml @@ -1,6 +1,5 @@ - + STH QTMA,TDN,TNV, MFS @@ -46,11 +45,11 @@ - + ATMA AARR,ADEP - + ATMA From d50b45411f17402518ffbcfa74605bb7d2a5397e Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Sun, 19 Feb 2023 18:03:36 +1300 Subject: [PATCH 35/50] Revert AA_APP freq. AA_DEP freq to 129.6 --- Sectors.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sectors.xml b/Sectors.xml index b773104..aae3e37 100644 --- a/Sectors.xml +++ b/Sectors.xml @@ -45,11 +45,11 @@ - + ATMA AARR,ADEP - + ATMA From d96f7f3b0c65b0c38613cb1a53e8c49b54d6c9f5 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Wed, 8 Mar 2023 17:23:12 +1300 Subject: [PATCH 36/50] OPS-114: Change NZPM Ground Plate --- .github/changelogs/2023.md | 23 ++++++++++++++++++++--- Maps/ASMGCS_TAXI_ALL.xml | 2 +- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.github/changelogs/2023.md b/.github/changelogs/2023.md index 1a3e252..dd5e509 100644 --- a/.github/changelogs/2023.md +++ b/.github/changelogs/2023.md @@ -3,8 +3,6 @@ Not released due to a lack of applicable changes. -# Latest - ## AIRAC 2302 ### Revision A @@ -65,4 +63,23 @@ We have made the following changes to ENR sectors: - OCR/RAN/BAY: Realigned border to better match surrounding ENRs and TMAs. - ENR and TMA sector maps updated. - Re-export of existing TMA and Procedural Tower bounds to produce a smoother arc (vertex every 5 degrees now.) - - Slight realignment of the underlying Sector Volume definitions. \ No newline at end of file + - Slight realignment of the underlying Sector Volume definitions. + + +## AIRAC 2303 + +Not released due to a lack of applicable changes. + + +# Latest + +## AIRAC 2304 + +### Revision A + +#### ANR Updates + +#### Dataset Updates + + - Changed conflict alert critera for QN TMA to 3nm + - Removed NZAA-F_APP, and assigned that frequency to NZAA_DEP. \ No newline at end of file diff --git a/Maps/ASMGCS_TAXI_ALL.xml b/Maps/ASMGCS_TAXI_ALL.xml index d8e78a2..396f42d 100644 --- a/Maps/ASMGCS_TAXI_ALL.xml +++ b/Maps/ASMGCS_TAXI_ALL.xml @@ -206,7 +206,7 @@ -40.322824+175.621153 -40.324316+175.619527 -40.322901+175.613340 - -40.324873+175.617842 + -40.324873+175.617842 From af431bbed63fab135a95f91d1d64db78096ec209 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Wed, 8 Mar 2023 18:03:38 +1300 Subject: [PATCH 37/50] Fixes OPS-36: Cycle 2304 Cycle update --- .github/changelogs/2023.md | 4 + Airspace.xml | 60 +- Maps/Airspace/ALL_RNAV.xml | 6 +- Maps/Airspace/Controlled Airspace Labels.xml | 19 + Maps/NZAA/AA_ACU.xml | 2 + Maps/NZAR/AR_ACU.xml | 2 + Maps/NZNE/NE_ACU.xml | 2 + Maps/NZNS/NS_ACU.xml | 30 +- Maps/NZWP/WP_ACU.xml | 2 + Maps/NZWT/WT_ACU.xml | 2 + Maps/NZZC.xml | 4 +- Maps/Navaids/ATS Routes.xml | 37 +- RestrictedAreas.xml | 2530 +++++++++--------- 13 files changed, 1372 insertions(+), 1328 deletions(-) create mode 100644 Maps/Airspace/Controlled Airspace Labels.xml diff --git a/.github/changelogs/2023.md b/.github/changelogs/2023.md index 00caa66..5cec3f1 100644 --- a/.github/changelogs/2023.md +++ b/.github/changelogs/2023.md @@ -80,6 +80,10 @@ Not released due to a lack of applicable changes. #### ANR Updates + - The following VRPs have been added: `GLASSHOUSE` + - The following airways routes have been established: `W139`, `KQ717`, `Z305` + - Various IFR waypoints have been added. + #### Dataset Updates - Changed conflict alert critera for QN TMA to 3nm diff --git a/Airspace.xml b/Airspace.xml index d88b1d6..c0ac3a5 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -1849,6 +1849,10 @@ NV VOR/ KELSO/ DABIN/ CH VOR + + +OH VOR/ +ENTIM HK NDB/ @@ -1953,7 +1957,12 @@ OBLIX/ RILVA/ IDVEX/ LEGIK/ -PAVDO +PAVDO/ +NURLA/ +TUSVI/ +AVGAM/ +IDIXI/ +NOVTO TAYLA/ @@ -1965,7 +1974,10 @@ GUMPI/ POPUP/ REVMU/ APORO/ -VARGU +VARGU/ +SOVBA/ +ESKOD/ +NOMAP LEGIK/ @@ -2058,6 +2070,11 @@ MANGA/ TUIHU/ VANSA/ UPDAL + + +EKENU/ +RUROD/ +PAVDO MESOS/ @@ -3246,6 +3263,12 @@ WAPOU WAPOU/ ATNUV/ NP VOR + + +OH VOR/ +IDGEB/ +BENSE/ +IDLUR BIKOT/ @@ -3423,6 +3446,7 @@ RILEY -424701.860+1710412.120 -434713.280-1764400.820 -441002.700+1702246.990 + -450137.550+1685643.910 -423831.360+1784500.020 -395834.250+1755049.580 -364649.090+1755137.760 @@ -3494,6 +3518,7 @@ RILEY -402930.080+1753609.940 -411109.040+1742144.560 -361502.000+1753520.220 + -445900.560+1695733.290 -395610.160+1744749.350 -415405.800+1712651.660 -385027.180+1772327.700 @@ -3531,11 +3556,13 @@ RILEY -425932.440+1713033.950 -373932.660+1762359.430 -211731.830-1594505.530 + -450904.750+1684443.620 -364219.550+1741850.820 -400602.100+1750703.750 -413139.710+1734107.580 -390624.440+1735839.420 -455313.620+1701712.930 + -395513.850+1753112.370 -404357.580+1724856.210 -411718.360+1730324.520 -373342.800+1755706.520 @@ -3789,6 +3816,7 @@ RILEY -381315.400+1751947.920 -380354.240+1761329.390 -455837.600+1691400.780 + -450820.570+1682547.360 -352846.890+1743141.520 -422231.820+1735126.900 -433000.130+1705815.530 @@ -3897,6 +3925,7 @@ RILEY -371505.510+1753301.950 -460510.120+1701244.440 -401010.300+1751456.360 + -375144.660+1750947.010 -411052.990+1744106.490 -450249.000+1684020.000 -432612.120+1723532.940 @@ -4093,6 +4122,7 @@ RILEY -440318.650+1715947.930 -411907.330+1662643.460 -370537.800+1745824.330 + -400352.120+1752723.130 -212624.440-1601612.610 -442424.670+1712457.500 -440047.170+1711228.900 @@ -4116,6 +4146,7 @@ RILEY -385619.910+1752558.110 -370449.990+1754929.260 -372448.310+1745504.810 + -374544.980+1750918.360 -182740.000+1782931.000 -390221.110+1740207.280 -461622.140+1700849.000 @@ -4189,6 +4220,7 @@ RILEY -455517.020+1684555.820 -190142.000+1782348.000 -372631.020+1754607.720 + -445709.740+1684510.700 -401909.660+1755010.710 -434846.310+1715854.440 -455702.820+1702820.640 @@ -4359,6 +4391,7 @@ RILEY -761200.000+1662700.000 -363528.660+1744656.690 -425532.030+1732311.620 + -450008.210+1684348.290 -455952.870+1700653.200 -390207.140+1741831.010 -410501.610+1732711.040 @@ -4655,6 +4688,7 @@ RILEY -445405.180+1703923.550 -373520.500+1760330.260 -212502.500-1750020.990 + -374844.790+1750933.240 -450406.450+1683639.830 -353903.000+1630000.000 -365709.030+1754840.790 @@ -4680,6 +4714,7 @@ RILEY -422452.000+1630000.000 -365745.570+1742902.700 -392925.390+1743006.730 + -452106.020+1684244.910 -364717.000+1740032.000 -460816.440+1685327.320 -450356.600+1683730.650 @@ -4718,6 +4753,7 @@ RILEY -371609.440+1752610.840 -365529.930+1750348.990 -425438.210+1712011.090 + -445442.600+1685819.940 -210637.370-1600350.640 -385648.390+1740110.400 -370626.320+1742621.410 @@ -4747,6 +4783,7 @@ RILEY -465307.410+1681028.850 -362742.090+1743930.990 -251401.520-1650000.000 + -374832.590+1751335.260 -360426.771+1752720.880 -264604.090-1650000.000 -433136.480+1722457.220 @@ -4767,6 +4804,7 @@ RILEY -363644.090+1742834.650 -392726.490+1770502.610 -352541.070+1742700.870 + -450927.460+1682248.330 -384430.960+1753211.430 -423724.070+1710418.250 -384024.600+1755259.330 @@ -4986,6 +5024,7 @@ RILEY -392911.420+1735914.950 -370057.140+1754815.650 -422011.390+1725335.820 + -451447.410+1705058.260 -403947.260+1744850.800 -411119.470+1742553.680 -432545.180+1723916.870 @@ -5034,6 +5073,7 @@ RILEY -380219.430+1752643.000 -083714.440-1650000.000 -325507.000+1630000.000 + -450735.770+1681531.440 -383451.000+1630000.000 -365133.120+1751922.300 -425653.190+1721628.250 @@ -5140,6 +5180,7 @@ RILEY -451342.610+1693840.990 -373950.740+1760115.210 -393756.850+1750704.250 + -450939.910+1681834.980 -374632.680+1752941.660 -255334.310-1750000.000 -383504.710+1760511.600 @@ -5157,6 +5198,7 @@ RILEY -194637.416-1742025.368 -153418.444-1753745.984 -374455.590+1762216.890 + -445250.390+1690505.220 -391800.310+1741626.340 -211122.540-1594433.880 -461544.970+1695225.960 @@ -5246,6 +5288,7 @@ RILEY -385704.400+1742024.200 -194816.260-1740935.870 -462538.960+1682940.920 + -374856.100+1750546.550 -353355.220+1710535.290 -461105.740+1681001.940 -363224.150+1744835.900 @@ -5856,6 +5899,7 @@ RILEY -432912.000+1701500.300 -391109.700+1740756.600 -444433.100+1680041.200 + -370113.020+1750233.760 -371223.500+1744346.600 -443952.380+1690125.490 -412437.800+1731057.500 @@ -9132,16 +9176,16 @@ RILEY KAPUA LIKMA - ELMAX/NOPEM/ORUBA/-411732.021+1731346.060 + ELMAX/NOPEM/ORUBA/-411731.970+1731346.150 MIBEV QUAIL - OTLIT/ISLOP/PATRU/-411805.029+1731308.119 + OTLIT/ISLOP/PATRU/-411804.961+1731308.231 ESNED - TUMGO/ISLOP/PATRU/-411805.029+1731308.119 + TUMGO/ISLOP/PATRU/-411804.961+1731308.231 EGAMU @@ -9700,8 +9744,8 @@ RILEY - - + + @@ -9837,6 +9881,8 @@ RILEY + + diff --git a/Maps/Airspace/ALL_RNAV.xml b/Maps/Airspace/ALL_RNAV.xml index 615ee63..af6bc6a 100644 --- a/Maps/Airspace/ALL_RNAV.xml +++ b/Maps/Airspace/ALL_RNAV.xml @@ -923,13 +923,13 @@ AKINA/-39.536822+176.859764/-392839.698+1765158.720 MILLA/AKINA OHITI/AKINA - ELMAX/NOPEM/ORUBA/-411805.029+1731308.119 + ELMAX/NOPEM/ORUBA/-411804.961+1731308.231 KAPUA/ELMAX LIKMA/ELMAX ORUBA/-411746.072+1731301.240 - ORUBA/-411732.021+1731346.060 + ORUBA/-411731.970+1731346.150 ORUBA/-411743.631+1731327.059 - OTLIT/ISLOP/PATRU/-411805.029+1731308.119 + OTLIT/ISLOP/PATRU/-411804.961+1731308.231 MIBEV/OTLIT QUAIL/OTLIT TUMGO/ISLOP diff --git a/Maps/Airspace/Controlled Airspace Labels.xml b/Maps/Airspace/Controlled Airspace Labels.xml new file mode 100644 index 0000000..6d16076 --- /dev/null +++ b/Maps/Airspace/Controlled Airspace Labels.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/Maps/NZAA/AA_ACU.xml b/Maps/NZAA/AA_ACU.xml index 9a90bfb..7c32879 100644 --- a/Maps/NZAA/AA_ACU.xml +++ b/Maps/NZAA/AA_ACU.xml @@ -1353,6 +1353,7 @@ -370042.200+1743618.500 -364520.500+1753003.000 -370613.500+1745649.700 + -370113.020+1750233.760 -371223.500+1744346.600 -374013.400+1751818.200 -371327.000+1750152.000 @@ -1421,6 +1422,7 @@ -370042.200+1743618.500 -364520.500+1753003.000 -370613.500+1745649.700 + -370113.020+1750233.760 -371223.500+1744346.600 -374013.400+1751818.200 -371327.000+1750152.000 diff --git a/Maps/NZAR/AR_ACU.xml b/Maps/NZAR/AR_ACU.xml index a30002d..724c52a 100644 --- a/Maps/NZAR/AR_ACU.xml +++ b/Maps/NZAR/AR_ACU.xml @@ -365,6 +365,7 @@ -370042.200+1743618.500 -364520.500+1753003.000 -370613.500+1745649.700 + -370113.020+1750233.760 -371223.500+1744346.600 -374013.400+1751818.200 -371327.000+1750152.000 @@ -440,6 +441,7 @@ -370042.200+1743618.500 -364520.500+1753003.000 -370613.500+1745649.700 + -370113.020+1750233.760 -371223.500+1744346.600 -374013.400+1751818.200 -371327.000+1750152.000 diff --git a/Maps/NZNE/NE_ACU.xml b/Maps/NZNE/NE_ACU.xml index 8f241df..8659515 100644 --- a/Maps/NZNE/NE_ACU.xml +++ b/Maps/NZNE/NE_ACU.xml @@ -107,6 +107,7 @@ -370042.200+1743618.500 -364520.500+1753003.000 -370613.500+1745649.700 + -370113.020+1750233.760 -371223.500+1744346.600 -371327.000+1750152.000 -363728.000+1744716.000 @@ -172,6 +173,7 @@ -370042.200+1743618.500 -364520.500+1753003.000 -370613.500+1745649.700 + -370113.020+1750233.760 -371223.500+1744346.600 -371327.000+1750152.000 -363728.000+1744716.000 diff --git a/Maps/NZNS/NS_ACU.xml b/Maps/NZNS/NS_ACU.xml index c488398..2a0d03a 100644 --- a/Maps/NZNS/NS_ACU.xml +++ b/Maps/NZNS/NS_ACU.xml @@ -1,9 +1,9 @@  - + - -41.292228+173.229461/NS20T/-41.255556+173.258889/RIKRU/DUMIK + -41.292214+173.229486/NS20T/-41.255556+173.258889/RIKRU/DUMIK @@ -22,7 +22,7 @@ - -41.292228+173.229461/NS02T/NS20T/GUSMI/LEMUT + -41.292214+173.229486/NS02T/NS20T/GUSMI/LEMUT @@ -82,7 +82,7 @@ SNAPA - + BISEB/SURID/QUAIL @@ -162,7 +162,7 @@ ESNED - + @@ -183,16 +183,16 @@ - ELMAX/NOPEM/ORUBA/-411805.029+1731308.119 + ELMAX/NOPEM/ORUBA/-411804.961+1731308.231 KAPUA/ELMAX LIKMA/ELMAX - OTLIT/ISLOP/PATRU/-411805.029+1731308.119 + OTLIT/ISLOP/PATRU/-411804.961+1731308.231 MIBEV/OTLIT QUAIL/OTLIT TUMGO/ISLOP ESNED/TUMGO - + - + - -41.301397+173.218922/NS20T/POTIR/ANITU/BISEB + -41.301378+173.218953/NS20T/POTIR/ANITU/BISEB @@ -221,7 +221,7 @@ - -41.301397+173.218922/NS02T/NS20T/-41.365000+173.093056/-41.396944+173.109444/PUDIG/IKITO/LUSRA + -41.301378+173.218953/NS02T/NS20T/-41.365000+173.093056/-41.396944+173.109444/PUDIG/IKITO/LUSRA @@ -302,7 +302,7 @@ SNAPA - + CONOR/NS VOR/DUGOL/IRNUX/KAPUA @@ -365,7 +365,7 @@ ELMAX - + @@ -380,11 +380,11 @@ - ELMAX/NOPEM/ORUBA/-411732.021+1731346.060 + ELMAX/NOPEM/ORUBA/-411731.970+1731346.150 KAPUA/ELMAX LIKMA/ELMAX - + - - + + diff --git a/Maps/Navaids/ATS Routes.xml b/Maps/Navaids/ATS Routes.xml index 46f8677..4eb8c8b 100644 --- a/Maps/Navaids/ATS Routes.xml +++ b/Maps/Navaids/ATS Routes.xml @@ -117,6 +117,7 @@ NV VOR.W104.QN VOR AP NDB.W115.AA VOR NV VOR.W118.CH VOR + OH VOR.W139.ENTIM HK NDB.W143.WS NDB NS VOR.W166.TM NDB WP VOR.W180.KT NDB @@ -135,8 +136,8 @@ OSTEL.KQ361.ELNEG VEBTU.KQ373.VARMA ELNOR.KQ417.REVMU - ERVIT.KQ427.PAVDO - TAYLA.KQ440.VARGU + ERVIT.KQ427.NOVTO + TAYLA.KQ440.NOMAP LEGIK.KQ461.EMSID LEKUL.KQ492.DUBIP NZUB.KQ514.NP VOR @@ -153,6 +154,7 @@ NZMX.KQ653.NZUA SELNA.KQ656.LUPMA MANGA.KQ673.UPDAL + EKENU.KQ717.PAVDO MESOS.KQ721.NP VOR KIMAN.KQ734.MANGO NZMX.KQ743.COAST @@ -365,6 +367,7 @@ TPAPA.Z172.RIWUT AKAVI.Z187.WAPOU WAPOU.Z258.NP VOR + OH VOR.Z305.IDLUR BIKOT.Z500.MERAS NUKTO.Z515.MANGA MANGA.Z630.OPABI @@ -770,6 +773,7 @@ ATHOL KELSO DABIN + ENTIM DAMIL ELDAK KALDI @@ -816,12 +820,19 @@ IDVEX LEGIK PAVDO + NURLA + TUSVI + AVGAM + IDIXI + NOVTO KAKRI ISVEK LUXET ATKUK POPUP APORO + ESKOD + NOMAP EMSID LEKUL KABGO @@ -847,7 +858,6 @@ MASDA SUNPA BUDPA - NOVTO NODIK SAMVO MAPTO @@ -865,12 +875,13 @@ TUIHU VANSA UPDAL + EKENU + RUROD OBDAD OSPIX ARROW MANGO BORVA - NOMAP NZKU WAPOU BRETT @@ -1051,7 +1062,6 @@ APIDO ATABU ATSUN - ENTIM DAGOM AKBAP GUMKO @@ -1162,6 +1172,8 @@ UPVAP RIWUT ATNUV + IDGEB + BENSE UKLAV NUKTO ERVAX @@ -1570,6 +1582,7 @@ ATHOL KELSO DABIN + ENTIM DAMIL ELDAK KALDI @@ -1616,12 +1629,19 @@ IDVEX LEGIK PAVDO + NURLA + TUSVI + AVGAM + IDIXI + NOVTO KAKRI ISVEK LUXET ATKUK POPUP APORO + ESKOD + NOMAP EMSID LEKUL KABGO @@ -1647,7 +1667,6 @@ MASDA SUNPA BUDPA - NOVTO NODIK SAMVO MAPTO @@ -1665,12 +1684,13 @@ TUIHU VANSA UPDAL + EKENU + RUROD OBDAD OSPIX ARROW MANGO BORVA - NOMAP NZKU WAPOU BRETT @@ -1851,7 +1871,6 @@ APIDO ATABU ATSUN - ENTIM DAGOM AKBAP GUMKO @@ -1962,6 +1981,8 @@ UPVAP RIWUT ATNUV + IDGEB + BENSE UKLAV NUKTO ERVAX diff --git a/RestrictedAreas.xml b/RestrictedAreas.xml index 8682e70..aca5577 100644 --- a/RestrictedAreas.xml +++ b/RestrictedAreas.xml @@ -1,1530 +1,1474 @@  - - - -343000.000+1745000.000/ - -350000.000+1745000.000/ - -350000.000+1741500.000/ - -343000.000+1741500.000/ - -343000.000+1745000.000 + + +-343000.000+1745000.000/ +-350000.000+1745000.000/ +-350000.000+1741500.000/ +-343000.000+1741500.000/ +-343000.000+1745000.000 - - - -362539.110+1740938.400/ - -362541.843+1741017.247/ - -362549.959+1741054.917/ - -362603.211+1741130.265/ - -362621.198+1741202.220/ - -362643.374+1741229.812/ - -362709.066+1741252.202/ - -362737.495+1741308.709/ - -362807.797+1741318.830/ - -362839.052+1741322.255/ - -362910.310+1741318.879/ - -362940.622+1741308.802/ - -363009.066+1741252.327/ - -363034.778+1741229.954/ - -363056.974+1741202.363/ - -363114.980+1741130.390/ - -363128.248+1741055.010/ - -363136.374+1741017.297/ - -363139.110+1740938.400/ - -363136.374+1740859.503/ - -363128.248+1740821.790/ - -363114.980+1740746.410/ - -363056.974+1740714.437/ - -363034.778+1740646.846/ - -363009.066+1740624.473/ - -362940.622+1740608.000/ - -362910.310+1740557.921/ - -362839.052+1740554.545/ - -362807.797+1740557.970/ - -362737.495+1740608.091/ - -362709.066+1740624.598/ - -362643.374+1740646.988/ - -362621.198+1740714.580/ - -362603.211+1740746.535/ - -362549.959+1740821.883/ - -362541.843+1740859.553/ - -362539.110+1740938.400 + + +-362539.110+1740938.400/ +-362541.843+1741017.247/ +-362549.959+1741054.917/ +-362603.211+1741130.265/ +-362621.198+1741202.220/ +-362643.374+1741229.812/ +-362709.066+1741252.202/ +-362737.495+1741308.709/ +-362807.797+1741318.830/ +-362839.052+1741322.255/ +-362910.310+1741318.879/ +-362940.622+1741308.802/ +-363009.066+1741252.327/ +-363034.778+1741229.954/ +-363056.974+1741202.363/ +-363114.980+1741130.390/ +-363128.248+1741055.010/ +-363136.374+1741017.297/ +-363139.110+1740938.400/ +-363136.374+1740859.503/ +-363128.248+1740821.790/ +-363114.980+1740746.410/ +-363056.974+1740714.437/ +-363034.778+1740646.846/ +-363009.066+1740624.473/ +-362940.622+1740608.000/ +-362910.310+1740557.921/ +-362839.052+1740554.545/ +-362807.797+1740557.970/ +-362737.495+1740608.091/ +-362709.066+1740624.598/ +-362643.374+1740646.988/ +-362621.198+1740714.580/ +-362603.211+1740746.535/ +-362549.959+1740821.883/ +-362541.843+1740859.553/ +-362539.110+1740938.400 - - - -362102.800+1741807.800/ - -363237.400+1742050.200/ - -363419.580+1741847.830/ - -363542.414+1741728.111/ - -363653.000+1741633.800/ - -363800.000+1740900.000/ - -363300.000+1735800.000/ - -362005.900+1740100.400/ - -361838.900+1740946.200/ - -362102.800+1741807.800 + + +-362102.800+1741807.800/ +-363237.400+1742050.200/ +-363419.580+1741847.830/ +-363542.414+1741728.111/ +-363653.000+1741633.800/ +-363800.000+1740900.000/ +-363300.000+1735800.000/ +-362005.900+1740100.400/ +-361838.900+1740946.200/ +-362102.800+1741807.800 - - - -364412.510+1743752.400/ - -364415.243+1743831.403/ - -364423.358+1743909.224/ - -364436.611+1743944.714/ - -364454.598+1744016.798/ - -364516.774+1744044.501/ - -364542.466+1744106.981/ - -364610.895+1744123.554/ - -364641.196+1744133.716/ - -364712.451+1744137.156/ - -364743.710+1744133.766/ - -364814.022+1744123.648/ - -364842.466+1744107.108/ - -364908.177+1744044.645/ - -364930.374+1744016.942/ - -364948.380+1743944.841/ - -365001.648+1743909.318/ - -365009.774+1743831.454/ - -365012.510+1743752.400/ - -365009.774+1743713.346/ - -365001.648+1743635.482/ - -364948.380+1743559.959/ - -364930.374+1743527.858/ - -364908.177+1743500.155/ - -364842.466+1743437.692/ - -364814.022+1743421.152/ - -364743.710+1743411.034/ - -364712.451+1743407.644/ - -364641.196+1743411.084/ - -364610.895+1743421.246/ - -364542.466+1743437.819/ - -364516.774+1743500.299/ - -364454.598+1743528.000/ - -364436.611+1743600.086/ - -364423.358+1743635.576/ - -364415.243+1743713.397/ - -364412.510+1743752.400 + + +-364412.510+1743752.400/ +-364415.243+1743831.403/ +-364423.358+1743909.224/ +-364436.611+1743944.714/ +-364454.598+1744016.798/ +-364516.774+1744044.501/ +-364542.466+1744106.981/ +-364610.895+1744123.554/ +-364641.196+1744133.716/ +-364712.451+1744137.156/ +-364743.710+1744133.766/ +-364814.022+1744123.648/ +-364842.466+1744107.108/ +-364908.177+1744044.645/ +-364930.374+1744016.942/ +-364948.380+1743944.841/ +-365001.648+1743909.318/ +-365009.774+1743831.454/ +-365012.510+1743752.400/ +-365009.774+1743713.346/ +-365001.648+1743635.482/ +-364948.380+1743559.959/ +-364930.374+1743527.858/ +-364908.177+1743500.155/ +-364842.466+1743437.692/ +-364814.022+1743421.152/ +-364743.710+1743411.034/ +-364712.451+1743407.644/ +-364641.196+1743411.084/ +-364610.895+1743421.246/ +-364542.466+1743437.819/ +-364516.774+1743500.299/ +-364454.598+1743528.000/ +-364436.611+1743600.086/ +-364423.358+1743635.576/ +-364415.243+1743713.397/ +-364412.510+1743752.400 - - - -370251.400+1750056.500/ - -370324.000+1750055.200/ - -370331.000+1750031.900/ - -370347.900+1750046.900/ - -370439.300+1750040.800/ - -370436.700+1745952.800/ - -370435.300+1745936.400/ - -370316.700+1745918.500/ - -370253.200+1745936.800/ - -370241.300+1750014.200/ - -370251.400+1750056.500 + + +-370251.400+1750056.500/ +-370324.000+1750055.200/ +-370331.000+1750031.900/ +-370347.900+1750046.900/ +-370439.300+1750040.800/ +-370436.700+1745952.800/ +-370435.300+1745936.400/ +-370316.700+1745918.500/ +-370253.200+1745936.800/ +-370241.300+1750014.200/ +-370251.400+1750056.500 - + - -355000.000+1762500.000/ - -362000.000+1762500.000/ - -362000.000+1755000.000/ - -355000.000+1755000.000/ - -355000.000+1762500.000 +-355000.000+1762500.000/ +-362000.000+1762500.000/ +-362000.000+1755000.000/ +-355000.000+1755000.000/ +-355000.000+1762500.000 - + - -352000.000+1771730.000/ - -362000.000+1771730.000/ - -362000.000+1762500.000/ - -355000.000+1762500.000/ - -355000.000+1755000.000/ - -352000.000+1762500.000/ - -352000.000+1771730.000 +-352000.000+1771730.000/ +-362000.000+1771730.000/ +-362000.000+1762500.000/ +-355000.000+1762500.000/ +-355000.000+1755000.000/ +-352000.000+1762500.000/ +-352000.000+1771730.000 - + - -352000.000+1781000.000/ - -362000.000+1781000.000/ - -362000.000+1771730.000/ - -352000.000+1771730.000/ - -352000.000+1781000.000 +-352000.000+1781000.000/ +-362000.000+1781000.000/ +-362000.000+1771730.000/ +-352000.000+1771730.000/ +-352000.000+1781000.000 - + - -362000.000+1771730.000/ - -372000.000+1771730.000/ - -372020.000+1762500.000/ - -362000.000+1762500.000/ - -362000.000+1771730.000 +-362000.000+1771730.000/ +-372000.000+1771730.000/ +-372020.000+1762500.000/ +-362000.000+1762500.000/ +-362000.000+1771730.000 - + - -362000.000+1781000.000/ - -372000.000+1781000.000/ - -372000.000+1771730.000/ - -362000.000+1771730.000/ - -362000.000+1781000.000 +-362000.000+1781000.000/ +-372000.000+1781000.000/ +-372000.000+1771730.000/ +-362000.000+1771730.000/ +-362000.000+1781000.000 - - - -391743.700+1754353.700/ - -391838.700+1754305.700/ - -392313.700+1754140.700/ - -392313.700+1754115.700/ - -392153.700+1754050.700/ - -392153.700+1753955.700/ - -391953.700+1753840.700/ - -391858.700+1753715.700/ - -391733.700+1753850.700/ - -391748.700+1754015.700/ - -391719.700+1754216.700/ - -391743.700+1754353.700 + + +-391743.700+1754353.700/ +-391838.700+1754305.700/ +-392313.700+1754140.700/ +-392313.700+1754115.700/ +-392153.700+1754050.700/ +-392153.700+1753955.700/ +-391953.700+1753840.700/ +-391858.700+1753715.700/ +-391733.700+1753850.700/ +-391748.700+1754015.700/ +-391719.700+1754216.700/ +-391743.700+1754353.700 - - - -391532.700+1755619.700/ - -391610.700+1755852.700/ - -391710.700+1760015.700/ - -391710.700+1755830.700/ - -392113.700+1755830.700/ - -392115.700+1760155.700/ - -392448.700+1760029.700/ - -393003.700+1755403.700/ - -393113.700+1755200.700/ - -393016.700+1755000.700/ - -393117.700+1754204.700/ - -393039.700+1754151.400/ - -393003.700+1754119.600/ - -392934.900+1754110.700/ - -392833.700+1754105.700/ - -392803.700+1754115.700/ - -392753.700+1754110.700/ - -392503.700+1754155.700/ - -392328.700+1754315.700/ - -392253.700+1754320.700/ - -391913.700+1754430.700/ - -391833.700+1754512.700/ - -391715.700+1754506.700/ - -391736.700+1755147.700/ - -391651.700+1755535.700/ - -391532.700+1755619.700 + + +-391532.700+1755619.700/ +-391610.700+1755852.700/ +-391710.700+1760015.700/ +-391710.700+1755830.700/ +-392113.700+1755830.700/ +-392115.700+1760155.700/ +-392448.700+1760029.700/ +-393003.700+1755403.700/ +-393113.700+1755200.700/ +-393016.700+1755000.700/ +-393117.700+1754204.700/ +-393039.700+1754151.400/ +-393003.700+1754119.600/ +-392934.900+1754110.700/ +-392833.700+1754105.700/ +-392803.700+1754115.700/ +-392753.700+1754110.700/ +-392503.700+1754155.700/ +-392328.700+1754315.700/ +-392253.700+1754320.700/ +-391913.700+1754430.700/ +-391833.700+1754512.700/ +-391715.700+1754506.700/ +-391736.700+1755147.700/ +-391651.700+1755535.700/ +-391532.700+1755619.700 - - - -400547.700+1750146.200/ - -400752.829+1750046.617/ - -400924.724+1750019.422/ - -401058.081+1750002.793/ - -401232.190+1745956.869/ - -401406.335+1750001.706/ - -401539.799+1750017.281/ - -401711.871+1750043.488/ - -401841.846+1750120.137/ - -401934.800+1750151.200/ - -403539.600+1741100.900/ - -402741.412+1740720.534/ - -402233.862+1740557.089/ - -401721.937+1740509.310/ - -401208.025+1740457.424/ - -400654.515+1740521.383/ - -400143.788+1740620.870/ - -395638.193+1740755.300/ - -395140.031+1741003.835/ - -394942.400+1741118.300/ - -400547.700+1750146.200 - + + +-400547.700+1750146.200/ +-400752.829+1750046.617/ +-400924.724+1750019.422/ +-401058.081+1750002.793/ +-401232.190+1745956.869/ +-401406.335+1750001.706/ +-401539.799+1750017.281/ +-401711.871+1750043.488/ +-401841.846+1750120.137/ +-401934.800+1750151.200/ +-403539.600+1741100.900/ +-402741.412+1740720.534/ +-402233.862+1740557.089/ +-401721.937+1740509.310/ +-401208.025+1740457.424/ +-400654.515+1740521.383/ +-400143.788+1740620.870/ +-395638.193+1740755.300/ +-395140.031+1741003.835/ +-394942.400+1741118.300/ +-400547.700+1750146.200 + + + - - - -391743.700+1754353.700/ - -391838.700+1754305.700/ - -392313.700+1754140.700/ - -392313.700+1754115.700/ - -392153.700+1754050.700/ - -392153.700+1753955.700/ - -391953.700+1753840.700/ - -391858.700+1753715.700/ - -391733.700+1753850.700/ - -391748.700+1754015.700/ - -391719.700+1754216.700/ - -391743.700+1754353.700 + + +-391743.700+1754353.700/ +-391838.700+1754305.700/ +-392313.700+1754140.700/ +-392313.700+1754115.700/ +-392153.700+1754050.700/ +-392153.700+1753955.700/ +-391953.700+1753840.700/ +-391858.700+1753715.700/ +-391733.700+1753850.700/ +-391748.700+1754015.700/ +-391719.700+1754216.700/ +-391743.700+1754353.700 - - - -391532.700+1755619.700/ - -391610.700+1755852.700/ - -391710.700+1760015.700/ - -391710.700+1755830.700/ - -392113.700+1755830.700/ - -392115.700+1760155.700/ - -392448.700+1760029.700/ - -393003.700+1755403.700/ - -393113.700+1755200.700/ - -393016.700+1755000.700/ - -393117.700+1754204.700/ - -393039.700+1754151.400/ - -393003.700+1754119.600/ - -392934.900+1754110.700/ - -392833.700+1754105.700/ - -392803.700+1754115.700/ - -392753.700+1754110.700/ - -392503.700+1754155.700/ - -392328.700+1754315.700/ - -392253.700+1754320.700/ - -391913.700+1754430.700/ - -391833.700+1754512.700/ - -391715.700+1754506.700/ - -391736.700+1755147.700/ - -391651.700+1755535.700/ - -391532.700+1755619.700 + + +-391532.700+1755619.700/ +-391610.700+1755852.700/ +-391710.700+1760015.700/ +-391710.700+1755830.700/ +-392113.700+1755830.700/ +-392115.700+1760155.700/ +-392448.700+1760029.700/ +-393003.700+1755403.700/ +-393113.700+1755200.700/ +-393016.700+1755000.700/ +-393117.700+1754204.700/ +-393039.700+1754151.400/ +-393003.700+1754119.600/ +-392934.900+1754110.700/ +-392833.700+1754105.700/ +-392803.700+1754115.700/ +-392753.700+1754110.700/ +-392503.700+1754155.700/ +-392328.700+1754315.700/ +-392253.700+1754320.700/ +-391913.700+1754430.700/ +-391833.700+1754512.700/ +-391715.700+1754506.700/ +-391736.700+1755147.700/ +-391651.700+1755535.700/ +-391532.700+1755619.700 - - - -391858.700+1753715.700/ - -391953.700+1753840.700/ - -392153.700+1753955.700/ - -392153.700+1754050.700/ - -392313.700+1754115.700/ - -392348.700+1754116.600/ - -392614.200+1753859.100/ - -392709.000+1753951.600/ - -392756.500+1753932.200/ - -392802.500+1753522.300/ - -392653.800+1753054.700/ - -391858.700+1753715.700 + + +-391858.700+1753715.700/ +-391953.700+1753840.700/ +-392153.700+1753955.700/ +-392153.700+1754050.700/ +-392313.700+1754115.700/ +-392348.700+1754116.600/ +-392614.200+1753859.100/ +-392709.000+1753951.600/ +-392756.500+1753932.200/ +-392802.500+1753522.300/ +-392653.800+1753054.700/ +-391858.700+1753715.700 - - - -400816.030+1751329.400/ - -400819.673+1751423.915/ - -400830.490+1751516.777/ - -400848.154+1751606.387/ - -400912.131+1751651.238/ - -400941.692+1751729.970/ - -401015.942+1751801.407/ - -401053.841+1751824.590/ - -401134.240+1751838.814/ - -401215.912+1751843.641/ - -401257.591+1751838.919/ - -401338.011+1751824.789/ - -401415.941+1751801.674/ - -401450.230+1751730.275/ - -401519.832+1751651.542/ - -401543.847+1751606.654/ - -401601.542+1751516.976/ - -401612.380+1751424.020/ - -401616.030+1751329.400/ - -401612.380+1751234.780/ - -401601.542+1751141.824/ - -401543.847+1751052.146/ - -401519.832+1751007.258/ - -401450.230+1750928.525/ - -401415.941+1750857.126/ - -401338.011+1750834.011/ - -401257.591+1750819.881/ - -401215.912+1750815.159/ - -401134.240+1750819.986/ - -401053.841+1750834.210/ - -401015.942+1750857.393/ - -400941.692+1750928.830/ - -400912.131+1751007.562/ - -400848.154+1751052.413/ - -400830.490+1751142.023/ - -400819.673+1751234.885/ - -400816.030+1751329.400 - + + +-400816.030+1751329.400/ +-400819.673+1751423.915/ +-400830.490+1751516.777/ +-400848.154+1751606.387/ +-400912.131+1751651.238/ +-400941.692+1751729.970/ +-401015.942+1751801.407/ +-401053.841+1751824.590/ +-401134.240+1751838.814/ +-401215.912+1751843.641/ +-401257.591+1751838.919/ +-401338.011+1751824.789/ +-401415.941+1751801.674/ +-401450.230+1751730.275/ +-401519.832+1751651.542/ +-401543.847+1751606.654/ +-401601.542+1751516.976/ +-401612.380+1751424.020/ +-401616.030+1751329.400/ +-401612.380+1751234.780/ +-401601.542+1751141.824/ +-401543.847+1751052.146/ +-401519.832+1751007.258/ +-401450.230+1750928.525/ +-401415.941+1750857.126/ +-401338.011+1750834.011/ +-401257.591+1750819.881/ +-401215.912+1750815.159/ +-401134.240+1750819.986/ +-401053.841+1750834.210/ +-401015.942+1750857.393/ +-400941.692+1750928.830/ +-400912.131+1751007.562/ +-400848.154+1751052.413/ +-400830.490+1751142.023/ +-400819.673+1751234.885/ +-400816.030+1751329.400 + + + - - - -401301.900+1753230.500/ - -401508.500+1753158.800/ - -401651.700+1752752.600/ - -401931.000+1752242.000/ - -402327.200+1752128.200/ - -402328.300+1751854.300/ - -402223.800+1751340.600/ - -400355.100+1750732.400/ - -400158.600+1750939.300/ - -400222.300+1751032.700/ - -400249.000+1751251.500/ - -400329.000+1751840.200/ - -400505.400+1752229.600/ - -400515.300+1752329.500/ - -401045.800+1753029.500/ - -401301.900+1753230.500 + + +-401301.900+1753230.500/ +-401508.500+1753158.800/ +-401651.700+1752752.600/ +-401931.000+1752242.000/ +-402327.200+1752128.200/ +-402328.300+1751854.300/ +-402223.800+1751340.600/ +-400355.100+1750732.400/ +-400158.600+1750939.300/ +-400222.300+1751032.700/ +-400249.000+1751251.500/ +-400329.000+1751840.200/ +-400505.400+1752229.600/ +-400515.300+1752329.500/ +-401045.800+1753029.500/ +-401301.900+1753230.500 - - - -402331.800+1753522.700/ - -402340.200+1753536.000/ - -402408.000+1753527.100/ - -402435.800+1753548.600/ - -402455.800+1753519.600/ - -402345.800+1753351.100/ - -402334.400+1753411.200/ - -402331.800+1753522.700 + + +-402331.800+1753522.700/ +-402340.200+1753536.000/ +-402408.000+1753527.100/ +-402435.800+1753548.600/ +-402455.800+1753519.600/ +-402345.800+1753351.100/ +-402334.400+1753411.200/ +-402331.800+1753522.700 - - - -400834.630+1752331.100/ - -400838.273+1752425.619/ - -400849.090+1752518.486/ - -400906.754+1752608.099/ - -400930.731+1752652.953/ - -401000.292+1752731.689/ - -401034.542+1752803.127/ - -401112.441+1752826.313/ - -401152.840+1752840.537/ - -401234.512+1752845.365/ - -401316.191+1752840.643/ - -401356.611+1752826.511/ - -401434.541+1752803.395/ - -401508.830+1752731.993/ - -401538.432+1752653.258/ - -401602.447+1752608.366/ - -401620.142+1752518.684/ - -401630.980+1752425.724/ - -401634.630+1752331.100/ - -401630.980+1752236.476/ - -401620.142+1752143.516/ - -401602.447+1752053.834/ - -401538.432+1752008.942/ - -401508.830+1751930.207/ - -401434.541+1751858.805/ - -401356.611+1751835.689/ - -401316.191+1751821.557/ - -401234.512+1751816.835/ - -401152.840+1751821.663/ - -401112.441+1751835.887/ - -401034.542+1751859.073/ - -401000.292+1751930.511/ - -400930.731+1752009.247/ - -400906.754+1752054.101/ - -400849.090+1752143.714/ - -400838.273+1752236.581/ - -400834.630+1752331.100 - + + +-400834.630+1752331.100/ +-400838.273+1752425.619/ +-400849.090+1752518.486/ +-400906.754+1752608.099/ +-400930.731+1752652.953/ +-401000.292+1752731.689/ +-401034.542+1752803.127/ +-401112.441+1752826.313/ +-401152.840+1752840.537/ +-401234.512+1752845.365/ +-401316.191+1752840.643/ +-401356.611+1752826.511/ +-401434.541+1752803.395/ +-401508.830+1752731.993/ +-401538.432+1752653.258/ +-401602.447+1752608.366/ +-401620.142+1752518.684/ +-401630.980+1752425.724/ +-401634.630+1752331.100/ +-401630.980+1752236.476/ +-401620.142+1752143.516/ +-401602.447+1752053.834/ +-401538.432+1752008.942/ +-401508.830+1751930.207/ +-401434.541+1751858.805/ +-401356.611+1751835.689/ +-401316.191+1751821.557/ +-401234.512+1751816.835/ +-401152.840+1751821.663/ +-401112.441+1751835.887/ +-401034.542+1751859.073/ +-401000.292+1751930.511/ +-400930.731+1752009.247/ +-400906.754+1752054.101/ +-400849.090+1752143.714/ +-400838.273+1752236.581/ +-400834.630+1752331.100 + + + - - - -400131.200+1752200.300/ - -400505.400+1752229.600/ - -400835.700+1752258.300/ - -400842.750+1752209.790/ - -400849.040+1752143.664/ - -400857.045+1752118.354/ - -400906.704+1752054.051/ - -400917.945+1752030.940/ - -400930.681+1752009.197/ - -400944.815+1751948.986/ - -401000.242+1751930.462/ - -401016.843+1751913.765/ - -401034.492+1751859.023/ - -401053.055+1751846.348/ - -401112.391+1751835.837/ - -401132.353+1751827.571/ - -401152.790+1751821.613/ - -401213.545+1751818.008/ - -401234.462+1751816.786/ - -401255.380+1751817.955/ - -401316.141+1751821.507/ - -401336.586+1751827.417/ - -401356.561+1751835.639/ - -401415.911+1751846.111/ - -401434.491+1751858.755/ - -401452.159+1751913.474/ - -401508.780+1751930.157/ - -401524.227+1751948.677/ - -401527.300+1751953.300/ - -402321.600+1750952.800/ - -402212.111+1750826.127/ - -402109.682+1750723.640/ - -402003.332+1750628.562/ - -401853.570+1750541.309/ - -401740.930+1750502.235/ - -401625.966+1750431.631/ - -401509.252+1750409.723/ - -401351.372+1750356.670/ - -401232.920+1750352.563/ - -401114.493+1750357.425/ - -400956.688+1750411.210/ - -400840.096+1750433.804/ - -400725.299+1750505.029/ - -400612.863+1750544.639/ - -400503.338+1750632.327/ - -400357.251+1750727.725/ - -400255.100+1750830.408/ - -400157.357+1750939.897/ - -400104.457+1751055.663/ - -400016.799+1751217.129/ - -395934.744+1751343.678/ - -395858.608+1751514.655/ - -395836.400+1751621.800/ - -400131.200+1752200.300 - + + +-400131.200+1752200.300/ +-400505.400+1752229.600/ +-400835.700+1752258.300/ +-400842.750+1752209.790/ +-400849.040+1752143.664/ +-400857.045+1752118.354/ +-400906.704+1752054.051/ +-400917.945+1752030.940/ +-400930.681+1752009.197/ +-400944.815+1751948.986/ +-401000.242+1751930.462/ +-401016.843+1751913.765/ +-401034.492+1751859.023/ +-401053.055+1751846.348/ +-401112.391+1751835.837/ +-401132.353+1751827.571/ +-401152.790+1751821.613/ +-401213.545+1751818.008/ +-401234.462+1751816.786/ +-401255.380+1751817.955/ +-401316.141+1751821.507/ +-401336.586+1751827.417/ +-401356.561+1751835.639/ +-401415.911+1751846.111/ +-401434.491+1751858.755/ +-401452.159+1751913.474/ +-401508.780+1751930.157/ +-401524.227+1751948.677/ +-401527.300+1751953.300/ +-402321.600+1750952.800/ +-402212.111+1750826.127/ +-402109.682+1750723.640/ +-402003.332+1750628.562/ +-401853.570+1750541.309/ +-401740.930+1750502.235/ +-401625.966+1750431.631/ +-401509.252+1750409.723/ +-401351.372+1750356.670/ +-401232.920+1750352.563/ +-401114.493+1750357.425/ +-400956.688+1750411.210/ +-400840.096+1750433.804/ +-400725.299+1750505.029/ +-400612.863+1750544.639/ +-400503.338+1750632.327/ +-400357.251+1750727.725/ +-400255.100+1750830.408/ +-400157.357+1750939.897/ +-400104.457+1751055.663/ +-400016.799+1751217.129/ +-395934.744+1751343.678/ +-395858.608+1751514.655/ +-395836.400+1751621.800/ +-400131.200+1752200.300 + + + - + - -402546.900+1780211.000/ - -410203.900+1771850.100/ - -404244.500+1765027.500/ - -400617.700+1773351.500/ - -402546.900+1780211.000 +-402546.900+1780211.000/ +-410203.900+1771850.100/ +-404244.500+1765027.500/ +-400617.700+1773351.500/ +-402546.900+1780211.000 - - - -395736.600+1772545.100/ - -401128.015+1772753.476/ - -401945.111+1772740.261/ - -402759.430+1772630.117/ - -403607.187+1772423.234/ - -404404.619+1772120.247/ - -405148.024+1771722.243/ - -405913.785+1771230.761/ - -410618.404+1770647.792/ - -411258.527+1770015.772/ - -411910.979+1765257.564/ - -412452.788+1764456.450/ - -412634.800+1764212.200/ - -411732.700+1755210.400/ - -411258.700+1752740.900/ - -405823.800+1753800.600/ - -404141.800+1755118.600/ - -403731.600+1755540.700/ - -403459.088+1755849.248/ - -403232.983+1760114.729/ - -402957.759+1760322.727/ - -402714.616+1760512.291/ - -402424.808+1760642.613/ - -402129.641+1760753.041/ - -401830.458+1760843.080/ - -401627.200+1760856.600/ - -400545.300+1762131.700/ - -395736.600+1772545.100 + + +-395736.600+1772545.100/ +-401128.015+1772753.476/ +-401945.111+1772740.261/ +-402759.430+1772630.117/ +-403607.187+1772423.234/ +-404404.619+1772120.247/ +-405148.024+1771722.243/ +-405913.785+1771230.761/ +-410618.404+1770647.792/ +-411258.527+1770015.772/ +-411910.979+1765257.564/ +-412452.788+1764456.450/ +-412634.800+1764212.200/ +-411732.700+1755210.400/ +-411258.700+1752740.900/ +-405823.800+1753800.600/ +-404141.800+1755118.600/ +-403731.600+1755540.700/ +-403459.088+1755849.248/ +-403232.983+1760114.729/ +-402957.759+1760322.727/ +-402714.616+1760512.291/ +-402424.808+1760642.613/ +-402129.641+1760753.041/ +-401830.458+1760843.080/ +-401627.200+1760856.600/ +-400545.300+1762131.700/ +-395736.600+1772545.100 - - - -432851.600+1715212.400/ - -432852.338+1715224.031/ - -432854.530+1715235.308/ - -432858.110+1715245.890/ - -432902.968+1715255.455/ - -432908.957+1715303.713/ - -432915.896+1715310.412/ - -432923.573+1715315.349/ - -432931.755+1715318.373/ - -432940.195+1715319.394/ - -432948.634+1715318.379/ - -432956.817+1715315.358/ - -433004.496+1715310.425/ - -433011.436+1715303.728/ - -433017.428+1715255.470/ - -433022.287+1715245.903/ - -433025.868+1715235.318/ - -433028.061+1715224.036/ - -433028.800+1715212.400/ - -433028.061+1715200.764/ - -433025.868+1715149.482/ - -433022.287+1715138.897/ - -433017.428+1715129.330/ - -433011.436+1715121.072/ - -433004.496+1715114.375/ - -432956.817+1715109.442/ - -432948.634+1715106.421/ - -432940.195+1715105.406/ - -432931.755+1715106.427/ - -432923.573+1715109.451/ - -432915.896+1715114.388/ - -432908.957+1715121.087/ - -432902.968+1715129.345/ - -432858.110+1715138.910/ - -432854.530+1715149.492/ - -432852.338+1715200.769/ - -432851.600+1715212.400 + + +-432851.600+1715212.400/ +-432852.338+1715224.031/ +-432854.530+1715235.308/ +-432858.110+1715245.890/ +-432902.968+1715255.455/ +-432908.957+1715303.713/ +-432915.896+1715310.412/ +-432923.573+1715315.349/ +-432931.755+1715318.373/ +-432940.195+1715319.394/ +-432948.634+1715318.379/ +-432956.817+1715315.358/ +-433004.496+1715310.425/ +-433011.436+1715303.728/ +-433017.428+1715255.470/ +-433022.287+1715245.903/ +-433025.868+1715235.318/ +-433028.061+1715224.036/ +-433028.800+1715212.400/ +-433028.061+1715200.764/ +-433025.868+1715149.482/ +-433022.287+1715138.897/ +-433017.428+1715129.330/ +-433011.436+1715121.072/ +-433004.496+1715114.375/ +-432956.817+1715109.442/ +-432948.634+1715106.421/ +-432940.195+1715105.406/ +-432931.755+1715106.427/ +-432923.573+1715109.451/ +-432915.896+1715114.388/ +-432908.957+1715121.087/ +-432902.968+1715129.345/ +-432858.110+1715138.910/ +-432854.530+1715149.492/ +-432852.338+1715200.769/ +-432851.600+1715212.400 - + - -433551.000+1722018.400/ - -433618.000+1722032.400/ - -433717.000+1721748.400/ - -433654.000+1721733.400/ - -433648.000+1721747.400/ - -433627.000+1721732.400/ - -433551.000+1722018.400 +-433551.000+1722018.400/ +-433618.000+1722032.400/ +-433717.000+1721748.400/ +-433654.000+1721733.400/ +-433648.000+1721747.400/ +-433627.000+1721732.400/ +-433551.000+1722018.400 - - - -364905.800+1744150.000/ - -364906.046+1744153.514/ - -364906.777+1744156.921/ - -364907.970+1744200.118/ - -364909.590+1744203.008/ - -364911.587+1744205.502/ - -364913.900+1744207.526/ - -364916.459+1744209.017/ - -364919.186+1744209.930/ - -364922.000+1744210.238/ - -364924.813+1744209.930/ - -364927.540+1744209.017/ - -364930.100+1744207.527/ - -364932.413+1744205.503/ - -364934.410+1744203.009/ - -364936.029+1744200.119/ - -364937.223+1744156.922/ - -364937.954+1744153.514/ - -364938.200+1744150.000/ - -364937.954+1744146.486/ - -364937.223+1744143.078/ - -364936.029+1744139.881/ - -364934.410+1744136.991/ - -364932.413+1744134.497/ - -364930.100+1744132.473/ - -364927.540+1744130.983/ - -364924.813+1744130.070/ - -364922.000+1744129.762/ - -364919.186+1744130.070/ - -364916.459+1744130.983/ - -364913.900+1744132.474/ - -364911.587+1744134.498/ - -364909.590+1744136.992/ - -364907.970+1744139.882/ - -364906.777+1744143.079/ - -364906.046+1744146.486/ - -364905.800+1744150.000 + + +-364905.800+1744150.000/ +-364906.046+1744153.514/ +-364906.777+1744156.921/ +-364907.970+1744200.118/ +-364909.590+1744203.008/ +-364911.587+1744205.502/ +-364913.900+1744207.526/ +-364916.459+1744209.017/ +-364919.186+1744209.930/ +-364922.000+1744210.238/ +-364924.813+1744209.930/ +-364927.540+1744209.017/ +-364930.100+1744207.527/ +-364932.413+1744205.503/ +-364934.410+1744203.009/ +-364936.029+1744200.119/ +-364937.223+1744156.922/ +-364937.954+1744153.514/ +-364938.200+1744150.000/ +-364937.954+1744146.486/ +-364937.223+1744143.078/ +-364936.029+1744139.881/ +-364934.410+1744136.991/ +-364932.413+1744134.497/ +-364930.100+1744132.473/ +-364927.540+1744130.983/ +-364924.813+1744130.070/ +-364922.000+1744129.762/ +-364919.186+1744130.070/ +-364916.459+1744130.983/ +-364913.900+1744132.474/ +-364911.587+1744134.498/ +-364909.590+1744136.992/ +-364907.970+1744139.882/ +-364906.777+1744143.079/ +-364906.046+1744146.486/ +-364905.800+1744150.000 - - - -363131.800+1745456.900/ - -363530.000+1745456.900/ - -363530.000+1745240.400/ - -363636.300+1745240.400/ - -363617.500+1745020.000/ - -363542.000+1744900.000/ - -363131.800+1744900.000/ - -363131.800+1745456.900 + + +-363131.800+1745456.900/ +-363530.000+1745456.900/ +-363530.000+1745240.400/ +-363636.300+1745240.400/ +-363617.500+1745020.000/ +-363542.000+1744900.000/ +-363131.800+1744900.000/ +-363131.800+1745456.900 - + - -363350.200+1745240.400/ - -363636.300+1745240.400/ - -363617.500+1745020.000/ - -363542.000+1744900.000/ - -363350.200+1744900.000/ - -363350.200+1745240.400 +-363350.200+1745240.400/ +-363636.300+1745240.400/ +-363617.500+1745020.000/ +-363542.000+1744900.000/ +-363350.200+1744900.000/ +-363350.200+1745240.400 - - - -370447.200+1745831.800/ - -370448.111+1745844.860/ - -370450.818+1745857.523/ - -370455.237+1745909.405/ - -370501.235+1745920.145/ - -370508.629+1745929.417/ - -370517.195+1745936.938/ - -370526.673+1745942.482/ - -370536.775+1745945.878/ - -370547.193+1745947.024/ - -370557.612+1745945.884/ - -370607.715+1745942.492/ - -370617.195+1745936.953/ - -370625.763+1745929.433/ - -370633.160+1745920.161/ - -370639.160+1745909.419/ - -370643.581+1745857.533/ - -370646.288+1745844.865/ - -370647.200+1745831.800/ - -370646.288+1745818.735/ - -370643.581+1745806.067/ - -370639.160+1745754.181/ - -370633.160+1745743.439/ - -370625.763+1745734.167/ - -370617.195+1745726.647/ - -370607.715+1745721.108/ - -370557.612+1745717.716/ - -370547.193+1745716.576/ - -370536.775+1745717.722/ - -370526.673+1745721.118/ - -370517.195+1745726.662/ - -370508.629+1745734.183/ - -370501.235+1745743.455/ - -370455.237+1745754.195/ - -370450.818+1745806.077/ - -370448.111+1745818.740/ - -370447.200+1745831.800 + + +-370447.200+1745831.800/ +-370448.111+1745844.860/ +-370450.818+1745857.523/ +-370455.237+1745909.405/ +-370501.235+1745920.145/ +-370508.629+1745929.417/ +-370517.195+1745936.938/ +-370526.673+1745942.482/ +-370536.775+1745945.878/ +-370547.193+1745947.024/ +-370557.612+1745945.884/ +-370607.715+1745942.492/ +-370617.195+1745936.953/ +-370625.763+1745929.433/ +-370633.160+1745920.161/ +-370639.160+1745909.419/ +-370643.581+1745857.533/ +-370646.288+1745844.865/ +-370647.200+1745831.800/ +-370646.288+1745818.735/ +-370643.581+1745806.067/ +-370639.160+1745754.181/ +-370633.160+1745743.439/ +-370625.763+1745734.167/ +-370617.195+1745726.647/ +-370607.715+1745721.108/ +-370557.612+1745717.716/ +-370547.193+1745716.576/ +-370536.775+1745717.722/ +-370526.673+1745721.118/ +-370517.195+1745726.662/ +-370508.629+1745734.183/ +-370501.235+1745743.455/ +-370455.237+1745754.195/ +-370450.818+1745806.077/ +-370448.111+1745818.740/ +-370447.200+1745831.800 - + - -393243.700+1743406.600/ - -393703.700+1743132.600/ - -393541.700+1742634.600/ - -393458.700+1742659.600/ - -393157.700+1742808.600/ - -393144.700+1743003.600/ - -393243.700+1743406.600 +-393243.700+1743406.600/ +-393703.700+1743132.600/ +-393541.700+1742634.600/ +-393458.700+1742659.600/ +-393157.700+1742808.600/ +-393144.700+1743003.600/ +-393243.700+1743406.600 - - - -402644.700+1754848.800/ - -402928.000+1754552.000/ - -402910.200+1754341.700/ - -402800.300+1754059.200/ - -402640.800+1754130.500/ - -402610.100+1754221.100/ - -402544.400+1754717.600/ - -402644.700+1754848.800 + + +-402644.700+1754848.800/ +-402928.000+1754552.000/ +-402910.200+1754341.700/ +-402800.300+1754059.200/ +-402640.800+1754130.500/ +-402610.100+1754221.100/ +-402544.400+1754717.600/ +-402644.700+1754848.800 - - - -410836.500+1750244.790/ - -410902.810+1750310.110/ - -410950.560+1750224.460/ - -410933.760+1750217.220/ - -410919.440+1750220.270/ - -410851.490+1750212.360/ - -410847.790+1750210.020/ - -410846.070+1750212.440/ - -410847.240+1750220.020/ - -410836.500+1750244.790 + + +-410836.500+1750244.790/ +-410902.810+1750310.110/ +-410950.560+1750224.460/ +-410933.760+1750217.220/ +-410919.440+1750220.270/ +-410851.490+1750212.360/ +-410847.790+1750210.020/ +-410846.070+1750212.440/ +-410847.240+1750220.020/ +-410836.500+1750244.790 - + - -414020.200+1725234.300/ - -414707.100+1725337.700/ - -414625.900+1724636.300/ - -414401.500+1724242.600/ - -414106.400+1724603.300/ - -414028.900+1724736.600/ - -414020.200+1725234.300 +-414020.200+1725234.300/ +-414707.100+1725337.700/ +-414625.900+1724636.300/ +-414401.500+1724242.600/ +-414106.400+1724603.300/ +-414028.900+1724736.600/ +-414020.200+1725234.300 - + - -422344.100+1714926.300/ - -422620.200+1714732.800/ - -422350.500+1714122.800/ - -422117.100+1714319.800/ - -422344.100+1714926.300 +-422344.100+1714926.300/ +-422620.200+1714732.800/ +-422350.500+1714122.800/ +-422117.100+1714319.800/ +-422344.100+1714926.300 - + - -421803.300+1714025.600/ - -422051.000+1714052.200/ - -422216.100+1713827.300/ - -422132.600+1713518.600/ - -421851.300+1713524.000/ - -421803.300+1714025.600 +-421803.300+1714025.600/ +-422051.000+1714052.200/ +-422216.100+1713827.300/ +-422132.600+1713518.600/ +-421851.300+1713524.000/ +-421803.300+1714025.600 - + - -414442.700+1715914.400/ - -415004.400+1715810.800/ - -414916.800+1715224.800/ - -414714.800+1715154.900/ - -414510.500+1715534.400/ - -414442.700+1715914.400 +-414442.700+1715914.400/ +-415004.400+1715810.800/ +-414916.800+1715224.800/ +-414714.800+1715154.900/ +-414510.500+1715534.400/ +-414442.700+1715914.400 - - - -421212.900+1713322.800/ - -421318.000+1713316.700/ - -421903.200+1713219.900/ - -422045.600+1712606.700/ - -421716.800+1712410.000/ - -421423.700+1712618.200/ - -421147.800+1712750.400/ - -421212.900+1713322.800 + + +-421212.900+1713322.800/ +-421318.000+1713316.700/ +-421903.200+1713219.900/ +-422045.600+1712606.700/ +-421716.800+1712410.000/ +-421423.700+1712618.200/ +-421147.800+1712750.400/ +-421212.900+1713322.800 - - - -453014.410+1681754.000/ - -453016.378+1681826.111/ - -453022.221+1681857.247/ - -453031.763+1681926.466/ - -453044.714+1681952.879/ - -453100.680+1682015.686/ - -453119.179+1682034.193/ - -453139.648+1682047.837/ - -453201.465+1682056.203/ - -453223.969+1682059.034/ - -453246.475+1682056.243/ - -453308.299+1682047.913/ - -453328.779+1682034.296/ - -453347.291+1682015.803/ - -453403.272+1681952.996/ - -453416.237+1681926.568/ - -453425.789+1681857.324/ - -453431.640+1681826.151/ - -453433.610+1681754.000/ - -453431.640+1681721.849/ - -453425.789+1681650.676/ - -453416.237+1681621.432/ - -453403.272+1681555.004/ - -453347.291+1681532.197/ - -453328.779+1681513.704/ - -453308.299+1681500.087/ - -453246.475+1681451.757/ - -453223.969+1681448.966/ - -453201.465+1681451.797/ - -453139.648+1681500.163/ - -453119.179+1681513.807/ - -453100.680+1681532.314/ - -453044.714+1681555.121/ - -453031.763+1681621.534/ - -453022.221+1681650.753/ - -453016.378+1681721.889/ - -453014.410+1681754.000 + + +-453014.410+1681754.000/ +-453016.378+1681826.111/ +-453022.221+1681857.247/ +-453031.763+1681926.466/ +-453044.714+1681952.879/ +-453100.680+1682015.686/ +-453119.179+1682034.193/ +-453139.648+1682047.837/ +-453201.465+1682056.203/ +-453223.969+1682059.034/ +-453246.475+1682056.243/ +-453308.299+1682047.913/ +-453328.779+1682034.296/ +-453347.291+1682015.803/ +-453403.272+1681952.996/ +-453416.237+1681926.568/ +-453425.789+1681857.324/ +-453431.640+1681826.151/ +-453433.610+1681754.000/ +-453431.640+1681721.849/ +-453425.789+1681650.676/ +-453416.237+1681621.432/ +-453403.272+1681555.004/ +-453347.291+1681532.197/ +-453328.779+1681513.704/ +-453308.299+1681500.087/ +-453246.475+1681451.757/ +-453223.969+1681448.966/ +-453201.465+1681451.797/ +-453139.648+1681500.163/ +-453119.179+1681513.807/ +-453100.680+1681532.314/ +-453044.714+1681555.121/ +-453031.763+1681621.534/ +-453022.221+1681650.753/ +-453016.378+1681721.889/ +-453014.410+1681754.000 - - - -424544.800+1711715.900/ - -424622.600+1711838.700/ - -424812.000+1712045.100/ - -425053.900+1711853.100/ - -424954.000+1711615.500/ - -424845.000+1711437.700/ - -424709.700+1711259.800/ - -424536.900+1711427.200/ - -424544.800+1711715.900 + + +-424544.800+1711715.900/ +-424622.600+1711838.700/ +-424812.000+1712045.100/ +-425053.900+1711853.100/ +-424954.000+1711615.500/ +-424845.000+1711437.700/ +-424709.700+1711259.800/ +-424536.900+1711427.200/ +-424544.800+1711715.900 - + - -420856.900+1722003.500/ - -421132.900+1722032.500/ - -421441.900+1722005.500/ - -421536.900+1721313.500/ - -420759.900+1721417.500/ - -420856.900+1722003.500 +-420856.900+1722003.500/ +-421132.900+1722032.500/ +-421441.900+1722005.500/ +-421536.900+1721313.500/ +-420759.900+1721417.500/ +-420856.900+1722003.500 - + - -415753.900+1723100.500/ - -420008.900+1723030.500/ - -415953.900+1722612.500/ - -415844.900+1722518.500/ - -415726.900+1722618.500/ - -415720.900+1722736.500/ - -415753.900+1723100.500 +-415753.900+1723100.500/ +-420008.900+1723030.500/ +-415953.900+1722612.500/ +-415844.900+1722518.500/ +-415726.900+1722618.500/ +-415720.900+1722736.500/ +-415753.900+1723100.500 - + - -425628.700+1722403.800/ - -425913.800+1722246.200/ - -425918.000+1721635.200/ - -425617.100+1721621.300/ - -425628.700+1722403.800 +-425628.700+1722403.800/ +-425913.800+1722246.200/ +-425918.000+1721635.200/ +-425617.100+1721621.300/ +-425628.700+1722403.800 - + - -423044.500+1720123.000/ - -423521.800+1720358.900/ - -423615.000+1715738.100/ - -423526.800+1715312.600/ - -423347.200+1715257.500/ - -422950.500+1715658.000/ - -423044.500+1720123.000 +-423044.500+1720123.000/ +-423521.800+1720358.900/ +-423615.000+1715738.100/ +-423526.800+1715312.600/ +-423347.200+1715257.500/ +-422950.500+1715658.000/ +-423044.500+1720123.000 - - - -432800.000+1722211.200/ - -432922.800+1722154.400/ - -432928.600+1722150.800/ - -432923.400+1722116.600/ - -432912.000+1722119.600/ - -432906.600+1722100.400/ - -432856.400+1722044.800/ - -432800.600+1722035.800/ - -432800.000+1722211.200 + + +-432800.000+1722211.200/ +-432922.800+1722154.400/ +-432928.600+1722150.800/ +-432923.400+1722116.600/ +-432912.000+1722119.600/ +-432906.600+1722100.400/ +-432856.400+1722044.800/ +-432800.600+1722035.800/ +-432800.000+1722211.200 - + - -453039.000+1695533.600/ - -453159.300+1695620.300/ - -453709.000+1695541.900/ - -453818.500+1694814.600/ - -453400.800+1694614.000/ - -453145.400+1694916.100/ - -453039.000+1695533.600 +-453039.000+1695533.600/ +-453159.300+1695620.300/ +-453709.000+1695541.900/ +-453818.500+1694814.600/ +-453400.800+1694614.000/ +-453145.400+1694916.100/ +-453039.000+1695533.600 - + - -454546.200+1703230.300/ - -454616.200+1703212.300/ - -454559.200+1703106.300/ - -454529.200+1703124.300/ - -454546.200+1703230.300 +-454546.200+1703230.300/ +-454616.200+1703212.300/ +-454559.200+1703106.300/ +-454529.200+1703124.300/ +-454546.200+1703230.300 - + - -435413.500+1702242.500/ - -435517.600+1701949.800/ - -435653.300+1701507.900/ - -435416.700+1701358.100/ - -435253.300+1701955.900/ - -435413.500+1702242.500 +-435413.500+1702242.500/ +-435517.600+1701949.800/ +-435653.300+1701507.900/ +-435416.700+1701358.100/ +-435253.300+1701955.900/ +-435413.500+1702242.500 - + - -435517.600+1701949.800/ - -435831.800+1702015.300/ - -435824.000+1701758.500/ - -435858.600+1701603.800/ - -435653.300+1701507.900/ - -435517.600+1701949.800 +-435517.600+1701949.800/ +-435831.800+1702015.300/ +-435824.000+1701758.500/ +-435858.600+1701603.800/ +-435653.300+1701507.900/ +-435517.600+1701949.800 - - - -435504.000+1702603.000/ - -435656.500+1702625.700/ - -435807.700+1702427.500/ - -435751.900+1702252.500/ - -435831.800+1702015.300/ - -435517.600+1701949.800/ - -435413.500+1702242.500/ - -435450.900+1702338.500/ - -435504.000+1702603.000 + + +-435504.000+1702603.000/ +-435656.500+1702625.700/ +-435807.700+1702427.500/ +-435751.900+1702252.500/ +-435831.800+1702015.300/ +-435517.600+1701949.800/ +-435413.500+1702242.500/ +-435450.900+1702338.500/ +-435504.000+1702603.000 - - - -355003.000+1742935.500/ - -355003.492+1742942.440/ - -355004.954+1742949.169/ - -355007.340+1742955.483/ - -355010.579+1743001.190/ - -355014.573+1743006.116/ - -355019.199+1743010.112/ - -355024.317+1743013.057/ - -355029.772+1743014.861/ - -355035.398+1743015.469/ - -355041.024+1743014.863/ - -355046.480+1743013.060/ - -355051.599+1743010.116/ - -355056.225+1743006.120/ - -355100.219+1743001.194/ - -355103.459+1742955.487/ - -355105.846+1742949.172/ - -355107.308+1742942.441/ - -355107.800+1742935.500/ - -355107.308+1742928.559/ - -355105.846+1742921.828/ - -355103.459+1742915.513/ - -355100.219+1742909.806/ - -355056.225+1742904.880/ - -355051.599+1742900.884/ - -355046.480+1742857.940/ - -355041.024+1742856.137/ - -355035.398+1742855.531/ - -355029.772+1742856.139/ - -355024.317+1742857.943/ - -355019.199+1742900.888/ - -355014.573+1742904.884/ - -355010.579+1742909.810/ - -355007.340+1742915.517/ - -355004.954+1742921.831/ - -355003.492+1742928.560/ - -355003.000+1742935.500 + + +-355003.000+1742935.500/ +-355003.492+1742942.440/ +-355004.954+1742949.169/ +-355007.340+1742955.483/ +-355010.579+1743001.190/ +-355014.573+1743006.116/ +-355019.199+1743010.112/ +-355024.317+1743013.057/ +-355029.772+1743014.861/ +-355035.398+1743015.469/ +-355041.024+1743014.863/ +-355046.480+1743013.060/ +-355051.599+1743010.116/ +-355056.225+1743006.120/ +-355100.219+1743001.194/ +-355103.459+1742955.487/ +-355105.846+1742949.172/ +-355107.308+1742942.441/ +-355107.800+1742935.500/ +-355107.308+1742928.559/ +-355105.846+1742921.828/ +-355103.459+1742915.513/ +-355100.219+1742909.806/ +-355056.225+1742904.880/ +-355051.599+1742900.884/ +-355046.480+1742857.940/ +-355041.024+1742856.137/ +-355035.398+1742855.531/ +-355029.772+1742856.139/ +-355024.317+1742857.943/ +-355019.199+1742900.888/ +-355014.573+1742904.884/ +-355010.579+1742909.810/ +-355007.340+1742915.517/ +-355004.954+1742921.831/ +-355003.492+1742928.560/ +-355003.000+1742935.500 - - - -360907.310+1750442.700/ - -360909.770+1750517.539/ - -360917.074+1750551.322/ - -360929.000+1750623.023/ - -360945.192+1750651.680/ - -361005.151+1750716.423/ - -361028.275+1750736.501/ - -361053.862+1750751.302/ - -361121.134+1750800.376/ - -361149.263+1750803.446/ - -361217.396+1750800.416/ - -361244.676+1750751.376/ - -361310.275+1750736.601/ - -361333.414+1750716.537/ - -361353.390+1750651.794/ - -361409.594+1750623.123/ - -361421.535+1750551.396/ - -361428.847+1750517.579/ - -361431.310+1750442.700/ - -361428.847+1750407.821/ - -361421.535+1750334.004/ - -361409.594+1750302.277/ - -361353.390+1750233.606/ - -361333.414+1750208.863/ - -361310.275+1750148.799/ - -361244.676+1750134.024/ - -361217.396+1750124.984/ - -361149.263+1750121.954/ - -361121.134+1750125.024/ - -361053.862+1750134.098/ - -361028.275+1750148.899/ - -361005.151+1750208.977/ - -360945.192+1750233.720/ - -360929.000+1750302.377/ - -360917.074+1750334.078/ - -360909.770+1750407.861/ - -360907.310+1750442.700 + + +-360907.310+1750442.700/ +-360909.770+1750517.539/ +-360917.074+1750551.322/ +-360929.000+1750623.023/ +-360945.192+1750651.680/ +-361005.151+1750716.423/ +-361028.275+1750736.501/ +-361053.862+1750751.302/ +-361121.134+1750800.376/ +-361149.263+1750803.446/ +-361217.396+1750800.416/ +-361244.676+1750751.376/ +-361310.275+1750736.601/ +-361333.414+1750716.537/ +-361353.390+1750651.794/ +-361409.594+1750623.123/ +-361421.535+1750551.396/ +-361428.847+1750517.579/ +-361431.310+1750442.700/ +-361428.847+1750407.821/ +-361421.535+1750334.004/ +-361409.594+1750302.277/ +-361353.390+1750233.606/ +-361333.414+1750208.863/ +-361310.275+1750148.799/ +-361244.676+1750134.024/ +-361217.396+1750124.984/ +-361149.263+1750121.954/ +-361121.134+1750125.024/ +-361053.862+1750134.098/ +-361028.275+1750148.899/ +-361005.151+1750208.977/ +-360945.192+1750233.720/ +-360929.000+1750302.377/ +-360917.074+1750334.078/ +-360909.770+1750407.861/ +-360907.310+1750442.700 - - - -360120.300+1743031.500/ - -360133.900+1743006.300/ - -360123.600+1742959.000/ - -355940.400+1742844.600/ - -355908.900+1742823.200/ - -355850.600+1742804.600/ - -355823.100+1742845.300/ - -360120.300+1743031.500 + + +-360120.300+1743031.500/ +-360133.900+1743006.300/ +-360123.600+1742959.000/ +-355940.400+1742844.600/ +-355908.900+1742823.200/ +-355850.600+1742804.600/ +-355823.100+1742845.300/ +-360120.300+1743031.500 - - - -360653.300+1743716.400/ - -360709.400+1743634.100/ - -360703.700+1743634.300/ - -360640.600+1743607.600/ - -360632.200+1743547.500/ - -360454.900+1743555.600/ - -360456.600+1743612.200/ - -360653.300+1743716.400 + + +-360653.300+1743716.400/ +-360709.400+1743634.100/ +-360703.700+1743634.300/ +-360640.600+1743607.600/ +-360632.200+1743547.500/ +-360454.900+1743555.600/ +-360456.600+1743612.200/ +-360653.300+1743716.400 - - - -360925.400+1743909.700/ - -360932.800+1743839.900/ - -360917.700+1743825.300/ - -360918.200+1743804.300/ - -360906.800+1743749.500/ - -360837.000+1743755.400/ - -360807.000+1743734.800/ - -360755.200+1743757.600/ - -360925.400+1743909.700 + + +-360925.400+1743909.700/ +-360932.800+1743839.900/ +-360917.700+1743825.300/ +-360918.200+1743804.300/ +-360906.800+1743749.500/ +-360837.000+1743755.400/ +-360807.000+1743734.800/ +-360755.200+1743757.600/ +-360925.400+1743909.700 - - - -393813.400+1770602.100/ - -393816.989+1770607.650/ - -393819.072+1770610.130/ - -393821.315+1770612.365/ - -393823.698+1770614.337/ - -393826.205+1770616.033/ - -393828.817+1770617.438/ - -393831.512+1770618.542/ - -393834.272+1770619.337/ - -393837.074+1770619.816/ - -393839.898+1770619.977/ - -393842.722+1770619.817/ - -393845.524+1770619.339/ - -393848.284+1770618.545/ - -393850.980+1770617.441/ - -393853.591+1770616.037/ - -393856.098+1770614.342/ - -393858.482+1770612.370/ - -393900.725+1770610.135/ - -393902.809+1770607.656/ - -393904.719+1770604.949/ - -393906.440+1770602.037/ - -393907.959+1770558.941/ - -393909.264+1770555.685/ - -393910.346+1770552.293/ - -393911.196+1770548.792/ - -393911.808+1770545.208/ - -393912.177+1770541.568/ - -393912.300+1770537.900/ - -393912.177+1770534.232/ - -393911.808+1770530.592/ - -393911.196+1770527.008/ - -393910.346+1770523.507/ - -393909.264+1770520.115/ - -393907.959+1770516.859/ - -393906.440+1770513.763/ - -393906.100+1770513.300/ - -393832.100+1770411.300/ - -393828.609+1770405.748/ - -393826.525+1770403.269/ - -393824.282+1770401.035/ - -393821.898+1770359.063/ - -393819.391+1770357.369/ - -393816.780+1770355.964/ - -393814.084+1770354.861/ - -393811.324+1770354.067/ - -393808.522+1770353.589/ - -393805.698+1770353.429/ - -393802.874+1770353.589/ - -393800.072+1770354.069/ - -393757.312+1770354.864/ - -393754.617+1770355.968/ - -393752.005+1770357.373/ - -393749.498+1770359.068/ - -393747.115+1770401.040/ - -393744.872+1770403.274/ - -393742.789+1770405.754/ - -393740.879+1770408.460/ - -393739.159+1770411.372/ - -393737.640+1770414.467/ - -393736.335+1770417.722/ - -393735.254+1770421.113/ - -393734.404+1770424.613/ - -393733.792+1770428.195/ - -393733.423+1770431.834/ - -393733.300+1770435.500/ - -393733.423+1770439.166/ - -393733.792+1770442.805/ - -393734.404+1770446.387/ - -393735.254+1770449.887/ - -393736.335+1770453.278/ - -393737.640+1770456.533/ - -393739.159+1770459.628/ - -393739.300+1770500.100/ - -393813.400+1770602.100 + + +-393813.400+1770602.100/ +-393816.989+1770607.650/ +-393819.072+1770610.130/ +-393821.315+1770612.365/ +-393823.698+1770614.337/ +-393826.205+1770616.033/ +-393828.817+1770617.438/ +-393831.512+1770618.542/ +-393834.272+1770619.337/ +-393837.074+1770619.816/ +-393839.898+1770619.977/ +-393842.722+1770619.817/ +-393845.524+1770619.339/ +-393848.284+1770618.545/ +-393850.980+1770617.441/ +-393853.591+1770616.037/ +-393856.098+1770614.342/ +-393858.482+1770612.370/ +-393900.725+1770610.135/ +-393902.809+1770607.656/ +-393904.719+1770604.949/ +-393906.440+1770602.037/ +-393907.959+1770558.941/ +-393909.264+1770555.685/ +-393910.346+1770552.293/ +-393911.196+1770548.792/ +-393911.808+1770545.208/ +-393912.177+1770541.568/ +-393912.300+1770537.900/ +-393912.177+1770534.232/ +-393911.808+1770530.592/ +-393911.196+1770527.008/ +-393910.346+1770523.507/ +-393909.264+1770520.115/ +-393907.959+1770516.859/ +-393906.440+1770513.763/ +-393906.100+1770513.300/ +-393832.100+1770411.300/ +-393828.609+1770405.748/ +-393826.525+1770403.269/ +-393824.282+1770401.035/ +-393821.898+1770359.063/ +-393819.391+1770357.369/ +-393816.780+1770355.964/ +-393814.084+1770354.861/ +-393811.324+1770354.067/ +-393808.522+1770353.589/ +-393805.698+1770353.429/ +-393802.874+1770353.589/ +-393800.072+1770354.069/ +-393757.312+1770354.864/ +-393754.617+1770355.968/ +-393752.005+1770357.373/ +-393749.498+1770359.068/ +-393747.115+1770401.040/ +-393744.872+1770403.274/ +-393742.789+1770405.754/ +-393740.879+1770408.460/ +-393739.159+1770411.372/ +-393737.640+1770414.467/ +-393736.335+1770417.722/ +-393735.254+1770421.113/ +-393734.404+1770424.613/ +-393733.792+1770428.195/ +-393733.423+1770431.834/ +-393733.300+1770435.500/ +-393733.423+1770439.166/ +-393733.792+1770442.805/ +-393734.404+1770446.387/ +-393735.254+1770449.887/ +-393736.335+1770453.278/ +-393737.640+1770456.533/ +-393739.159+1770459.628/ +-393739.300+1770500.100/ +-393813.400+1770602.100 - - - -385900.000+1781400.000/ - -390803.900+1781631.500/ - -392342.200+1780544.900/ - -392510.783+1780437.866/ - -392600.702+1780348.511/ - -392647.101+1780253.690/ - -392729.626+1780153.822/ - -392807.950+1780049.362/ - -392841.780+1775940.802/ - -392910.857+1775828.666/ - -392934.958+1775713.505/ - -392953.897+1775555.897/ - -393007.530+1775436.435/ - -393015.752+1775315.730/ - -393018.500+1775154.400/ - -393015.752+1775033.070/ - -393007.530+1774912.365/ - -392953.897+1774752.903/ - -392934.958+1774635.295/ - -392910.857+1774520.134/ - -392841.780+1774408.000/ - -392807.950+1774259.438/ - -392729.626+1774154.978/ - -392647.101+1774055.110/ - -392600.702+1774000.289/ - -392510.783+1773910.934/ - -392417.727+1773827.417/ - -392321.939+1773750.069/ - -392223.845+1773719.169/ - -392123.889+1773654.950/ - -392022.528+1773637.591/ - -392017.300+1773632.800/ - -390600.000+1773632.800/ - -390600.000+1775400.000/ - -385900.000+1781400.000 + + +-385900.000+1781400.000/ +-390803.900+1781631.500/ +-392342.200+1780544.900/ +-392510.783+1780437.866/ +-392600.702+1780348.511/ +-392647.101+1780253.690/ +-392729.626+1780153.822/ +-392807.950+1780049.362/ +-392841.780+1775940.802/ +-392910.857+1775828.666/ +-392934.958+1775713.505/ +-392953.897+1775555.897/ +-393007.530+1775436.435/ +-393015.752+1775315.730/ +-393018.500+1775154.400/ +-393015.752+1775033.070/ +-393007.530+1774912.365/ +-392953.897+1774752.903/ +-392934.958+1774635.295/ +-392910.857+1774520.134/ +-392841.780+1774408.000/ +-392807.950+1774259.438/ +-392729.626+1774154.978/ +-392647.101+1774055.110/ +-392600.702+1774000.289/ +-392510.783+1773910.934/ +-392417.727+1773827.417/ +-392321.939+1773750.069/ +-392223.845+1773719.169/ +-392123.889+1773654.950/ +-392022.528+1773637.591/ +-392017.300+1773632.800/ +-390600.000+1773632.800/ +-390600.000+1775400.000/ +-385900.000+1781400.000 - - - -404146.600+1753815.600/ - -404148.076+1753837.862/ - -404152.460+1753859.449/ - -404159.617+1753919.705/ - -404209.332+1753938.015/ - -404221.309+1753953.823/ - -404235.185+1754006.649/ - -404250.538+1754016.103/ - -404306.902+1754021.897/ - -404323.780+1754023.854/ - -404340.659+1754021.915/ - -404357.027+1754016.136/ - -404412.385+1754006.694/ - -404426.267+1753953.874/ - -404438.251+1753938.066/ - -404447.973+1753919.750/ - -404455.136+1753859.482/ - -404459.523+1753837.880/ - -404501.000+1753815.600/ - -404459.523+1753753.320/ - -404455.136+1753731.718/ - -404447.973+1753711.450/ - -404438.251+1753653.134/ - -404426.267+1753637.326/ - -404412.385+1753624.506/ - -404357.027+1753615.064/ - -404340.659+1753609.285/ - -404323.780+1753607.346/ - -404306.902+1753609.303/ - -404250.538+1753615.097/ - -404235.185+1753624.551/ - -404221.309+1753637.377/ - -404209.332+1753653.185/ - -404159.617+1753711.495/ - -404152.460+1753731.751/ - -404148.076+1753753.338/ - -404146.600+1753815.600 + + +-404146.600+1753815.600/ +-404148.076+1753837.862/ +-404152.460+1753859.449/ +-404159.617+1753919.705/ +-404209.332+1753938.015/ +-404221.309+1753953.823/ +-404235.185+1754006.649/ +-404250.538+1754016.103/ +-404306.902+1754021.897/ +-404323.780+1754023.854/ +-404340.659+1754021.915/ +-404357.027+1754016.136/ +-404412.385+1754006.694/ +-404426.267+1753953.874/ +-404438.251+1753938.066/ +-404447.973+1753919.750/ +-404455.136+1753859.482/ +-404459.523+1753837.880/ +-404501.000+1753815.600/ +-404459.523+1753753.320/ +-404455.136+1753731.718/ +-404447.973+1753711.450/ +-404438.251+1753653.134/ +-404426.267+1753637.326/ +-404412.385+1753624.506/ +-404357.027+1753615.064/ +-404340.659+1753609.285/ +-404323.780+1753607.346/ +-404306.902+1753609.303/ +-404250.538+1753615.097/ +-404235.185+1753624.551/ +-404221.309+1753637.377/ +-404209.332+1753653.185/ +-404159.617+1753711.495/ +-404152.460+1753731.751/ +-404148.076+1753753.338/ +-404146.600+1753815.600 - - - -402958.800+1724426.500/ - -402942.491+1724701.923/ - -402938.400+1724905.700/ - -402942.491+1725109.477/ - -402954.735+1725312.325/ - -403015.038+1725513.321/ - -403043.248+1725711.554/ - -403119.154+1725906.137/ - -403202.486+1730056.206/ - -403252.917+1730240.930/ - -403350.069+1730419.517/ - -403453.510+1730551.222/ - -403500.500+1730557.600/ - -403507.142+1730605.864/ - -403511.626+1730610.396/ - -403516.393+1730614.398/ - -403521.407+1730617.836/ - -403526.629+1730620.687/ - -403532.020+1730622.927/ - -403537.539+1730624.541/ - -403543.144+1730625.514/ - -403548.791+1730625.841/ - -403554.439+1730625.518/ - -403600.044+1730624.548/ - -403605.563+1730622.939/ - -403610.955+1730620.702/ - -403616.178+1730617.854/ - -403621.193+1730614.417/ - -403625.962+1730610.418/ - -403630.448+1730605.886/ - -403634.616+1730600.857/ - -403638.436+1730555.367/ - -403641.878+1730549.460/ - -403644.916+1730543.180/ - -403647.527+1730536.575/ - -403649.691+1730529.696/ - -403651.391+1730522.594/ - -403652.615+1730515.323/ - -403653.353+1730507.940/ - -403653.800+1730500.500/ - -403653.800+1725137.400/ - -402958.800+1724426.500 + + +-402958.800+1724426.500/ +-402942.491+1724701.923/ +-402938.400+1724905.700/ +-402942.491+1725109.477/ +-402954.735+1725312.325/ +-403015.038+1725513.321/ +-403043.248+1725711.554/ +-403119.154+1725906.137/ +-403202.486+1730056.206/ +-403252.917+1730240.930/ +-403350.069+1730419.517/ +-403453.510+1730551.222/ +-403500.500+1730557.600/ +-403507.142+1730605.864/ +-403511.626+1730610.396/ +-403516.393+1730614.398/ +-403521.407+1730617.836/ +-403526.629+1730620.687/ +-403532.020+1730622.927/ +-403537.539+1730624.541/ +-403543.144+1730625.514/ +-403548.791+1730625.841/ +-403554.439+1730625.518/ +-403600.044+1730624.548/ +-403605.563+1730622.939/ +-403610.955+1730620.702/ +-403616.178+1730617.854/ +-403621.193+1730614.417/ +-403625.962+1730610.418/ +-403630.448+1730605.886/ +-403634.616+1730600.857/ +-403638.436+1730555.367/ +-403641.878+1730549.460/ +-403644.916+1730543.180/ +-403647.527+1730536.575/ +-403649.691+1730529.696/ +-403651.391+1730522.594/ +-403652.615+1730515.323/ +-403653.353+1730507.940/ +-403653.800+1730500.500/ +-403653.800+1725137.400/ +-402958.800+1724426.500 - - - -430517.900+1702348.400/ - -430706.000+1702330.400/ - -430723.000+1702018.400/ - -431354.000+1701300.300/ - -431333.000+1701021.300/ - -430839.000+1701339.400/ - -430630.400+1701539.600/ - -430455.700+1702204.000/ - -430517.900+1702348.400 + + +-430517.900+1702348.400/ +-430706.000+1702330.400/ +-430723.000+1702018.400/ +-431354.000+1701300.300/ +-431333.000+1701021.300/ +-430839.000+1701339.400/ +-430630.400+1701539.600/ +-430455.700+1702204.000/ +-430517.900+1702348.400 - - - -444154.100+1675646.400/ - -444215.100+1675851.200/ - -444354.100+1675800.200/ - -444604.900+1680124.200/ - -444734.900+1680240.400/ - -444810.300+1680526.000/ - -444940.300+1680523.000/ - -444940.300+1680032.000/ - -444801.900+1680036.200/ - -444631.900+1675920.000/ - -444601.300+1675716.400/ - -444354.100+1675520.000/ - -444154.100+1675646.400 + + +-444154.100+1675646.400/ +-444215.100+1675851.200/ +-444354.100+1675800.200/ +-444604.900+1680124.200/ +-444734.900+1680240.400/ +-444810.300+1680526.000/ +-444940.300+1680523.000/ +-444940.300+1680032.000/ +-444801.900+1680036.200/ +-444631.900+1675920.000/ +-444601.300+1675716.400/ +-444354.100+1675520.000/ +-444154.100+1675646.400 - + - -420935.900+1712223.400/ - -421019.900+1712208.400/ - -421103.800+1712142.400/ - -420944.900+1711958.400/ - -420722.900+1711959.400/ - -420935.900+1712223.400 +-420935.900+1712223.400/ +-421019.900+1712208.400/ +-421103.800+1712142.400/ +-420944.900+1711958.400/ +-420722.900+1711959.400/ +-420935.900+1712223.400 - - - -452114.000+1705151.300/ - -452114.492+1705159.306/ - -452115.954+1705207.069/ - -452118.340+1705214.354/ - -452121.579+1705220.938/ - -452125.572+1705226.621/ - -452130.198+1705231.232/ - -452135.316+1705234.630/ - -452140.771+1705236.712/ - -452146.397+1705237.414/ - -452152.024+1705236.714/ - -452157.479+1705234.635/ - -452202.598+1705231.239/ - -452207.225+1705226.629/ - -452211.219+1705220.945/ - -452214.459+1705214.360/ - -452216.846+1705207.074/ - -452218.308+1705159.309/ - -452218.800+1705151.300/ - -452218.308+1705143.291/ - -452216.846+1705135.526/ - -452214.459+1705128.240/ - -452211.219+1705121.655/ - -452207.225+1705115.971/ - -452202.598+1705111.361/ - -452157.479+1705107.965/ - -452152.024+1705105.886/ - -452146.397+1705105.186/ - -452140.771+1705105.888/ - -452135.316+1705107.970/ - -452130.198+1705111.368/ - -452125.572+1705115.979/ - -452121.579+1705121.662/ - -452118.340+1705128.246/ - -452115.954+1705135.531/ - -452114.492+1705143.294/ - -452114.000+1705151.300 + + +-452114.000+1705151.300/ +-452114.492+1705159.306/ +-452115.954+1705207.069/ +-452118.340+1705214.354/ +-452121.579+1705220.938/ +-452125.572+1705226.621/ +-452130.198+1705231.232/ +-452135.316+1705234.630/ +-452140.771+1705236.712/ +-452146.397+1705237.414/ +-452152.024+1705236.714/ +-452157.479+1705234.635/ +-452202.598+1705231.239/ +-452207.225+1705226.629/ +-452211.219+1705220.945/ +-452214.459+1705214.360/ +-452216.846+1705207.074/ +-452218.308+1705159.309/ +-452218.800+1705151.300/ +-452218.308+1705143.291/ +-452216.846+1705135.526/ +-452214.459+1705128.240/ +-452211.219+1705121.655/ +-452207.225+1705115.971/ +-452202.598+1705111.361/ +-452157.479+1705107.965/ +-452152.024+1705105.886/ +-452146.397+1705105.186/ +-452140.771+1705105.888/ +-452135.316+1705107.970/ +-452130.198+1705111.368/ +-452125.572+1705115.979/ +-452121.579+1705121.662/ +-452118.340+1705128.246/ +-452115.954+1705135.531/ +-452114.492+1705143.294/ +-452114.000+1705151.300 - + - -434802.100+1724112.900/ - -434937.300+1724152.400/ - -434939.100+1724509.000/ - -435313.200+1724509.000/ - -435313.200+1723504.700/ - -434802.100+1723314.900/ - -434802.100+1724112.900 +-434802.100+1724112.900/ +-434937.300+1724152.400/ +-434939.100+1724509.000/ +-435313.200+1724509.000/ +-435313.200+1723504.700/ +-434802.100+1723314.900/ +-434802.100+1724112.900 - - - -454551.800+1704342.300/ - -454552.292+1704350.365/ - -454553.754+1704358.185/ - -454556.140+1704405.523/ - -454559.379+1704412.155/ - -454603.372+1704417.880/ - -454608.000+1704422.525/ - -454613.116+1704425.948/ - -454618.571+1704428.045/ - -454624.197+1704428.752/ - -454629.824+1704428.047/ - -454635.279+1704425.953/ - -454640.398+1704422.532/ - -454645.025+1704417.888/ - -454649.019+1704412.162/ - -454652.259+1704405.529/ - -454654.646+1704358.190/ - -454656.108+1704350.368/ - -454656.600+1704342.300/ - -454656.108+1704334.232/ - -454654.646+1704326.410/ - -454652.259+1704319.071/ - -454649.019+1704312.438/ - -454645.025+1704306.712/ - -454640.398+1704302.068/ - -454635.279+1704258.647/ - -454629.824+1704256.553/ - -454624.197+1704255.848/ - -454618.571+1704256.555/ - -454613.116+1704258.652/ - -454608.000+1704302.075/ - -454603.372+1704306.720/ - -454559.379+1704312.445/ - -454556.140+1704319.077/ - -454553.754+1704326.415/ - -454552.292+1704334.235/ - -454551.800+1704342.300 + + +-454551.800+1704342.300/ +-454552.292+1704350.365/ +-454553.754+1704358.185/ +-454556.140+1704405.523/ +-454559.379+1704412.155/ +-454603.372+1704417.880/ +-454608.000+1704422.525/ +-454613.116+1704425.948/ +-454618.571+1704428.045/ +-454624.197+1704428.752/ +-454629.824+1704428.047/ +-454635.279+1704425.953/ +-454640.398+1704422.532/ +-454645.025+1704417.888/ +-454649.019+1704412.162/ +-454652.259+1704405.529/ +-454654.646+1704358.190/ +-454656.108+1704350.368/ +-454656.600+1704342.300/ +-454656.108+1704334.232/ +-454654.646+1704326.410/ +-454652.259+1704319.071/ +-454649.019+1704312.438/ +-454645.025+1704306.712/ +-454640.398+1704302.068/ +-454635.279+1704258.647/ +-454629.824+1704256.553/ +-454624.197+1704255.848/ +-454618.571+1704256.555/ +-454613.116+1704258.652/ +-454608.000+1704302.075/ +-454603.372+1704306.720/ +-454559.379+1704312.445/ +-454556.140+1704319.077/ +-454553.754+1704326.415/ +-454552.292+1704334.235/ +-454551.800+1704342.300 From d12a8f189441aee53c8aeaf06fa30ff733fc0fd2 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Thu, 9 Mar 2023 20:42:14 +1300 Subject: [PATCH 38/50] Cycle 2304 Proc Changes Fixes OPS-113, OPS-124, OPS-123, OPS-122, OPS-121, OPS-120, OPS-119 --- Airspace.xml | 131 ++++++++++++++++++++--------------- Maps/Airspace/ALL_RNAV.xml | 50 +++++++------- Maps/NZAA/AA_ACU.xml | 136 ++++++++++++++++++++++++------------- Maps/NZCH/CH_ACU.xml | 4 +- Maps/NZHN/HN_ACU.xml | 34 +++++----- Maps/NZOH/OH_ACU.xml | 6 +- Maps/NZPM/PM_ACU.xml | 2 +- Maps/NZQN/QN_ACU.xml | 99 ++++++++++++++------------- Profile.xml | 2 +- 9 files changed, 263 insertions(+), 201 deletions(-) diff --git a/Airspace.xml b/Airspace.xml index c0ac3a5..3f1fc3d 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -7,21 +7,24 @@ - - + + - + + + + @@ -35,9 +38,9 @@ - + - + @@ -51,21 +54,22 @@ - + + - + - - + + @@ -317,7 +321,7 @@ - + @@ -336,7 +340,7 @@ - + @@ -591,7 +595,7 @@ - + @@ -602,8 +606,8 @@ - - + + @@ -633,7 +637,7 @@ - + @@ -689,21 +693,21 @@ - + - + - + - + - - + + @@ -4405,6 +4409,7 @@ RILEY -374542.550+1760319.260 -365403.800+1744427.210 -454801.700+1701800.760 + -450431.000+1682251.000 -201358.750-1590554.080 -415913.950+1713635.160 -412748.620+1734135.210 @@ -5001,6 +5006,7 @@ RILEY -380829.310+1763349.709 -380835.851+1761742.151 -380922.010+1761650.830 + -380730.684+1761738.220 -462922.150+1680617.630 -345227.080+1732857.360 -413009.690+1745421.910 @@ -5973,8 +5979,8 @@ RILEY -395310.900+1745401.170 -382430.600+1763356.500 -442703.800+1675925.200 - -374446.800+1762115.500 -412842.400+1734844.400 + -374446.800+1762115.500 -370437.500+1745541.700 -384742.700+1754801.700 -373146.800+1760754.500 @@ -6431,7 +6437,7 @@ RILEY EMRAG/XELAN/BELRA/DADLA/SALAG - + BROOK KAPAI LIMES/KARRL @@ -6444,14 +6450,15 @@ RILEY OTATA WP VOR - + EMRAG - + LENGU/MAGLO/BROOK/FIRTH AGEDU AKLOM DABAS + IBESO IDSEM OLBEX @@ -6463,10 +6470,8 @@ RILEY LENGU - - LENGU - ENSAX/IPDIN/NUTRA - WYTAK/WP VOR + + LENGU/ENSAX/IPDIN/NUTRA IRSIP/LEVRA @@ -6526,11 +6531,12 @@ RILEY IPDIN/NUTRA TULMI - + EMRAG/SATLA AGEDU AKLOM DABAS + IBESO IDSEM OLBEX @@ -6854,7 +6860,7 @@ RILEY TEPOX/KAPLO/MIKER TEPOX/OLDON - + BUDEN @@ -6875,7 +6881,7 @@ RILEY SAPEG/MIKER SAPEG/OLDON - + TAYLA @@ -7276,13 +7282,13 @@ RILEY PP NDB WITBY - + QN843/QN846/QN849/QN852/LEMAK/QN861/METUX/ANPOV AKMAD/NONAN/SAVLA ATVOR/TIMJO - - QN727/KABAP/NOLUV/QN732/RUXAK/QN737/BUGSA/DUGAK/QN817/ENKUV/METUX/ANPOV + + QN727/KABAP/NOLUV/QN732/RUXAK/BELPI/BUGSA/DUGAK/QN817/ENKUV/METUX/ANPOV AKMAD/NONAN/SAVLA ATVOR/TIMJO @@ -7292,8 +7298,8 @@ RILEY PORUT SAVLA - - QN605/QN615/QN621/DOVMA/QN678/QN682/QN686/QN690/QN737/BUGSA/QN878/QN882 + + QN605/QN615/QN621/DOVMA/QN678/QN682/QN686/QN690/BELPI/BUGSA/QN878/OMLEL REDOL/BASOS/ADLUP SUNGU @@ -7311,18 +7317,18 @@ RILEY EPDEX/AKMAD/NONAN/SAVLA EPDEX/ATVOR/TIMJO - - QN843/QN846/QN849/QN852/LEMAK/QN862/QN864/QN866/IPNOR + + QN843/QN846/QN849/QN852/LEMAK/QN862/QN864/QN866/QN872/VAPLI/LOSTI/IPNOR ENRAT/ADKOS BIKOS/LIBLA - - QN727/KABAP/NOLUV/QN732/RUXAK/QN737/BUGSA/DUGAK/VAPLI/IPNOR + + QN727/KABAP/NOLUV/QN732/RUXAK/BELPI/BUGSA/DUGAK/VAPLI/LOSTI/IPNOR ENRAT/ADKOS BIKOS/LIBLA - - QN602/UPTIN/DUGET/GOLEG/PIPOG/QN628/QN632/ASULA/QN648/TUMTA/BUGSA/QN878/QN882 + + QN602/UPTIN/DUGET/GOLEG/PIPOG/QN628/QN632/ASULA/QN648/TUMTA/BUGSA/OMLEL REDOL/BASOS/ADLUP SUNGU @@ -7730,12 +7736,16 @@ RILEY PEBLU VELMO - + BASIV/PAKVI/BAYES/VIBAG/EMRAG ELNOS SALAG UPLAR + + BOVRU/AKBAM/LENGU + BOVRU/EMRAG + DAVEE/OSAKU/ANSER/ZORBA/SABAV/EMRAG @@ -7790,10 +7800,17 @@ RILEY SELKA/OKTUB TARIB - + FOKRE/AA416/AA426/AA419/EMRAG + IBESO OLBEX + + IBESO/MERAS/AA503/VINCE/GITUK/LENGU + + + IBESO/MERAS/AA503/VINCE/STEAL/ATAMA + NOBAR/SAMII/TEVUC/EMRAG @@ -7845,10 +7862,12 @@ RILEY SKEPY/AA415/SABAV/EMRAG HN VOR - + TAZEY/ZORBA + PEBLU + VELMO - + TAZEY/ZORBA/SABAV/EMRAG PEBLU VELMO @@ -8485,13 +8504,13 @@ RILEY PEXED/LUXER/ESNUP - + BINIT/UPRIX/AVGUV/TERIL/LUXUL - + BINIT/DOTGO - + IDLUR/MOSDO/ENDIX @@ -8523,7 +8542,7 @@ RILEY IRMIX/UVUSI - + IRMIX/UDODI/PM727/AKNIN @@ -9133,7 +9152,7 @@ RILEY BUDEN/NITAK/-375225.140+1751946.942 - VATNA/ISPOT/-375120.902+1752010.219 + VATNA/ISPOT/HN VOR/-375120.902+1752010.219 GUNDA/IKERI/-375225.140+1751946.942 @@ -9232,12 +9251,12 @@ RILEY LEVBI/TAXEV/PP421/-405438.311+1745916.552 - IBABU/QN577/QN573/QN571/QN569/QN565/MOPGA/OMUBO/QN555/QN550/QN545/-450112.000+1684408.480 + IBABU/QN577/SARDA/TEPEG/PANTO/DUBEG/MOPGA/OMUBO/QN555/QN550/QN545/-450112.000+1684408.480 - ATKIL/QN780/QN775/QN770 - UGPED/QN779/QN774 - ATVUP/QN760/QN755/LARAV/QN745/QN741/QN735/QN731/QN725/-450059.558+1684527.821 + ATKIL/QN780/TOGOX/QN770 + UGPED/OSOPU/QN774 + ATVUP/QN760/APEXA/LARAV/QN745/QN741/QN735/QN731/QN725/-450059.558+1684527.821 OKERE diff --git a/Maps/Airspace/ALL_RNAV.xml b/Maps/Airspace/ALL_RNAV.xml index af6bc6a..42fb813 100644 --- a/Maps/Airspace/ALL_RNAV.xml +++ b/Maps/Airspace/ALL_RNAV.xml @@ -18,7 +18,6 @@ SUSAL LEKED IBABU - ATVUP ATKIL UGPED OKERE @@ -41,9 +40,8 @@ GUNLO VEKMU DANLU - MOPGA - LARAV OMUBO + LARAV TUSGA SEKBU RIDGE @@ -101,24 +99,26 @@ SEKNI PM482 QN577 - QN573 - QN571 - QN569 - QN565 + SARDA + TEPEG + PANTO + DUBEG + MOPGA QN555 QN550 QN545 + ATVUP QN760 - QN755 + APEXA QN745 QN741 QN735 QN731 QN725 QN780 - QN775 + TOGOX QN770 - QN779 + OSOPU QN774 BONLI ADKAG @@ -150,7 +150,6 @@ SUSAL LEKED IBABU - ATVUP ATKIL UGPED OKERE @@ -176,9 +175,8 @@ GUNLO VEKMU DANLU - MOPGA - LARAV OMUBO + LARAV TUSGA SEKBU RIDGE @@ -209,10 +207,10 @@ SUSAL/CH946/CH813/CH653/CH928 SUPSO/CH434/VEKMU/CH438/CH917 LEKED/SEKNI/DANLU/PM482/-401911.410+1753728.808 - IBABU/QN577/QN573/QN571/QN569/QN565/MOPGA/OMUBO/QN555/QN550/QN545/-450112.000+1684408.480 - ATVUP/QN760/QN755/LARAV/QN745/QN741/QN735/QN731/QN725/-450059.558+1684527.821 - ATKIL/QN780/QN775/QN770/ATVUP - UGPED/QN779/QN774/ATVUP + IBABU/QN577/SARDA/TEPEG/PANTO/DUBEG/MOPGA/OMUBO/QN555/QN550/QN545/-450112.000+1684408.480 + ATVUP/QN760/APEXA/LARAV/QN745/QN741/QN735/QN731/QN725/-450059.558+1684527.821 + 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 WN416/RIDGE/-411907.039+1744826.849 @@ -272,6 +270,10 @@ BEDAV AGTUR EKVIL + TAYLA + BUDEN + VATNA + GUNDA OPAPA NR VOR OTAHA @@ -477,10 +479,6 @@ PAROA WAPOU MAKOS - TAYLA - BUDEN - VATNA - GUNDA SADUN OLNAN WAIPA @@ -589,6 +587,10 @@ BEDAV AGTUR EKVIL + TAYLA + BUDEN + VATNA + GUNDA OPAPA NR VOR OTAHA @@ -811,10 +813,6 @@ PAROA WAPOU MAKOS - TAYLA - BUDEN - VATNA - GUNDA SADUN OLNAN WAIPA @@ -890,7 +888,7 @@ EKVIL/MAKOS TAYLA/LAXOD/-375120.902+1752010.219 BUDEN/NITAK/-375225.140+1751946.942 - VATNA/ISPOT/-375120.902+1752010.219 + VATNA/ISPOT/HN VOR/-375120.902+1752010.219 GUNDA/IKERI/-375225.140+1751946.942 OPAPA/-39.722220+176.710770/-39.649380+176.763350/-393853.779+1764550.980 NR VOR/-39.582160+176.811770/-39.640450+176.769780/-393826.340+1764610.751 diff --git a/Maps/NZAA/AA_ACU.xml b/Maps/NZAA/AA_ACU.xml index 7c32879..c88e33b 100644 --- a/Maps/NZAA/AA_ACU.xml +++ b/Maps/NZAA/AA_ACU.xml @@ -50,19 +50,19 @@ XELAN/BELRA/DADLA/SALAG - + AA05R/-36.988056+174.856389/BROOK - + BROOK/KAPAI - + BROOK/LIMES/KARRL - + @@ -168,32 +168,39 @@ REKIS/TULMI - + EMRAG/SATLA - + SATLA/AGEDU - + SATLA/AKLOM - + SATLA/DABAS - + + SATLA/IBESO + + + SATLA/IDSEM - + SATLA/OLBEX + + EMRAG + PAGLA + AA05R - EMRAG POLIS IDEMA BROOK @@ -226,7 +233,6 @@ ADKUM MADVI VINOD - PAGLA IPDIN NUTRA LESDI @@ -243,6 +249,7 @@ AGEDU AKLOM DABAS + IBESO IDSEM OLBEX @@ -281,6 +288,7 @@ AGEDU AKLOM DABAS + IBESO IDSEM OLBEX @@ -322,6 +330,10 @@ BASIV/BIGUL/XMOND/ORUKI/LENGU + + + BOVRU/AKBAM/LENGU + DAVEE/VINCE/GITUK/LENGU @@ -368,7 +380,7 @@ - EXOPI/DIPPU/ANKIL/LOSGA/AKBAM/LENGU + EXOPI/DIPPU/ANKIL/LOSGA/AKBAM @@ -401,13 +413,20 @@ ANKIL/VIRIS + + + IBESO/MERAS/AA503/VINCE + + + + VINCE/STEAL + - NOBAR/MERAS/AA503/VINCE + NOBAR/MERAS - VINCE/STEAL @@ -525,6 +544,8 @@ BIGUL XMOND ORUKI + BOVRU + AKBAM DAVEE VINCE GITUK @@ -544,10 +565,10 @@ DIPPU ANKIL LOSGA - AKBAM - NOBAR + IBESO MERAS AA503 + NOBAR PEPPE IGABI RIKDI @@ -562,8 +583,10 @@ - + LENGU/MAGLO/BROOK/FIRTH - + FIRTH/AGEDU - + FIRTH/AKLOM - + FIRTH/DABAS - + + FIRTH/IBESO + + + FIRTH/IDSEM - + FIRTH/OLBEX - - - - + LENGU/ENSAX/IPDIN/NUTRA - - - LENGU/WYTAK/WP VOR - AA23L/IRSIP/LEVRA @@ -811,7 +831,7 @@ - STEAL/IPDIN + STEAL/IPDIN/NUTRA @@ -841,6 +861,7 @@ AGEDU AKLOM DABAS + IBESO IDSEM OLBEX ENSAX @@ -881,6 +902,7 @@ ELSAB FIRTH LENGU + NUTRA LEVRA MEMOR OSRAP @@ -896,9 +918,9 @@ AGEDU AKLOM DABAS + IBESO IDSEM OLBEX - NUTRA KAPAI KARRL LAKES @@ -1022,18 +1044,22 @@ - + - + - + - + BASIV/PAKVI/BAYES/VIBAG + + + BOVRU/EMRAG + DAVEE/OSAKU/ANSER/ZORBA/SABAV/EMRAG @@ -1090,11 +1116,15 @@ EXOPI/AA417/STORK/AA418/EMRAG - + + IBESO/FOKRE + + + OLBEX/FOKRE - + FOKRE/AA416/AA426/AA419/EMRAG @@ -1123,20 +1153,26 @@ SKEPY/AA415/SABAV + + + PEBLU/TAZEY + + + + VELMO/TAZEY + - + TAZEY/ZORBA - - PEBLU/TAZEY + - - VELMO/TAZEY + - + EMRAG @@ -1148,6 +1184,10 @@ TEVUC KETOB + + EAGIL + FOKRE + KK NDB SF NDB @@ -1176,13 +1216,13 @@ BONKO PAKVI BAYES + BOVRU DAVEE OSAKU ANSER SABAV ELBOP AKLOM - EAGIL AA421 AA425 AA420 @@ -1199,8 +1239,8 @@ AA417 STORK AA418 + IBESO OLBEX - FOKRE AA416 AA426 AA419 @@ -1217,6 +1257,7 @@ APABO ARADI BASIV + BOVRU DAVEE EAGIL EXOPI @@ -1242,6 +1283,7 @@ KALAG SELKA TARIB + IBESO OLBEX HN VOR EMRAG diff --git a/Maps/NZCH/CH_ACU.xml b/Maps/NZCH/CH_ACU.xml index a5a32c7..b333381 100644 --- a/Maps/NZCH/CH_ACU.xml +++ b/Maps/NZCH/CH_ACU.xml @@ -77,10 +77,12 @@ CH20T/-43.423889+172.580556 + + RINKO + CH02T CH20T - RINKO BAVEM AVOCA ABAXO diff --git a/Maps/NZHN/HN_ACU.xml b/Maps/NZHN/HN_ACU.xml index 532a561..898a821 100644 --- a/Maps/NZHN/HN_ACU.xml +++ b/Maps/NZHN/HN_ACU.xml @@ -2,7 +2,7 @@ - + -37.873650+175.329706/HN36R/BUDEN @@ -247,26 +247,26 @@ - + + TAYLA + VATNA + LAXOD ISPOT - - TAYLA - VATNA - + TAYLA/LAXOD/-375120.902+1752010.219 - VATNA/ISPOT/-375120.902+1752010.219 + VATNA/ISPOT/HN VOR/-375120.902+1752010.219 @@ -334,7 +334,7 @@ TEPOX/OLDON - + HN18L/TAYLA @@ -539,26 +539,26 @@ - + + BUDEN + GUNDA + NITAK IKERI - - BUDEN - GUNDA - + BUDEN/NITAK/-375225.140+1751946.942 GUNDA/IKERI/-375225.140+1751946.942 diff --git a/Maps/NZOH/OH_ACU.xml b/Maps/NZOH/OH_ACU.xml index d455015..c706e56 100644 --- a/Maps/NZOH/OH_ACU.xml +++ b/Maps/NZOH/OH_ACU.xml @@ -50,7 +50,7 @@ - + BINIT/DOTGO @@ -152,11 +152,11 @@ - + BINIT/UPRIX/AVGUV/TERIL/LUXUL - + IDLUR/MOSDO/ENDIX diff --git a/Maps/NZPM/PM_ACU.xml b/Maps/NZPM/PM_ACU.xml index 8243d4c..cbeb910 100644 --- a/Maps/NZPM/PM_ACU.xml +++ b/Maps/NZPM/PM_ACU.xml @@ -159,7 +159,7 @@ BUVLI/NIRUB - + IRMIX/UDODI/PM727/AKNIN diff --git a/Maps/NZQN/QN_ACU.xml b/Maps/NZQN/QN_ACU.xml index b39ed2f..d380926 100644 --- a/Maps/NZQN/QN_ACU.xml +++ b/Maps/NZQN/QN_ACU.xml @@ -2,15 +2,15 @@ - + -45.016544+168.757728/QN23T/QN843/QN846/QN849/QN852/LEMAK/QN861/METUX/ANPOV - + ANPOV/AKMAD/NONAN/SAVLA - + ANPOV/ATVOR/TIMJO @@ -30,16 +30,16 @@ QN VOR/SAVLA - - QN05T/QN605/QN615/QN621/DOVMA/QN678/QN682/QN686/QN690/QN737/BUGSA/QN878/QN882 + + QN05T/QN605/QN615/QN621/DOVMA/QN678/QN682/QN686/QN690/BELPI/BUGSA/QN878/OMLEL - - QN882/REDOL/BASOS/ADLUP + + OMLEL/REDOL/BASOS/ADLUP - - QN882/SUNGU + + OMLEL/SUNGU @@ -69,15 +69,15 @@ EPDEX/ATVOR - - LEMAK/QN862/QN864/QN866/IPNOR + + LEMAK/QN862/QN864/QN866/QN872/VAPLI/LOSTI/IPNOR - + IPNOR/ENRAT - + IPNOR/BIKOS @@ -112,10 +112,10 @@ QN682 QN686 QN690 - QN737 + BELPI BUGSA QN878 - QN882 + OMLEL REDOL BASOS ADLUP @@ -129,12 +129,15 @@ QN862 QN864 QN866 + QN872 + VAPLI + LOSTI IPNOR - - -45.020000+168.735689/QN05T/QN727/KABAP/NOLUV/QN732/RUXAK/QN737/BUGSA/DUGAK/QN817/ENKUV/METUX/ANPOV + + -45.020000+168.735689/QN05T/QN727/KABAP/NOLUV/QN732/RUXAK/BELPI/BUGSA/DUGAK/QN817/ENKUV/METUX/ANPOV - + ANPOV/AKMAD/NONAN/SAVLA - + ANPOV/ATVOR/TIMJO - - DUGAK/VAPLI/IPNOR + + DUGAK/VAPLI/LOSTI/IPNOR - + IPNOR/ENRAT/ADKOS - + IPNOR/BIKOS/LIBLA - - -45.020000+168.735689/QN23T/QN602/UPTIN/DUGET/GOLEG/PIPOG/QN628/QN632/ASULA/QN648/TUMTA/BUGSA/QN878/QN882 + + -45.020000+168.735689/QN23T/QN602/UPTIN/DUGET/GOLEG/PIPOG/QN628/QN632/ASULA/QN648/TUMTA/BUGSA/OMLEL - - QN882/REDOL/BASOS/ADLUP + + OMLEL/REDOL/BASOS/ADLUP - - QN882/SUNGU + + OMLEL/SUNGU @@ -305,7 +307,7 @@ NOLUV QN732 RUXAK - QN737 + BELPI BUGSA DUGAK QN817 @@ -318,6 +320,7 @@ ATVOR TIMJO VAPLI + LOSTI IPNOR ENRAT ADKOS @@ -334,8 +337,7 @@ ASULA QN648 TUMTA - QN878 - QN882 + OMLEL REDOL BASOS ADLUP @@ -350,7 +352,7 @@ - ATVUP/QN760/QN755/LARAV/QN745/QN741/QN735/QN731/QN725/-450059.558+1684527.821 - ATKIL/QN780/QN775/QN770/ATVUP - UGPED/QN779/QN774/ATVUP + ATVUP/QN760/APEXA/LARAV/QN745/QN741/QN735/QN731/QN725/-450059.558+1684527.821 + ATKIL/QN780/TOGOX/QN770/ATVUP + UGPED/OSOPU/QN774/ATVUP - - - WN34T/-41.341667+174.805000/HARBOUR ENTRANCE/-41.343333+174.928333 - - - - MAKARA PEAK/OBSERVATORY - -41.375000+174.966667/HARBOUR ENTRANCE - WN34T/-41.341667+174.805000/HARBOUR ENTRANCE/PENCARROW/BARING/TURAKIRAE + -41.355940+174.804000/HARBOUR ENTRANCE/-41.348720+174.916950 - + - WN34T/-41.356944+174.803333/-41.385278+174.726111 + -41.355940+174.804000/SINCLAIR HEAD - + - BELMONT HILL/WARD ISLAND - - - - TURAKIRAE/BARING/PENCARROW + AVALON/SOMES - + - WN16T/-41.297500+174.807778/POINT GORDON/HARBOUR ENTRANCE/PENCARROW/TURAKIRAE + -41.355940+174.804000/HARBOUR ENTRANCE/PENCARROW/BARING/TURAKIRAE - + - WN16T/-41.297500+174.807778/OBSERVATORY + -41.265160+174.650270/-41.265420+174.746060/OBSERVATORY @@ -934,19 +922,31 @@ - WN16T/-41.297500+174.807778/POINT GORDON/WARD ISLAND + -41.295220+174.809140/POINT GORDON/WARD ISLAND - + + + -41.295220+174.809140/-41.233410+174.710780 + + SINCLAIR HEAD/ISLAND BAY - + + + -41.295220+174.809140/OBSERVATORY/ISLAND BAY/SINCLAIR HEAD + + - WN16T/-41.297500+174.807778/OBSERVATORY/ISLAND BAY + -41.295220+174.809140/POINT GORDON/WARD ISLAND/PENCARROW/BARING/TURAKIRAE + + + + TURAKIRAE/BARING/PENCARROW - + - WN16T/-41.297500+174.807778/POINT GORDON/WARD ISLAND/POINT HOWARD + -41.295220+174.809140/OBSERVATORY/MAKARA PEAK \ No newline at end of file From 96ba7e5504696c5a1ea6dd1523c71c182fedb93b Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Wed, 31 May 2023 16:48:05 +1200 Subject: [PATCH 41/50] Cycle 2306 Changes --- .github/changelogs/2023.md | 42 +++++ Airspace.xml | 232 +++++++++++++++----------- Maps/Airspace/AIRPORTS.xml | 2 + Maps/Airspace/ALL_RNAV.xml | 38 +++-- Maps/NZAA/AA_ACU.xml | 8 +- Maps/NZAP/AP_ACU.xml | 139 ++++++++-------- Maps/NZCH/CH_ACU.xml | 1 + Maps/NZDN/DN_ACU.xml | 5 + Maps/NZOU/Ou_ACU.xml | 22 ++- Maps/NZPM/PM_ACU.xml | 127 +++++++------- Maps/Navaids/ATS Routes.xml | 86 +++++----- Maps/Navaids/Holding.xml | 318 +++++++++++++++++++++++++++--------- Profile.xml | 2 +- 13 files changed, 655 insertions(+), 367 deletions(-) diff --git a/.github/changelogs/2023.md b/.github/changelogs/2023.md index 09cef1b..1ef8a29 100644 --- a/.github/changelogs/2023.md +++ b/.github/changelogs/2023.md @@ -89,18 +89,22 @@ Not released due to a lack of applicable changes. - Various IFR waypoints have been added. **Auckland** + - The following procedures have been reviewed and resequenced: `BROOK 3Q`, `SATLA 3Q`, `FIRTH 3P`, `LENGU 4P`, `BASIV 2N`, `FOKRE 3A`, `TAZEY 3E`, `TAZEY 2N`. - The `EMRAG 2B` departure has been amended to `EMRAG 1Q`. - The following STARs have been added: `BOVRU 1A`, `IBESO 1B`, `IBESO 1D`. - The `LENGU 4P` has been resequenced, and the `WP VOR` transition removed. **Hamilton** + - The `TAYLA 2` and `BUDEN 3` departures have been amended to `TAYLA 3V` and `BUDEN 4V`. **Ohakea** + - Following some changes to the MSA, the following procedures have been resequenced: `BINIT 2H`, `BINIT 2G`, `IDLUR 2G`. **Queenstown** + - The following procedures have been amended and resequenced: `ANPOV 4A`, `DOVMA 3A`, `IPNOR 4A`, `ANPOV 4B`, `IPNOR 4B`, `REDOL 2B` #### Dataset Updates @@ -110,4 +114,42 @@ Not released due to a lack of applicable changes. - Updated previously missed NZWN VFR Procedures. +## AIRAC 2305 + +Not released due to lack of applicable changes. + + +## AIRAC 2306 + +### Revision A + +#### ANR Updates + + - Various IFR waypoints have been added, including the replacement of `RUGVI` with `AVKAB`. + - Various airways have been amended or added. + +**Auckland** + + - The following procedures have been added: `LUNBI 1N`. + - The Auckland Airport helipad has now been completely removed. + +**Christchurch** + + - The following hold has been added for multiple procedures: `ELDAK`. + +**Dunedin** + + - The following procedure has been added: `MIPAK 1C`. + +**Palmerston North** + + - The following procedures have been amended and resequenced: `RUXOX 4Q`, `RUXOX 5S`, `DADLI 3Q`, `DADLI 4S`, `DADLI 4T`, `TEROT 4Q`, `TEROT 4S`, `GUTNI 3U`, `GUTNI 4T`, `GUTNI 4R`, `GUTNI 3P`. + +**Taupo** + + - Procedural fixes on RNP approaches have been replaced by ICAO 5LNC wpts. + - The following procedures have been amended and resequenced: `MINEK 3`, `GOSTI 3A`, `ISGIT 2A`, `SULFA 3A`, `TEREG 3`, `GOSTI 3B`, `ISGIT 1B`, `SULFA 3B`. + +**Standard Routes** +The following Standard Routes have been updated or added: `AAPM5`, `HNPM5`, `NPPM1`, `PMAA6`, `PMNP2`, `PMWU1`, `WUPM3`. \ No newline at end of file diff --git a/Airspace.xml b/Airspace.xml index 3f1fc3d..2606b41 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -18,7 +18,7 @@ - + @@ -62,6 +62,7 @@ + @@ -77,21 +78,22 @@ - + - - - + + + - - + + - + + @@ -213,6 +215,7 @@ + @@ -628,16 +631,16 @@ - - - + + + - - - - + + + + - + @@ -645,10 +648,10 @@ - - - - + + + + @@ -1408,8 +1411,7 @@ WN VOR OH VOR/ -RUGVI/ -UGIPO/ +AVKAB/ ARETI/ TM NDB/ DABKA/ @@ -1438,14 +1440,15 @@ RIDLA/ OPAPA -RUGVI/ +AVKAB/ +UPREM/ IGDOT/ NP VOR NR VOR/ GENDA/ -TAIKI/ +OBDEV/ AP NDB/ GOSTI/ KARBA/ @@ -1583,7 +1586,7 @@ HN VOR PM VOR/ -RUGVI +AVKAB OMDOX/ @@ -1601,7 +1604,7 @@ PM VOR/ APITI/ RUAHI/ TARUA/ -TAIKI/ +OBDEV/ AKMAG/ RO VOR @@ -1715,7 +1718,7 @@ KAPTI/ WU NDB -RUGVI/ +AVKAB/ WU NDB/ MEVAX @@ -1912,6 +1915,11 @@ UDUMA XELAN/ THANG/ MERAS + + +ANOPA/ +NODOD/ +PUBUD GUMPI/ @@ -1961,12 +1969,7 @@ OBLIX/ RILVA/ IDVEX/ LEGIK/ -PAVDO/ -NURLA/ -TUSVI/ -AVGAM/ -IDIXI/ -NOVTO +PAVDO TAYLA/ @@ -1978,10 +1981,7 @@ GUMPI/ POPUP/ REVMU/ APORO/ -VARGU/ -SOVBA/ -ESKOD/ -NOMAP +VARGU LEGIK/ @@ -2019,6 +2019,10 @@ BIBMA/ BROAD/ NZJK/ KT NDB + + +URGAB/ +ADLED TANIG/ @@ -2197,13 +2201,7 @@ KABIN/ MOLGI/ CH VOR/ OKTOM/ -OLBAD/ -NOKAK/ -BOMTI/ -VEMET/ -PABGO/ -ISPAK/ -RG VOR +OLBAD AA VOR/ @@ -2305,8 +2303,7 @@ IBULI/ WK NDB -RUGVI/ -LENTU/ +AVKAB/ ADRAD/ OMBUB/ OPABI @@ -2557,6 +2554,7 @@ MERAS AVKEX/ +TPAPA/ MEVAX/ OPABI @@ -2938,6 +2936,7 @@ CH VOR KAPTI/ +OVKOX/ BEDUL/ DAGOM/ OMBUB/ @@ -2977,6 +2976,7 @@ SEBRU CH VOR/ GRETA/ LUXEV/ +KAKUR/ WARDS/ OMDOX/ WN VOR @@ -3033,11 +3033,6 @@ GULOV ALADA/ SILVO/ LIKTU - - -DUKUT/ -UGIPO/ -LENTU DOPKI/ @@ -3278,6 +3273,11 @@ IDLUR BIKOT/ UKLAV/ MERAS + + +WU NDB/ +VIROL/ +PM VOR NUKTO/ @@ -3458,6 +3458,7 @@ RILEY -142154.800-1704558.570 -205355.570-1601332.700 -373258.360+1754650.550 + -450904.190+1684350.010 -370101.801+1745934.440 -370228.741+1745740.320 -370858.060+1732652.310 @@ -3520,9 +3521,11 @@ RILEY -445742.100+1682901.760 -422336.660+1734502.840 -402930.080+1753609.940 + -395053.280+1752215.020 -411109.040+1742144.560 -361502.000+1753520.220 -445900.560+1695733.290 + -445744.270+1691510.320 -395610.160+1744749.350 -415405.800+1712651.660 -385027.180+1772327.700 @@ -3597,10 +3600,12 @@ RILEY -372741.810+1754434.150 -380442.520+1752551.230 -461216.650+1691354.320 + -444246.570+1691558.310 -403606.460+1750928.520 -461212.350+1683058.730 -352445.510+1735907.850 -455923.730+1695346.330 + -445036.920+1692200.660 -355420.100+1742828.630 -414628.780+1730413.180 -431730.110+1720015.540 @@ -3608,6 +3613,7 @@ RILEY -362338.930+1743158.450 -183020.440-1740720.550 -404752.570+1731401.740 + -450632.280+1690944.590 -215833.460-1604416.780 -433353.690+1723748.480 -142331.750-1704842.910 @@ -3920,6 +3926,7 @@ RILEY -441525.690+1711638.340 -364807.880+1752538.320 -453736.670+1702106.150 + -451735.870+1691916.190 -350652.740+1732054.650 -404206.540+1745501.610 -391152.400+1744828.410 @@ -4076,6 +4083,7 @@ RILEY -401911.600+1752550.090 -352242.120+1742732.360 -422732.920+1734711.410 + -451751.040+1684455.760 -365312.400+1754145.530 -154950.150-1735319.170 -455210.800+1683622.150 @@ -4152,6 +4160,7 @@ RILEY -372448.310+1745504.810 -374544.980+1750918.360 -182740.000+1782931.000 + -443856.960+1691030.700 -390221.110+1740207.280 -461622.140+1700849.000 -385349.340+1741709.090 @@ -4167,11 +4176,13 @@ RILEY -441933.640+1695409.870 -383950.700+1765657.920 -412649.370+1742245.510 + -412146.220+1744816.120 -443805.830+1680008.690 -400014.880+1752434.200 -381020.520+1761311.920 -460210.430+1690147.910 -365027.270+1742304.680 + -444022.750+1690733.340 -455248.050+1701749.180 -363946.740+1755528.730 -400638.780+1754834.680 @@ -4180,6 +4191,7 @@ RILEY -370236.400+1744020.320 -401826.240+1740705.070 -450050.490+1685822.140 + -452713.700+1683557.390 -133427.240-1722606.920 -375616.030+1751823.140 -384627.390+1772308.960 @@ -4205,9 +4217,11 @@ RILEY -385907.580+1770510.220 -411451.280+1744815.790 -410504.710+1731258.360 + -412224.050+1744818.070 -370302.260+1743846.510 -412755.720+1743914.370 -412608.760+1744758.400 + -444500.480+1691915.930 -371457.010+1753534.730 -413856.700+1731425.960 -154843.060-1724834.220 @@ -4255,6 +4269,7 @@ RILEY -450656.360+1694241.190 -415010.470+1713611.850 -373119.250+1753805.400 + -421452.060+1734630.100 -445227.950+1692615.820 -334139.340+1751925.790 -444242.450+1693027.860 @@ -4382,7 +4397,6 @@ RILEY -180406.560-1570000.000 -410728.920+1732134.570 -370449.670+1743215.060 - -394052.740+1751638.650 -401911.670+1753103.810 -413623.240+1732315.190 -371939.490+1741220.160 @@ -4409,6 +4423,7 @@ RILEY -374542.550+1760319.260 -365403.800+1744427.210 -454801.700+1701800.760 + -450430.850+1682250.870 -450431.000+1682251.000 -201358.750-1590554.080 -415913.950+1713635.160 @@ -4500,6 +4515,7 @@ RILEY -135819.530-1720446.480 -443632.260+1691606.250 -371137.700+1751755.100 + -452820.420+1683654.620 -411826.620+1732138.040 -430633.730+1731501.880 -391047.450+1734116.690 @@ -4602,6 +4618,7 @@ RILEY -432249.660+1724640.020 -383640.420+1775729.400 -361858.200+1752208.230 + -455326.160+1682001.730 -134856.250-1714241.350 -402245.150+1780606.150 -370242.980+1745247.160 @@ -4650,10 +4667,12 @@ RILEY -392546.100+1731411.700 -390130.090+1735056.790 -393150.210+1662602.450 + -390226.800+1762415.800 -431642.470+1723918.770 -451726.540+1691934.910 -412342.820+1744525.620 -364426.470+1752707.160 + -383520.620+1760526.510 -455946.130+1703725.100 -392441.890+1765224.870 -431918.440+1724328.850 @@ -4700,6 +4719,7 @@ RILEY -383920.870+1760527.190 -445841.970+1690919.590 -410819.040+1744545.450 + -450142.940+1684310.080 -405409.230+1734612.560 -410940.720+1743931.380 -364904.650+1760005.710 @@ -4717,6 +4737,8 @@ RILEY -385303.240+1751934.780 -411104.750+1745608.460 -422452.000+1630000.000 + -411702.990+1744835.200 + -450049.790+1685543.990 -365745.570+1742902.700 -392925.390+1743006.730 -452106.020+1684244.910 @@ -4775,6 +4797,8 @@ RILEY -382946.040+1774413.880 -354912.150+1740616.600 -100000.000-1591805.990 + -402753.380+1745939.950 + -411623.400+1744843.610 -132720.270-1744305.440 -432418.790+1723538.300 -454728.720+1682713.900 @@ -4841,6 +4865,7 @@ RILEY -391004.600+1752210.730 -455728.830+1680104.400 -211209.300-1594253.920 + -445314.600+1710816.260 -365156.950+1750749.210 -390013.010+1735844.300 -411957.160+1743238.320 @@ -4891,6 +4916,7 @@ RILEY -404736.809+1750025.031 -405232.452+1745916.440 -405524.071+1745916.469 + -454651.970+1682552.770 -411836.920+1732837.000 -355453.710+1651346.200 -362659.840+1743508.380 @@ -4985,6 +5011,7 @@ RILEY -090939.020-1575151.220 -410534.040+1733234.490 -423101.380+1711815.800 + -452444.460+1684015.970 -455549.840+1705003.050 -432257.200+1723630.580 -403027.820+1751457.410 @@ -5016,7 +5043,6 @@ RILEY -394610.060+1741518.330 -200000.000-1725547.070 -383036.120+1775417.400 - -395053.280+1752215.020 -413336.630+1740055.800 -454956.060+1704428.180 -355931.800+1752611.040 @@ -5145,6 +5171,7 @@ RILEY -452730.170+1683818.740 -393604.630+1743431.830 -441140.550+1712114.200 + -445719.810+1684749.290 -412535.980+1741105.080 -445520.010+1692729.620 -365349.400+1751353.340 @@ -5156,7 +5183,6 @@ RILEY -381718.440+1761022.870 -431749.120+1722746.420 -404611.180+1741938.640 - -390226.800+1762415.800 -091021.010-1575651.570 -142032.400-1704342.630 -403026.900+1703326.580 @@ -5171,6 +5197,7 @@ RILEY -385543.440+1752348.120 -300000.000-1751742.000 -452322.870+1691833.370 + -453653.240+1682333.460 -405759.980+1745717.510 -200006.000-1773813.000 -373924.490+1752429.110 @@ -5270,10 +5297,10 @@ RILEY -121045.120-1713604.560 -405603.430+1744028.110 -411538.030+1742836.930 - -394340.980+1752147.510 -365845.820+1745414.570 -445423.550+1684824.650 -203430.460-1744504.270 + -450247.740+1710130.090 -370331.810+1743658.850 -364425.720+1755747.080 -370935.380+1750536.960 @@ -5290,6 +5317,7 @@ RILEY -412954.630+1744743.120 -352541.990+1742717.000 -460454.530+1701312.980 + -453845.870+1682357.950 -401101.620+1634403.510 -385704.400+1742024.200 -194816.260-1740935.870 @@ -5303,9 +5331,11 @@ RILEY -441434.630+1704508.600 -365005.920+1744925.220 -400819.440+1753615.280 + -393848.410+1750456.440 -403209.640+1752528.350 -410957.970+1745803.790 -364633.440+1745735.200 + -445756.680+1684814.270 -393530.950+1742145.040 -385012.400+1772834.280 -441830.780+1705849.150 @@ -5377,7 +5407,7 @@ RILEY -410945.110+1733427.180 -460145.090+1690814.000 -432549.950+1722612.830 - -342447.000+1630000.000 + -342446.800+1630000.000 -434110.390+1723236.690 -401922.800+1754515.760 -384402.210+1780007.210 @@ -5386,12 +5416,14 @@ RILEY -362605.900+1744244.010 -365147.460+1750015.660 -181445.000+1765757.000 + -444312.020+1691710.020 -195446.930-1741337.090 -374648.870+1760024.810 -211634.980-1751630.770 -432154.160+1724739.150 -462039.700+1683954.120 -444235.310+1691106.540 + -451820.410+1684507.270 -180855.990-1764839.810 -461446.300+1695319.710 -371603.540+1744850.650 @@ -5979,8 +6011,8 @@ RILEY -395310.900+1745401.170 -382430.600+1763356.500 -442703.800+1675925.200 - -412842.400+1734844.400 -374446.800+1762115.500 + -412842.400+1734844.400 -370437.500+1745541.700 -384742.700+1754801.700 -373146.800+1760754.500 @@ -6553,16 +6585,16 @@ RILEY AP NDB - + MINEK AKNES RUNUP/DOGMO PEBSO/DUDUS + PEBSO/GOSTI PEBSO/ISGIT - PEBSO/KARBA + RUNUP/OBDEV + ONAGO SULFA - RUNUP/TAIKI - TM NDB @@ -6576,16 +6608,16 @@ RILEY - + TEREG VEKPO/AKNES VEKPO/DOGMO DUDUS + GOSTI ISGIT - KARBA - SULFA - VEKPO/TAIKI - TM NDB + VEKPO/OBDEV + PEBSO/ONAGO + PEBSO/SULFA EGUMO/OVPAV/AA VOR @@ -7188,38 +7220,38 @@ RILEY - + DADLI OVRUN/LULKO/APITI IRMIX - + DADLI - ENRUL/RUGVI/ADRAD/OMBUB - ENRUL/RUGVI + ENRUL/AVKAB + ENRUL/AVKAB/ADRAD/OMBUB - + DADLI LAPUN/DUKUT/GULBA/OMBUB - + GUTNI ABTOL TERIL/IVREP/IRMIX LIMPA OKEVO - + GUTNI LULKO/APITI - RUGVI/ADRAD/OMBUB + AVKAB/ADRAD/OMBUB - + GUTNI TERIL/IVREP/LULKO/APITI ANPUG/BEDUL/DAGOM/OMBUB - + GUTNI RINRI/BINIT MIBUS @@ -7232,7 +7264,7 @@ RILEY - + VEPUR/RUXOX ABTOL BINIT @@ -7242,17 +7274,17 @@ RILEY RINRI/SAKBA RINRI/ANPUG/KEVEL/VIROL - + VEPUR/RUXOX - OLMUX/OH VOR/RUGVI/ADRAD/OMBUB - OLMUX/OH VOR/RUGVI + OLMUX/OH VOR/AVKAB + OLMUX/OH VOR/AVKAB/ADRAD/OMBUB - + TEROT - ENRUL/RUGVI/ADRAD/OMBUB - ENRUL/RUGVI + ENRUL/AVKAB + ENRUL/AVKAB/ADRAD/OMBUB - + TEROT LAPUN/DUKUT/GULBA/OMBUB @@ -7742,10 +7774,12 @@ RILEY SALAG UPLAR - - BOVRU/AKBAM/LENGU + BOVRU/EMRAG + + BOVRU/AKBAM/LENGU + DAVEE/OSAKU/ANSER/ZORBA/SABAV/EMRAG @@ -7811,6 +7845,9 @@ RILEY IBESO/MERAS/AA503/VINCE/STEAL/ATAMA + + LUNBI/ARADI/GEWNY/DOMRI/LOSGA/VIBAG/EMRAG + NOBAR/SAMII/TEVUC/EMRAG @@ -7884,22 +7921,25 @@ RILEY PERAS SF NDB - + GOSTI/GUSAG/KALGO - + GOSTI/GUSAG/EMSAR GUMAN/GUSAG/EMSAR - + ISGIT/GUMAN - + + ISGIT/GUMAN/GUSAG/EMSAR + + SULFA/MEXIS/GUSAG/KALGO - + SULFA/AKABA @@ -8012,7 +8052,7 @@ RILEY IGEGA/BLUNT/NODEL/ABVIM - IGEGA/CH412/AVNOP/ERVAX/UBDAN/ALBAD + KIDAL/CH412/AVNOP/ERVAX/UBDAN/ALBAD KIDAL/BOMTU/BLUNT/CH404/ODISI @@ -8131,6 +8171,9 @@ RILEY MIPAK/IPKUG/ADBAD/BIGAR/ESKAT + + MIPAK/IPKUG/ADBAD/IVTOP/ELNEK/AKLAR + APASA/PAROA @@ -8542,7 +8585,7 @@ RILEY IRMIX/UVUSI - + IRMIX/UDODI/PM727/AKNIN @@ -9047,7 +9090,7 @@ RILEY GUMAN KALGO - AP706/OLSEK/AP701/-384404.981+1760513.020 + OBLIV/OLSEK/AP701/-384404.981+1760513.020 AKABA @@ -9883,6 +9926,7 @@ RILEY + diff --git a/Maps/Airspace/AIRPORTS.xml b/Maps/Airspace/AIRPORTS.xml index 2ba5a5b..af79a86 100644 --- a/Maps/Airspace/AIRPORTS.xml +++ b/Maps/Airspace/AIRPORTS.xml @@ -157,6 +157,7 @@ NZQW NZRA NZRC + NZRD NZRI NZRK NZRL @@ -374,6 +375,7 @@ NZQW NZRA NZRC + NZRD NZRI NZRK NZRL diff --git a/Maps/Airspace/ALL_RNAV.xml b/Maps/Airspace/ALL_RNAV.xml index 42fb813..ddc1da2 100644 --- a/Maps/Airspace/ALL_RNAV.xml +++ b/Maps/Airspace/ALL_RNAV.xml @@ -224,8 +224,10 @@ + diff --git a/Maps/Airspace/AIRPORTS.xml b/Maps/Airspace/AIRPORTS.xml index af79a86..d369c98 100644 --- a/Maps/Airspace/AIRPORTS.xml +++ b/Maps/Airspace/AIRPORTS.xml @@ -134,6 +134,7 @@ NZOF NZOG NZOH + NZOI NZOM NZON NZOP @@ -352,6 +353,7 @@ NZOF NZOG NZOH + NZOI NZOM NZON NZOP diff --git a/RestrictedAreas.xml b/RestrictedAreas.xml index aca5577..8c1b0c3 100644 --- a/RestrictedAreas.xml +++ b/RestrictedAreas.xml @@ -1237,6 +1237,49 @@ + + +-391407.840+1775154.740/ +-391409.207+1775214.917/ +-391413.266+1775234.482/ +-391419.894+1775252.841/ +-391428.889+1775309.436/ +-391439.980+1775323.763/ +-391452.828+1775335.387/ +-391507.044+1775343.954/ +-391522.196+1775349.205/ +-391537.824+1775350.978/ +-391553.453+1775349.219/ +-391608.608+1775343.981/ +-391622.828+1775335.423/ +-391635.681+1775323.804/ +-391646.777+1775309.476/ +-391655.778+1775252.877/ +-391702.410+1775234.509/ +-391706.472+1775214.932/ +-391707.840+1775154.740/ +-391706.472+1775134.548/ +-391702.410+1775114.971/ +-391655.778+1775056.603/ +-391646.777+1775040.004/ +-391635.681+1775025.676/ +-391622.828+1775014.057/ +-391608.608+1775005.499/ +-391553.453+1775000.261/ +-391537.824+1774958.502/ +-391522.196+1775000.275/ +-391507.044+1775005.526/ +-391452.828+1775014.093/ +-391439.980+1775025.717/ +-391428.889+1775040.044/ +-391419.894+1775056.639/ +-391413.266+1775115.000/ +-391409.207+1775134.563/ +-391407.840+1775154.740 + + + + -404146.600+1753815.600/ From 7cea10293c0ae0dd67d4cf4461d83250f19d5b19 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Sat, 1 Jul 2023 15:35:22 +1200 Subject: [PATCH 46/50] Fixes OPS-161 and OPS-184: Add all AIP Changes --- .github/changelogs/2023.md | 48 ++++++++++++++++++++++-- Airspace.xml | 73 ++++++++++++++++++------------------ Maps/Airspace/ALL_RNAV.xml | 58 ++++++++++++++-------------- Maps/NZAA/AA_ACU.xml | 22 +++++------ Maps/NZGB/GB_ACU.xml | 36 ++++++++---------- Maps/NZGM/GM_ACU.xml | 11 ++---- Maps/NZHA/HA_ACU.xml | 13 +++---- Maps/NZHK/HK_ACU.xml | 7 ++-- Maps/NZLX/LX_ACU.xml | 52 +++++++++++++++---------- Maps/NZMO/MO_ACU.xml | 77 +++++++++++++++----------------------- Maps/NZQN/QN_ACU.xml | 19 ++++++---- Maps/NZTG/TG_ACU.xml | 20 +++++----- Maps/NZWP/WP_ACU.xml | 20 +++++----- Maps/NZWT/WT_ACU.xml | 44 ++++++++-------------- 14 files changed, 262 insertions(+), 238 deletions(-) diff --git a/.github/changelogs/2023.md b/.github/changelogs/2023.md index dbbd1b8..8af26f4 100644 --- a/.github/changelogs/2023.md +++ b/.github/changelogs/2023.md @@ -117,8 +117,6 @@ Not released due to a lack of applicable changes. Not released due to lack of applicable changes. -# Latest - ## AIRAC 2306 ### Revision A @@ -158,4 +156,48 @@ The following Standard Routes have been updated or added: `AAPM5`, `HNPM5`, `NPP The following procedures have been added or amended: - `NZAA BOVRU 1B`: Had an `A` designator, instead of a `B` designator. - - `NZAP GUMAN 1B`: Was missing, and has been added. \ No newline at end of file + - `NZAP GUMAN 1B`: Was missing, and has been added. + + +# Latest + +## AIRAC 2308 + +### Revision A + +#### ANR Updates + + - New Aerodrome added: `NZOI - Ongaio Island` + - New Restricted Area added: `NZR404 - Mahia` + +**Auckland** + + - The following procedures have been amended and resequenced: `REKIS 4Q`, `STEAL 2P`. + - **Changes:** Departure text amended to no longer allow a turn to fix before the end of the runway. + +**Queenstown** + + - The procedures have been amended and resequenced: `VAPLI 2`. + - **Changes:** Minor track changes to departure. `SUNGU` transition added. + +**Tauranga** + + - Most STARs have been amended and resequenced by one. + - **Changes:** Segment MSAs. + - `OLDON 2A`: WPT `BATAT` replaced by `MEZZO`. + +**Te Anau / Manapouri** + + - The following procedures have been amended and resequenced: `GULAN 3`. + - **Changes:** `ENKUV` transition removed. + +**Standard Routes** + + - The following Standard Routes have been amended: `AACH1` and `AACH6`. + - **Changes:** `AACH1` is now Jets only, with the `AACH6` now being props only. + +#### Dataset Updates + +The following errors have been fixed: + - `NZGB RNP B`: Added missing procedural waypoint: `GB678`. + - `NZHA RNP RWY 32`: Replaced `HA906` with 5LNC `OMUNU`. \ No newline at end of file diff --git a/Airspace.xml b/Airspace.xml index e7f3576..d8864dd 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -14,7 +14,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -422,18 +422,18 @@ - + - + - + - + @@ -711,7 +711,7 @@ - + @@ -749,13 +749,13 @@ - + - - - + + + - + @@ -763,13 +763,13 @@ - + - + - + @@ -4546,6 +4546,7 @@ RILEY -385013.130+1755352.670 -295643.390+1704759.270 -451656.960+1705228.260 + -453222.632+1674152.080 -453153.198+1673832.640 -391006.770+1764457.730 -431752.180+1700055.510 @@ -6013,8 +6014,8 @@ RILEY -395310.900+1745401.170 -382430.600+1763356.500 -442703.800+1675925.200 - -412842.400+1734844.400 -374446.800+1762115.500 + -412842.400+1734844.400 -370437.500+1745541.700 -384742.700+1754801.700 -373146.800+1760754.500 @@ -6229,8 +6230,8 @@ RILEY -444648.160+1691823.210 -445948.600+1684206.700 -411702.800+1730755.500 - -374355.600+1760719.700 -412004.800+1731050.500 + -374355.600+1760719.700 -392539.800+1751654.900 -415229.400+1725138.800 -384417.600+1760100.700 @@ -6557,7 +6558,7 @@ RILEY SELKA TARIB - + VINOD/BUDLU/REKIS KAPAI LIMES/KARRL @@ -6574,7 +6575,7 @@ RILEY IDSEM OLBEX - + STEAL LIMES/KARRL LAMOG/ONISU/OVSIT/LAKES @@ -6979,10 +6980,10 @@ RILEY KAROA - LUGDU - LUGDU - LUGDU - LUGDU + PORUT/LUGDU + PORUT/LUGDU + PORUT/LUGDU + PORUT/LUGDU PORUT/BE NDB PORUT/NV VOR PORUT @@ -6990,7 +6991,7 @@ RILEY PORUT/SW VOR TOMID - + MO552/GULAN MO552/GULAN MO552/GULAN @@ -6998,7 +6999,6 @@ RILEY AFTON ANOPA ENKUV - SUNGU NIPIR/LADIT @@ -7366,12 +7366,13 @@ RILEY REDOL/BASOS/ADLUP SUNGU - + ENKUV/OLREK/TULVU/VAPLI IPNOR/ENRAT/ADKOS IBVUK/SUNGU/BASOS/ADLUP IPNOR/BIKOS/LIBLA AVDEK/DULUL/ANPOV/AKMAD/NONAN/SAVLA + IBVUK/SUNGU AVDEK/DULUL/ANPOV/EPDEX/ATVOR/TIMJO @@ -8741,10 +8742,10 @@ RILEY ISGIT LUMSO - + BIKOT/BERPI/RUSTA - + BIKOT/BERPI/RUSTA/UBSET @@ -8753,19 +8754,19 @@ RILEY FALLS/RUMRA/TODAN - + GOBUK/MORTA GOBUK/TODAN - - OLDON/BATAT/MORTA + + OLDON/MEZZO/MORTA - + OLDON/LINPI/TODAN - + OROPI/MORTA @@ -8777,10 +8778,10 @@ RILEY PIBOV/TODAN - + URBUX/APUNO/KIMAR/RUSTA - + URBUX/APUNO/KIMAR/RUSTA/UBSET @@ -9211,7 +9212,7 @@ RILEY ALDEV ENSOV - GULAN/-45.557250+167.813570/-453204.171+1673946.789 + GULAN/UPGUM/MO401/-453204.171+1673946.789 PANGO diff --git a/Maps/Airspace/ALL_RNAV.xml b/Maps/Airspace/ALL_RNAV.xml index ddc1da2..e0c9fe6 100644 --- a/Maps/Airspace/ALL_RNAV.xml +++ b/Maps/Airspace/ALL_RNAV.xml @@ -251,8 +251,10 @@ ODISI AKLAR ESKAT + OMGET LUVOG VARSI + PAROA ELPAM PAKSA RUGRU @@ -265,11 +267,13 @@ UKLIP ATMAS MAMUS + WAPOU NUKTO UPVOK KARVO ANDEP BEDAV + MAKOS AGTUR EKVIL TAYLA @@ -383,9 +387,11 @@ UPSUV BURLY OPOHO + WYTAK MAKEE HALEN IGOLF + BAYES FLAXX ABUOY BAZEN @@ -399,6 +405,7 @@ WS408 ANSIS PILUP + UGSAP IGOVU OLVOL DUDED @@ -424,7 +431,7 @@ SALEK VESAV IDPAX - HA906 + OMUNU HK406 HK407 LAXOD @@ -434,6 +441,7 @@ DAKTA EMVAN PORUT + UPGUM MS488 MS402 RIKDI @@ -481,10 +489,6 @@ VETUM BUSBI ALBAD - OMGET - PAROA - WAPOU - MAKOS SADUN OLNAN WAIPA @@ -493,9 +497,6 @@ REGAT AVMEB MARKS - WYTAK - BAYES - UGSAP @@ -506,7 +507,6 @@ CH20T OVSED IDPON - GM483 GT403 -39.722220+176.710770 -39.649380+176.763350 @@ -516,6 +516,7 @@ -35.270886+173.916278 KT401 KT501 + LX407 MS603 MS818 MS572 @@ -539,7 +540,6 @@ WR601 WR431 WR983 - WT423 @@ -572,8 +572,10 @@ ODISI AKLAR ESKAT + OMGET LUVOG VARSI + PAROA ELPAM PAKSA RUGRU @@ -586,11 +588,13 @@ UKLIP ATMAS MAMUS + WAPOU NUKTO UPVOK KARVO ANDEP BEDAV + MAKOS AGTUR EKVIL TAYLA @@ -704,9 +708,11 @@ UPSUV BURLY OPOHO + WYTAK MAKEE HALEN IGOLF + BAYES FLAXX ABUOY BAZEN @@ -720,6 +726,7 @@ WS408 ANSIS PILUP + UGSAP IGOVU OLVOL DUDED @@ -748,7 +755,7 @@ SALEK VESAV IDPAX - HA906 + OMUNU HK406 HK407 LAXOD @@ -760,7 +767,7 @@ DAKTA EMVAN PORUT - -45.557250+167.813570 + UPGUM MS488 MS402 RIKDI @@ -817,10 +824,6 @@ ALBAD - OMGET - PAROA - WAPOU - MAKOS SADUN OLNAN WAIPA @@ -829,9 +832,6 @@ REGAT AVMEB MARKS - WYTAK - BAYES - UGSAP LENGU/UGRUS/IGPOL/-370058.741+1744614.819 EMRAG/ORESO/UGOMU/-370023.962+1744820.671 @@ -865,12 +865,12 @@ ODISI/DIVSU AKLAR/OVSED/AGESO/-455602.130+1701114.899 ESKAT/IDPON/BENRU/-455527.761+1701228.030 - OMGET/AVKIN/-361430.210+1752758.990 + OMGET/AVKIN/GB678/-361430.210+1752758.990 LUVOG/OMGET VARSI/OMGET - AVKIN/-361419.669+1752750.512 - AVKIN/-361428.039+1752819.639 - AVKIN/-361435.171+1752822.688 + GB678/-361419.669+1752750.512 + GB678/-361428.039+1752819.639 + GB678/-361435.171+1752822.688 PAROA/AGRIP/GM483/-422757.820+1711113.949 ELPAM/PAROA PAKSA/PAROA @@ -885,7 +885,7 @@ ATMAS/IDPAX/GT403/-435421.931+1700739.900 MAMUS/ATMAS GT403/-435455.541+1700747.791 - WAPOU/HA906/-393328.181+1741610.988 + WAPOU/OMUNU/-393328.181+1741610.988 NUKTO/WAPOU UPVOK/WAPOU KARVO/HK406/-424248.218+1705848.929 @@ -904,13 +904,13 @@ OPARE/-35.343650+173.939047/-35.270886+173.916278/-351546.091+1735449.500 STEED/DAKTA/KT401/-350352.330+1731651.650 PERIA/EMVAN/KT501/-350428.229+1731725.660 - LUGDU/PORUT/-451249.460+1692206.539 + LUGDU/PORUT/LX407/-451249.460+1692206.539 BESMO/LUGDU KAKIT/LUGDU - PORUT/-451222.770+1692208.350 - PORUT/-451233.000+1692219.409 - PORUT/-451259.198+1692227.592 - GULAN/-45.557250+167.813570/-453204.171+1673946.789 + LX407/-451222.770+1692208.350 + LX407/-451233.000+1692219.409 + LX407/-451259.198+1692227.592 + GULAN/UPGUM/MO401/-453204.171+1673946.789 ALDEV/GULAN ENSOV/GULAN MAMOD/MS603/MS488/MS818/-405833.121+1753739.180 diff --git a/Maps/NZAA/AA_ACU.xml b/Maps/NZAA/AA_ACU.xml index 1d3daa9..6b2017c 100644 --- a/Maps/NZAA/AA_ACU.xml +++ b/Maps/NZAA/AA_ACU.xml @@ -144,27 +144,27 @@ RAXIN/TARIB - + AA05R/-36.991111+174.855000/VINOD/-37.118611+174.868889/BUDLU/REKIS - + REKIS/KAPAI - + REKIS/LIMES - + REKIS/LAKES - + REKIS/IPDIN - + REKIS/TULMI @@ -818,23 +818,23 @@ POSUX/VELMO - + -37.031667+174.709444/STEAL - + STEAL/LIMES/KARRL - + STEAL/LAMOG/ONISU/OVSIT/LAKES - + STEAL/IPDIN/NUTRA - + OVSIT/TULMI diff --git a/Maps/NZGB/GB_ACU.xml b/Maps/NZGB/GB_ACU.xml index 538e63c..87370c0 100644 --- a/Maps/NZGB/GB_ACU.xml +++ b/Maps/NZGB/GB_ACU.xml @@ -5,6 +5,7 @@ + OMGET LUVOG VARSI @@ -13,19 +14,17 @@ AVKIN - - OMGET - - OMGET/AVKIN/-361430.210+1752758.990 + + OMGET/AVKIN/GB678/-361430.210+1752758.990 LUVOG/OMGET VARSI/OMGET @@ -33,6 +32,7 @@ + OMGET LUVOG VARSI @@ -41,19 +41,17 @@ AVKIN - - OMGET - - OMGET/AVKIN/-361428.039+1752819.639 + + OMGET/AVKIN/GB678/-361428.039+1752819.639 LUVOG/OMGET VARSI/OMGET @@ -76,6 +74,7 @@ + OMGET LUVOG VARSI @@ -84,19 +83,17 @@ AVKIN - - OMGET - - OMGET/AVKIN/-361419.669+1752750.512 + + OMGET/AVKIN/GB678/-361419.669+1752750.512 LUVOG/OMGET VARSI/OMGET @@ -104,6 +101,7 @@ + OMGET LUVOG VARSI @@ -112,19 +110,17 @@ AVKIN - - OMGET - - OMGET/AVKIN/-361435.171+1752822.688 + + OMGET/AVKIN/GB678/-361435.171+1752822.688 LUVOG/OMGET VARSI/OMGET diff --git a/Maps/NZGM/GM_ACU.xml b/Maps/NZGM/GM_ACU.xml index f9080f8..8c568cd 100644 --- a/Maps/NZGM/GM_ACU.xml +++ b/Maps/NZGM/GM_ACU.xml @@ -69,11 +69,10 @@ - - GM483 - + + PAROA ELPAM PAKSA @@ -82,19 +81,17 @@ AGRIP - - PAROA - + PAROA/AGRIP/GM483/-422757.820+1711113.949 ELPAM/PAROA PAKSA/PAROA diff --git a/Maps/NZHA/HA_ACU.xml b/Maps/NZHA/HA_ACU.xml index 87161c6..35f2d68 100644 --- a/Maps/NZHA/HA_ACU.xml +++ b/Maps/NZHA/HA_ACU.xml @@ -5,27 +5,26 @@ + WAPOU NUKTO UPVOK - HA906 + OMUNU - - WAPOU - - WAPOU/HA906/-393328.181+1741610.988 + + WAPOU/OMUNU/-393328.181+1741610.988 NUKTO/WAPOU UPVOK/WAPOU diff --git a/Maps/NZHK/HK_ACU.xml b/Maps/NZHK/HK_ACU.xml index cd7c747..e6e5d48 100644 --- a/Maps/NZHK/HK_ACU.xml +++ b/Maps/NZHK/HK_ACU.xml @@ -119,6 +119,7 @@ + MAKOS AGTUR EKVIL @@ -127,19 +128,17 @@ HK407 - - MAKOS - + MAKOS/HK407/-424227.950+1705931.448 AGTUR/MAKOS EKVIL/MAKOS diff --git a/Maps/NZLX/LX_ACU.xml b/Maps/NZLX/LX_ACU.xml index 58c6733..6701e3c 100644 --- a/Maps/NZLX/LX_ACU.xml +++ b/Maps/NZLX/LX_ACU.xml @@ -3,7 +3,7 @@ - -45.209167+169.372058/LX32T/LUGDU + -45.209167+169.372058/PORUT/LUGDU @@ -28,6 +28,9 @@ LUGDU/TOMID + + PORUT + BE NDB NV VOR @@ -35,9 +38,7 @@ SW VOR - LX32T LUGDU - PORUT TOMID - + + LX407 + LUGDU @@ -65,7 +68,7 @@ - LUGDU/PORUT/-451249.460+1692206.539 + LUGDU/PORUT/LX407/-451249.460+1692206.539 BESMO/LUGDU KAKIT/LUGDU @@ -80,7 +83,7 @@ - -45.213739+169.368483/LX32T/LUGDU + -45.213739+169.368483/PORUT/LUGDU @@ -105,6 +108,9 @@ LUGDU/TOMID + + PORUT + BE NDB NV VOR @@ -112,9 +118,7 @@ SW VOR - LX32T LUGDU - PORUT TOMID - + + LX407 + LUGDU @@ -142,7 +148,7 @@ - LUGDU/PORUT/-451233.000+1692219.409 + LUGDU/PORUT/LX407/-451233.000+1692219.409 BESMO/LUGDU KAKIT/LUGDU @@ -157,7 +163,7 @@ - -45.216444+169.374331/LX32T/LUGDU + -45.216444+169.374331/PORUT/LUGDU @@ -182,6 +188,9 @@ LUGDU/TOMID + + PORUT + BE NDB NV VOR @@ -189,9 +198,7 @@ SW VOR - LX32T LUGDU - PORUT TOMID - + + LX407 + LUGDU @@ -219,7 +228,7 @@ - LUGDU/PORUT/-451222.770+1692208.350 + LUGDU/PORUT/LX407/-451222.770+1692208.350 BESMO/LUGDU KAKIT/LUGDU @@ -234,7 +243,7 @@ - -45.206325+169.368986/LX32T/LUGDU + -45.206325+169.368986/PORUT/LUGDU @@ -259,6 +268,9 @@ LUGDU/TOMID + + PORUT + BE NDB NV VOR @@ -266,9 +278,7 @@ SW VOR - LX32T LUGDU - PORUT TOMID - + + LX407 + LUGDU @@ -296,7 +308,7 @@ - LUGDU/PORUT/-451259.198+1692227.592 + LUGDU/PORUT/LX407/-451259.198+1692227.592 BESMO/LUGDU KAKIT/LUGDU diff --git a/Maps/NZMO/MO_ACU.xml b/Maps/NZMO/MO_ACU.xml index ed8da07..292e41e 100644 --- a/Maps/NZMO/MO_ACU.xml +++ b/Maps/NZMO/MO_ACU.xml @@ -2,76 +2,68 @@ - + -45.534492+167.662997/MO552/GULAN - + GULAN/AFTON - + GULAN/ANOPA - + GULAN/ENKUV - - - GULAN/SUNGU - - + MO552 + + GULAN AFTON ANOPA ENKUV - SUNGU - + -45.531567+167.643186/MO552/GULAN - + GULAN/AFTON - + GULAN/ANOPA - + GULAN/ENKUV - - - GULAN/SUNGU - - + MO552 + + GULAN AFTON ANOPA ENKUV - SUNGU @@ -109,11 +101,11 @@ - -45.557250+167.813570 + UPGUM - GULAN/-45.557250+167.813570/-453204.171+1673946.789 + GULAN/UPGUM/MO401/-453204.171+1673946.789 ALDEV/GULAN ENSOV/GULAN @@ -122,80 +114,73 @@ GULAN ALDEV ENSOV + UPGUM - + -45.538742+167.648619/MO552/GULAN - + GULAN/AFTON - + GULAN/ANOPA - + GULAN/ENKUV - - - GULAN/SUNGU - - + MO552 + + GULAN AFTON ANOPA ENKUV - SUNGU - + -45.528525+167.643922/MO552/GULAN - + GULAN/AFTON - + GULAN/ANOPA - + GULAN/ENKUV - - - GULAN/SUNGU - - + MO552 + + GULAN AFTON ANOPA ENKUV - SUNGU diff --git a/Maps/NZQN/QN_ACU.xml b/Maps/NZQN/QN_ACU.xml index d380926..d2a426f 100644 --- a/Maps/NZQN/QN_ACU.xml +++ b/Maps/NZQN/QN_ACU.xml @@ -278,28 +278,34 @@ OMLEL/SUNGU - + -45.020000+168.735689/ENKUV/OLREK/TULVU/VAPLI - + VAPLI/IPNOR - + VAPLI/IBVUK/SUNGU/BASOS - + - + VAPLI/AVDEK/DULUL/ANPOV - + + + + ANPOV/EPDEX/ATVOR + + ENKUV + QN05T QN727 @@ -311,7 +317,6 @@ BUGSA DUGAK QN817 - ENKUV METUX ANPOV AKMAD diff --git a/Maps/NZTG/TG_ACU.xml b/Maps/NZTG/TG_ACU.xml index 14b67f9..1761ac7 100644 --- a/Maps/NZTG/TG_ACU.xml +++ b/Maps/NZTG/TG_ACU.xml @@ -58,7 +58,7 @@ - + BIKOT/BERPI/RUSTA @@ -66,15 +66,15 @@ FALLS/VIDOB/MORTA - + GOBUK/MORTA - - OLDON/BATAT/MORTA + + OLDON/MEZZO/MORTA - + OROPI/MORTA @@ -82,7 +82,7 @@ PIBOV/TODAN/MORTA - + URBUX/APUNO/KIMAR/RUSTA @@ -96,7 +96,7 @@ VIDOB GOBUK OLDON - BATAT + MEZZO OROPI PIBOV TODAN @@ -203,7 +203,7 @@ - + BIKOT/BERPI/RUSTA/UBSET @@ -215,7 +215,7 @@ GOBUK/TODAN - + OLDON/LINPI/TODAN @@ -227,7 +227,7 @@ PIBOV/TODAN - + URBUX/APUNO/KIMAR/RUSTA diff --git a/Maps/NZWP/WP_ACU.xml b/Maps/NZWP/WP_ACU.xml index 4d69c40..f596740 100644 --- a/Maps/NZWP/WP_ACU.xml +++ b/Maps/NZWP/WP_ACU.xml @@ -179,21 +179,21 @@ - + + WYTAK + MESUD - - WYTAK - + WYTAK/MESUD/-364746.252+1743715.190 @@ -383,21 +383,21 @@ - + + BAYES + KIBIM - - BAYES - + BAYES/KIBIM/-364706.551+1743820.591 diff --git a/Maps/NZWT/WT_ACU.xml b/Maps/NZWT/WT_ACU.xml index ecd9801..837433b 100644 --- a/Maps/NZWT/WT_ACU.xml +++ b/Maps/NZWT/WT_ACU.xml @@ -29,11 +29,10 @@ - - WT423 - + + UGSAP IGOVU OLVOL @@ -42,28 +41,25 @@ VETUM - - UGSAP - + UGSAP/VETUM/WT423/-364956.302+1754034.741 IGOVU/UGSAP OLVOL/UGSAP - - WT423 - + + UGSAP IGOVU OLVOL @@ -72,28 +68,25 @@ VETUM - - UGSAP - + UGSAP/VETUM/WT423/-364932.250+1754118.780 IGOVU/UGSAP OLVOL/UGSAP - - WT423 - + + UGSAP IGOVU OLVOL @@ -102,28 +95,25 @@ VETUM - - UGSAP - + UGSAP/VETUM/WT423/-364931.570+1754047.730 IGOVU/UGSAP OLVOL/UGSAP - - WT423 - + + UGSAP IGOVU OLVOL @@ -132,19 +122,17 @@ VETUM - - UGSAP - + UGSAP/VETUM/WT423/-364952.342+1754048.749 IGOVU/UGSAP OLVOL/UGSAP From 49df0ecd53c91eb52f8a544e5519d6bfe760923b Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Mon, 17 Jul 2023 17:59:20 +1200 Subject: [PATCH 47/50] Fixes OPS-197: Add SOPs and Changelog URL --- MET.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/MET.xml b/MET.xml index 1be8898..e57cf7e 100644 --- a/MET.xml +++ b/MET.xml @@ -5,10 +5,11 @@ - - - + + + + \ No newline at end of file From 3446d3155c6f21dc547eee89bdf88eb386776945 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Mon, 7 Aug 2023 16:41:58 +1200 Subject: [PATCH 48/50] Add Tasman and other NZZO Sectors --- Maps/Airspace/FIR Boundaries.xml | 58 +++++++++++++++ Profile.xml | 2 +- Sectors.xml | 123 ++++++++++++++++--------------- Volumes.xml | 98 ++++++++++++++++++++++++ 4 files changed, 222 insertions(+), 59 deletions(-) diff --git a/Maps/Airspace/FIR Boundaries.xml b/Maps/Airspace/FIR Boundaries.xml index 65db2ea..da65f75 100644 --- a/Maps/Airspace/FIR Boundaries.xml +++ b/Maps/Airspace/FIR Boundaries.xml @@ -65,5 +65,63 @@ -392213.511+1711704.723/ -390848.597+1713128.005/ -390738.100+1713321.700 + + +-455459.994+1651800.000/ +-450000.000+1630000.000/ +-300000.000+1630000.000/ +-341507.128+1722958.200/ +-343645.730+1715700.871/ +-344915.175+1714212.663/ +-350243.744+1712842.715/ +-351705.755+1711637.346/ +-353215.108+1710602.430/ +-354805.314+1705703.339/ +-360429.530+1704944.901/ +-362120.605+1704411.346/ +-363831.115+1704026.251/ +-365553.417+1703832.490/ +-371319.693+1703832.181/ +-373042.007+1704026.636/ +-374752.362+1704416.310/ +-380442.756+1705000.757/ +-382105.251+1705738.593/ +-383652.034+1710707.458/ +-385155.489+1711823.997/ +-390608.263+1713123.846/ +-390738.032+1713321.982/ +-392213.092+1711705.684/ +-393631.609+1710410.771/ +-395137.731+1705250.543/ +-400725.064+1704310.833/ +-402346.853+1703516.936/ +-404036.022+1702913.548/ +-405745.212+1702504.710/ +-411506.825+1702253.747/ +-412527.005+1702324.000/ +-413400.000+1701435.005/ +-424916.997+1685447.894/ +-424931.815+1683131.106/ +-425057.466+1681610.746/ +-425319.565+1680103.003/ +-425637.138+1674614.112/ +-430048.828+1673150.221/ +-430552.901+1671757.360/ +-431147.256+1670441.408/ +-431829.432+1665208.064/ +-432556.625+1664022.815/ +-433405.701+1662930.902/ +-434253.211+1661937.284/ +-435215.409+1661046.605/ +-440208.278+1660303.155/ +-441227.547+1655630.837/ +-442308.718+1655113.127/ +-443407.095+1654713.035/ +-444517.814+1654433.072/ +-445635.871+1654315.205/ +-450756.160+1654320.832/ +-451913.507+1654450.737/ +-453013.003+1654842.991/ +-455459.994+1651800.000 \ No newline at end of file diff --git a/Profile.xml b/Profile.xml index a493a64..00f316b 100644 --- a/Profile.xml +++ b/Profile.xml @@ -1,6 +1,6 @@ - + diff --git a/Sectors.xml b/Sectors.xml index aae3e37..af08a52 100644 --- a/Sectors.xml +++ b/Sectors.xml @@ -9,13 +9,13 @@ TGS,HTMA - + KAI CTMA - - + + OCR BAY,RAN,ATMA @@ -32,19 +32,26 @@ NAK OHA,TNS,WTMA - - - - - - - - - - - - - + + ARO + ARE,ART + + + ARE + + + ART + + + + + + + + + + + ATMA AARR,ADEP @@ -62,9 +69,9 @@ CTMA - - - + + + OTMA @@ -78,64 +85,64 @@ WTMA - - - - - - - + + + + + + + TDN TGS - - + + TNV - + MFFIS TNR - - + + TNS TNP - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + PPFIS - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/Volumes.xml b/Volumes.xml index 6c12d3f..5035d78 100644 --- a/Volumes.xml +++ b/Volumes.xml @@ -1,6 +1,88 @@ + + + -30.000000-131.000000/ + -90.000000-131.000000/ + -30.000000+163.000000/ + -28.000000+168.000000/ + -25.000000+171.416667/ + -25.000000+180.000000/ + -15.545861-175.675333/ + -05.000000-171.000000/ + -05.000000-157.000000/ + -30.000000-157.000000/ + -30.000000-131.000000 + + + + -90.000000+163.000000/ + -90.000000-131.000000/ + -60.000000-131.000000/ + -60.000000+163.000000/ + -90.000000+163.000000 + + + + -45.916665+165.300000/ + -45.000000+163.000000/ + -30.000000+163.000000/ + -34.251980+172.499500/ + -34.612703+171.950242/ + -34.820882+171.703517/ + -35.045484+171.478532/ + -35.284932+171.277041/ + -35.537530+171.100675/ + -35.801476+170.950927/ + -36.074870+170.829139/ + -36.355724+170.736485/ + -36.641977+170.673959/ + -36.931505+170.642358/ + -37.222137+170.642272/ + -37.511669+170.674066/ + -37.797878+170.737864/ + -38.078543+170.833544/ + -38.351459+170.960720/ + -38.614454+171.118738/ + -38.865414+171.306666/ + -39.102295+171.523290/ + -39.127231+171.556106/ + -39.370303+171.284912/ + -39.608780+171.069659/ + -39.860481+170.880706/ + -40.123629+170.719676/ + -40.396348+170.588038/ + -40.676673+170.487097/ + -40.962559+170.417975/ + -41.251896+170.381596/ + -41.424168+170.390000/ + -41.566667+170.243057/ + -42.821388+168.913304/ + -42.825504+168.525307/ + -42.849296+168.269652/ + -42.888768+168.017501/ + -42.943649+167.770587/ + -43.013563+167.530617/ + -43.098028+167.299267/ + -43.196460+167.078169/ + -43.308176+166.868907/ + -43.432396+166.673004/ + -43.568250+166.491917/ + -43.714781+166.327023/ + -43.870947+166.179612/ + -44.035633+166.050876/ + -44.207652+165.941899/ + -44.385755+165.853646/ + -44.568638+165.786954/ + -44.754948+165.742520/ + -44.943298+165.720890/ + -45.132267+165.722453/ + -45.320419+165.747427/ + -45.503612+165.811942/ + -45.916665+165.300000 + + -36.991944+175.752778/ @@ -982,6 +1064,22 @@ + + NZZO + + + + NZZO + + + + NZCM + + + + NZZT + + BAYS From 984bb2bff443a1c38c14019b6d48f392a85a672d Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Mon, 7 Aug 2023 21:00:47 +1200 Subject: [PATCH 49/50] Update Sectors.xml --- Sectors.xml | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/Sectors.xml b/Sectors.xml index af08a52..3c44ee6 100644 --- a/Sectors.xml +++ b/Sectors.xml @@ -9,7 +9,7 @@ TGS,HTMA - + KAI CTMA @@ -32,14 +32,14 @@ NAK OHA,TNS,WTMA - + ARO ARE,ART - + ARE - + ART @@ -48,9 +48,10 @@ + - - + + ATMA @@ -91,7 +92,7 @@ - + TDN @@ -131,18 +132,18 @@ - + PPFIS - - - - - - - - - - + + + + + + + + + + \ No newline at end of file From d0e96f2a6df0febdbcec3629ea06b92972bf07ef Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Mon, 7 Aug 2023 21:05:31 +1200 Subject: [PATCH 50/50] Update Sectors.xml --- Sectors.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Sectors.xml b/Sectors.xml index 3c44ee6..f677fc4 100644 --- a/Sectors.xml +++ b/Sectors.xml @@ -47,12 +47,16 @@ - + + + + + ATMA AARR,ADEP