From 311fa0bee28cc06f84c09f4d483e5b3faa11a9e3 Mon Sep 17 00:00:00 2001 From: Pip <92968130+codepip55@users.noreply.github.com> Date: Sun, 13 Nov 2022 19:51:19 +0100 Subject: [PATCH 01/22] 2212 DAH Update --- Airspace.xml | 2424 +++++++++++++--------------- MET.xml | 1 + Maps/ALL_AIRPORTS.xml | 62 +- Maps/ALL_CTA.xml | 1 + Maps/ALL_NAVAIDS.xml | 12 +- Maps/ALL_RTES_PTS.xml | 578 +++---- Maps/APP_RNP_ALL.xml | 135 +- Maps/Albury/AY_RWY07.xml | 2 +- Maps/Albury/AY_RWY25.xml | 2 +- Maps/Albury/AY_TCU.xml | 2 +- Maps/Amberley/AM_TCU.xml | 4 +- Maps/Brisbane/BN_RWY01PROPS.xml | 11 +- Maps/Brisbane/BN_RWY19PROPS.xml | 11 +- Maps/Brisbane/BN_RWYSODPROPS.xml | 11 +- Maps/Brisbane/BN_TCU.xml | 13 +- Maps/Brisbane/CG_RWY14.xml | 11 +- Maps/Brisbane/CG_RWY32.xml | 11 +- Maps/Cairns/CS_RWY15.xml | 5 +- Maps/Cairns/CS_RWY33.xml | 5 +- Maps/Cairns/CS_TCU.xml | 5 +- Maps/Canberra/CB_RWY1712.xml | 4 +- Maps/Canberra/CB_RWY3530.xml | 4 +- Maps/Canberra/CB_TCU.xml | 6 +- Maps/Coffs Harbour/CFS_TCU.xml | 14 +- Maps/Darwin/DN_RWY11.xml | 2 +- Maps/Darwin/DN_RWY29.xml | 2 +- Maps/Darwin/DN_TCU.xml | 2 +- Maps/Hobart/HB_RWY12.xml | 6 +- Maps/Hobart/HB_RWY30.xml | 6 +- Maps/Hobart/HB_TCU.xml | 6 +- Maps/Launceston/LT_RWY14R.xml | 2 +- Maps/Launceston/LT_RWY32L.xml | 2 +- Maps/Launceston/LT_TCU.xml | 20 +- Maps/Melbourne/AV_RWY18.xml | 4 +- Maps/Melbourne/AV_RWY36.xml | 4 +- Maps/Melbourne/EN_RWY08.xml | 4 +- Maps/Melbourne/EN_RWY17.xml | 4 +- Maps/Melbourne/EN_RWY26.xml | 4 +- Maps/Melbourne/EN_RWY35.xml | 4 +- Maps/Melbourne/EN_RWYCURFEW.xml | 4 +- Maps/Melbourne/ML_RWY09.xml | 4 +- Maps/Melbourne/ML_RWY09A16D.xml | 4 +- Maps/Melbourne/ML_RWY09LAHSO34.xml | 4 +- Maps/Melbourne/ML_RWY16.xml | 4 +- Maps/Melbourne/ML_RWY16A27D.xml | 4 +- Maps/Melbourne/ML_RWY27.xml | 4 +- Maps/Melbourne/ML_RWY2734D.xml | 4 +- Maps/Melbourne/ML_RWY27LAHSO34.xml | 4 +- Maps/Melbourne/ML_RWY34.xml | 4 +- Maps/Melbourne/ML_TCU.xml | 4 +- Maps/Nowra/NW_TCU.xml | 8 +- Maps/Oakey/OK_TCU.xml | 16 +- Maps/Perth/PE_RWY18.xml | 10 +- Maps/Perth/PE_RWY36.xml | 10 +- Maps/Perth/PH_RWY0306.xml | 10 +- Maps/Perth/PH_RWY2124.xml | 10 +- Maps/Perth/PH_TCU.xml | 10 +- Maps/Rockhampton/RK_RWY15.xml | 2 +- Maps/Rockhampton/RK_RWY33.xml | 2 +- Maps/Rockhampton/RK_RWY33A15D.xml | 2 +- Maps/Rockhampton/RK_TCU.xml | 2 +- Maps/SECTOR_FREQS.xml | 5 + Maps/Sunshine Coast/SU_RWY13.xml | 1 + Maps/Sunshine Coast/SU_RWY31.xml | 1 + Maps/Sunshine Coast/SU_TCU.xml | 3 +- Maps/Sydney/RI_RWY10.xml | 2 +- Maps/Sydney/RI_RWY28.xml | 2 +- Maps/Sydney/SY_RWY07.xml | 2 +- Maps/Sydney/SY_RWY16PROPS.xml | 2 +- Maps/Sydney/SY_RWY25.xml | 2 +- Maps/Sydney/SY_RWY34PROPS.xml | 2 +- Maps/Sydney/SY_RWYCURFEW.xml | 2 +- Maps/Sydney/SY_RWYSODPROPS.xml | 2 +- Maps/Sydney/SY_TCU.xml | 2 +- Maps/Tamworth/TW_TCU.xml | 4 +- Maps/Tindal/TN_RWY14.xml | 4 +- Maps/Tindal/TN_RWY32.xml | 4 +- Maps/Tindal/TN_TCU.xml | 6 +- Maps/Townsville/TL_RWY01.xml | 6 +- Maps/Townsville/TL_RWY19.xml | 6 +- Maps/Townsville/TL_TCU.xml | 6 +- Profile.xml | 4 + RestrictedAreas.xml | 170 +- Sectors.xml | 2 +- 84 files changed, 1756 insertions(+), 2016 deletions(-) diff --git a/Airspace.xml b/Airspace.xml index ce32f3f4..26444598 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -424,7 +424,6 @@ - @@ -440,7 +439,6 @@ - @@ -452,8 +450,6 @@ - - @@ -489,12 +485,12 @@ - - - - + + + + - + @@ -1119,7 +1115,7 @@ ELBIS OVRON/ ELDEK/ LEEAM/ -PADDY/ +VEMLA/ TEKEP/ IGLET/ SALAG @@ -1155,13 +1151,13 @@ TN VOR/ OPEKO/ MIGAX/ NIVED/ -TASHA/ +RILVO/ ONELU/ OMUBI/ UNVAT/ WINKY/ SCOTT/ -ELLAS/ +DUBUD/ RIGMI/ UPLAR @@ -1183,7 +1179,7 @@ ATMAP NOBAR/ SHAZA/ JORDY/ -NATLI/ +UPSAD/ UBLIN/ VIRAR/ PUPEX/ @@ -1236,7 +1232,7 @@ GURVA/ RIPNA/ IKODA/ PUGEL/ -SETER/ +PONUX/ BIXAD @@ -1309,7 +1305,7 @@ CS VOR NOBAR/ BEADS/ -PADDY/ +VEMLA/ ISTEM/ MEPAB/ SON NDB/ @@ -1336,7 +1332,7 @@ IBAKA NOBAR/ IFFEY/ MISLY/ -TABAL/ +LENRI/ VESUN/ POXAK/ LTO VOR/ @@ -1367,7 +1363,7 @@ SGE NDB/ PUDUR/ OMUBI/ DOLIB/ -BIDAG/ +ONARA/ GULOP/ VEVAV/ ROOKI/ @@ -1438,7 +1434,7 @@ XMX VOR PKS VOR/ KADUV/ -TAROR/ +VAGPO/ EVIEC/ GOKEN/ GUGAB/ @@ -1463,8 +1459,8 @@ BIKER/ VINAX/ TAVEV/ ROM NDB/ -MIMMI/ -MORRO/ +RILGO/ +LIKTO/ WOODY/ BN VOR @@ -1473,7 +1469,7 @@ BN VOR/ UGTUG/ SAVER/ BONEY/ -TABAL/ +LENRI/ DOVOM/ UBDAK/ DALOS/ @@ -1492,7 +1488,7 @@ HN VOR WP VOR/ -ATERA/ +SOVRO/ BEGMI/ PASNI @@ -1539,7 +1535,7 @@ NATYA MUDGI/ ATMIX/ NBR NDB/ -HACHI/ +SULMI/ NITTA/ OVRON @@ -1562,7 +1558,7 @@ ML VOR MK VOR/ MAGRA/ -MIMMI/ +RILGO/ ROKUU/ AKOGO/ PEXUM/ @@ -1585,7 +1581,7 @@ CRAVN/ SORTI/ LOSKU/ VEGAH/ -GAMBL +IDNER LEC NDB/ @@ -1616,7 +1612,7 @@ LEC NDB ML VOR/ SUNTI/ -BENZO/ +AVNAS/ IRSOM @@ -1751,7 +1747,7 @@ MUDGI/ TW VOR/ PEBDO/ WHITI/ -GAMBL/ +IDNER/ BLAKA/ MOOVI/ LAGOB @@ -1783,7 +1779,7 @@ MESIM/ CORKY -GAMBL/ +IDNER/ SANAD @@ -1796,9 +1792,9 @@ BOREE JANUS/ NERTI/ -EGORE/ +SURVO/ NTN NDB/ -BIDAG/ +ONARA/ TL VOR @@ -1831,9 +1827,9 @@ AD VOR CS VOR/ CARBA/ KOOKA/ -PILLO/ +AROXO/ GV VOR/ -COLLA/ +TUSTU/ RAGER/ DN VOR/ HELLI/ @@ -1860,7 +1856,7 @@ PD VOR TL VOR/ ALBEE/ WISKA/ -RUSSO/ +OKODU/ PENAR/ MA VOR @@ -1971,8 +1967,8 @@ ANZAC/ GAFER/ VINAX/ MA VOR/ -TASHA/ -BIDAG/ +RILVO/ +ONARA/ BULOK/ MUSEY/ NONUM/ @@ -2021,7 +2017,7 @@ KU VOR SAVER/ WODAY/ SIFRA/ -NATLI/ +UPSAD/ TESAS/ RUNOD/ KABKA @@ -2030,7 +2026,7 @@ KABKA KABIN/ EKODA/ OMKIN/ -COOPS/ +KAGRI/ ECKHO/ MILLA @@ -2045,8 +2041,8 @@ TAGOD/ TUNGO/ TASUM/ HEWIT/ -COOPS/ -TUBBY/ +KAGRI/ +TUVBI/ MIDAT/ UNTET/ VELMO @@ -2062,13 +2058,13 @@ BANKS/ SCRUB/ PALTI/ TOPIR/ -REVOP +AVPAL TESAT/ EVONN/ GEROS/ -WALTZ/ +ERVON/ LEGAN/ LUNBI @@ -2092,7 +2088,7 @@ MERIB MILLA/ GIVID/ -GILLY/ +BOTGU/ TOMAR/ GOPLU @@ -2151,7 +2147,7 @@ MUTMI/ ELATI -JUMPA/ +SAKBI/ SIFRA/ LAMSI @@ -2202,7 +2198,7 @@ ML VOR/ BADGR/ ANGEX/ GEMAC/ -MIKEL/ +MIKEG/ SASRO/ PEBLU @@ -2233,33 +2229,33 @@ WAREN ADKOS/ DADLU/ OMKIN/ -MIKEL/ +MIKEG/ TONIM LIBLA/ MADOK/ NUMSA/ -JUMPA/ +SAKBI/ MISLY/ LAMSI/ SCOTT MUBID/ -GRABL/ +NODEV/ HAMTN SUGAB/ -CAMEL +NOMAV MEPEM/ ATROP -HOOKS/ +OMLAV/ WOL NDB @@ -2271,13 +2267,13 @@ CLAMY/ COBEL/ CRICK/ ESP VOR/ -KATHI/ +ESMIN/ HAMTN/ BEVLY/ PH VOR -HACHI/ +SULMI/ ROM NDB/ VOMPA/ TL VOR @@ -2300,7 +2296,7 @@ TAPIT/ KALSA/ BAXMN/ TODIK/ -REVOP +AVPAL AVNEX/ @@ -2337,7 +2333,7 @@ KELPI BIDAP/ SHADY/ -CAMEL/ +NOMAV/ COPDI/ DALWU @@ -2365,8 +2361,9 @@ SOSTU TL VOR/ ANRUB/ -BOXER +MATAR + BIVAT/ MESED/ @@ -2380,7 +2377,7 @@ FAGIN/ FILET/ FLAKE/ DUNDA/ -GRABL +NODEV AD VOR/ @@ -2401,9 +2398,9 @@ BUDLO/ DONDI/ NWN VOR/ OPALL/ -WEEDA/ +UNVAX/ DALWU/ -REVOP/ +AVPAL/ HINDS/ CALIG/ JULIM/ @@ -2411,7 +2408,7 @@ WOORA/ PH VOR -ELLAS/ +DUBUD/ GATER/ SAVER @@ -2430,7 +2427,7 @@ BIRER/ HAMTN -MORRO/ +LIKTO/ UNVAT @@ -2453,7 +2450,7 @@ BN VOR/ SAMVI/ RUDEY/ MESED/ -MORRO/ +LIKTO/ ROM NDB @@ -2519,6 +2516,7 @@ CS VOR GOMOL/ MAKRU/ +RULUN/ ITIDE/ BICKL/ SU VOR @@ -2536,7 +2534,7 @@ DOBGO VALRA/ WELLS/ WLU NDB/ -CAMEL +NOMAV BIRDY/ @@ -2574,8 +2572,8 @@ PD VOR/ GOOTA/ TUREK/ HALEM/ -RANGR/ -REVOP +RULVI/ +AVPAL DUMAV/ @@ -2646,9 +2644,9 @@ MIMIB/ VILOL/ TAVEV/ SARIK/ -TASHA/ +RILVO/ RUVAP/ -EGORE/ +SURVO/ DUMAV/ IGOPO/ GUTEV @@ -2748,9 +2746,9 @@ LEC NDB BORTO/ GRACY/ -KAYTU/ +OKISI/ DOTVU/ -SALEM/ +URBEN/ CLARK/ TASUM @@ -2854,7 +2852,7 @@ MILIV/ DOTAP/ VINAX/ NONET/ -KARAG/ +VEPAP/ ENPAG @@ -2901,7 +2899,7 @@ HARIZ/ SCO NDB -SETER/ +PONUX/ ATROP/ TEBOT/ BN VOR @@ -2961,7 +2959,7 @@ CLEOS BISAB/ -GORDO/ +AVNIB/ KEBAB/ WARTY/ NONID @@ -2975,7 +2973,7 @@ OCTOB/ SHEPP -EGORE/ +SURVO/ TRUKA/ BUNDY @@ -3065,7 +3063,7 @@ DUGGI/ TEMIS -STURT/ +LAKAV/ MOG NDB @@ -3090,7 +3088,7 @@ JILGO/ MEK VOR/ MOG NDB/ OVLUK/ -MOROK/ +TEBIP/ CONNI/ WOORA @@ -3100,7 +3098,7 @@ LAMUG TESAT/ -CORDO/ +PEGSU/ EXETA/ BUNGO/ CB VOR/ @@ -3138,7 +3136,7 @@ DERRY/ AKMIR -CORDO/ +PEGSU/ ATGOD/ COM NDB/ SULDA/ @@ -3286,7 +3284,7 @@ HAWKE IRSOM/ -LIFFY/ +LAXOT/ MORGO/ TASUM @@ -3339,7 +3337,7 @@ DUNNE/ MONTY -CORDO/ +PEGSU/ NWA NDB @@ -3368,7 +3366,7 @@ PLC NDB WYY NDB/ -LIFFY +LAXOT LTV NDB/ @@ -3381,7 +3379,7 @@ CWR NDB/ RUPEM/ TOROB/ REVKI/ -WATLE +DARGI CDU NDB/ @@ -3518,12 +3516,13 @@ CWR NDB/ MUDGI -CORDO/ +PEGSU/ GLB NDB/ CB VOR OTKUN/ +UPTEK/ BUVEL/ ONGAR/ GEL VOR/ @@ -3557,7 +3556,7 @@ WLM NDB ML VOR/ -LLOYD/ +IGNES/ TEMPL/ AV VOR @@ -3572,7 +3571,7 @@ DOTTE/ HUG NDB/ SLASH/ MOVBA/ -ARTON/ +AKEVU/ UNVAT @@ -3657,7 +3656,7 @@ ABA NDB SUSGI/ -FORTT/ +KRATT/ EML NDB @@ -3697,7 +3696,7 @@ HODDA/ KARSI/ SNOOD/ ENRES/ -CRISO/ +LERGU/ MA VOR @@ -3759,7 +3758,7 @@ UNSOV GOMOL/ -GAMBL/ +IDNER/ CFS VOR/ SORTI/ OLTIN/ @@ -3779,7 +3778,7 @@ LT VOR LTV NDB/ -HELIX/ +ELMOR/ LT VOR @@ -3791,11 +3790,11 @@ NBR NDB YHOT/ -MIBOX/ +SOVRU/ CB VOR -GAMBL/ +IDNER/ GFN NDB/ CFS VOR/ PMQ NDB/ @@ -3853,7 +3852,7 @@ AD VOR LRE NDB/ MOVBA/ -BURTO/ +NOKAV/ LUKPU/ ESLAR/ LEMER/ @@ -4023,7 +4022,7 @@ CCY NDB/ FLATS/ NTN NDB/ KERIN/ -TEDDY/ +PUBOX/ WP VOR/ HID NDB @@ -4080,7 +4079,7 @@ MOR NDB NONUM/ ISMUN/ -SAVAN/ +IKOLA/ MA VOR @@ -4112,7 +4111,7 @@ CFS VOR ROM NDB/ -LORNE/ +ARUTA/ BELUL/ LRE NDB/ VATKO @@ -4150,7 +4149,7 @@ LRE NDB WLU NDB/ MEK VOR/ JAYBE/ -BLIGH/ +TEROG/ GEL VOR @@ -4192,7 +4191,7 @@ VESOP AGETA/ SGE NDB/ -BONGO/ +OLGUM/ ALORA/ DEBEE/ HUUGO @@ -4211,15 +4210,15 @@ IBUSU/ YARDD/ LITEL/ MA VOR/ -MIDEL/ -HAMER/ -MORIS/ +MADLU/ +MANSA/ +IPMAD/ CV NDB/ -BAMBI/ +RIRSA/ ALONE/ OK VOR/ DEBEE/ -GAMBL +IDNER CANTY/ @@ -4238,7 +4237,7 @@ MGD NDB/ YMGB/ YELD/ GV VOR/ -CARDO/ +BUPMO/ GULFF/ VEVAV @@ -4256,10 +4255,10 @@ BN VOR/ RUDEY/ OK VOR/ MATVI/ -DAMIN/ +SHIKO/ ROM NDB/ CV NDB/ -NIKIL/ +MIPAM/ PEPPY/ BDV NDB @@ -4282,7 +4281,7 @@ PMQ NDB WENDY/ -LLOYD/ +IGNES/ ESDAN/ MB NDB @@ -4355,7 +4354,7 @@ BRM NDB ML VOR/ MENOG/ TAITE/ -ROHAN/ +TUVRA/ KII NDB @@ -4519,7 +4518,7 @@ PKS VOR GOMOM/ -BROAD/ +PADBU/ TASUM @@ -4560,8 +4559,8 @@ DN VOR/ RUSKA/ DUMPA/ GTE NDB/ -ARGON/ -JUDIE/ +DOMTI/ +ANLAR/ VEVAV/ COE NDB/ LHR NDB @@ -4618,14 +4617,14 @@ NTN NDB LAGOB/ FAUKS/ BNA NDB/ -GAMBL +IDNER MONTY/ WAREN/ SUNTI/ JACKA/ -CAMUS/ +AKLAB/ WYY NDB @@ -4641,7 +4640,7 @@ GODIM BELUL/ -OLLIE/ +SUPGA/ UNVAT/ SANDI/ SU VOR @@ -4759,7 +4758,7 @@ MB NDB KII NDB/ THRUM/ WYY NDB/ -ATILA/ +GOTLU/ CLARK @@ -4808,7 +4807,7 @@ MUDGI KII NDB/ -SOFIE/ +GULNU/ JACKA/ ONAGI @@ -4846,7 +4845,7 @@ DAPMA ROONY/ RIDVO/ -GAMBL/ +IDNER/ IVL NDB @@ -4968,10 +4967,10 @@ MER NDB CV NDB/ -TERIK/ +TUNGU/ LRE NDB/ TAXUM/ -DYMON/ +MEGOL/ CCY NDB @@ -4982,7 +4981,7 @@ MAKIV WOL NDB/ ODALE/ -WATLE +DARGI BOGES/ @@ -5001,7 +5000,7 @@ ESDIG TL VOR/ BOWLY/ -FOYLE/ +ENSAB/ LRE NDB @@ -5022,7 +5021,7 @@ LUKPU BOGES/ -MIBOX/ +SOVRU/ COM NDB/ URBOB @@ -5080,7 +5079,7 @@ TW VOR TNK VOR/ -MOREL/ +PANRO/ MEPAS/ MA VOR/ CCY NDB/ @@ -5172,7 +5171,7 @@ AVBEG SUSGI/ RUROX/ -MANDO/ +BIMAV/ YMMU/ NIPOM @@ -5205,7 +5204,7 @@ NWN VOR DU NDB/ GDH NDB/ ALDAR/ -GAMBL/ +IDNER/ HUUGO/ DULIN @@ -5229,8 +5228,8 @@ LUKPU LHI NDB/ -KANGA/ -KOALA/ +RIBLU/ +BENVO/ PMQ NDB/ SORTI @@ -5242,7 +5241,7 @@ VINOP NWA TAC/ ABASS/ -HOOKS/ +OMLAV/ DONIC @@ -5283,9 +5282,9 @@ AKMIR OOM NDB/ ORTOS/ KIDEX/ -FREDD/ +LEPTA/ CV NDB/ -ARTON/ +AKEVU/ EML NDB/ PN VOR @@ -5309,7 +5308,7 @@ MUSOP/ AVBEG/ KEDDY/ AKMIR/ -WATLE +DARGI TW VOR/ @@ -5433,11 +5432,11 @@ VALDZ/ MA VOR/ TEXAN/ PETRL/ -BARON/ +GUKVI/ TN VOR -PIGGY/ +TEDEB/ LOUEY/ DEWEY/ SAVER/ @@ -5445,8 +5444,8 @@ ENAID ROM NDB/ -DINOS/ -ETHER/ +ESLES/ +LIDBU/ VALDZ @@ -5468,14 +5467,14 @@ CFS VOR/ GALON/ POSUM/ LHI NDB/ -OCTAN +LADUR OTLED/ ESDEG -KARAG/ +VEPAP/ VELGI/ MAKKA/ TARAL @@ -5513,7 +5512,7 @@ YORKE PH VOR/ AVNEX/ ESDEG/ -CULAB/ +OSTOL/ MADOG/ VETEL @@ -5530,6 +5529,7 @@ ROWLO CS VOR/ +BODAP/ SWIFT/ WALTA/ COCKA/ @@ -5559,7 +5559,7 @@ GLENN/ BN VOR -WATLE/ +DARGI/ ANPEN/ GOMUB/ NOLEM/ @@ -5635,7 +5635,7 @@ COBRA PH VOR/ AMANA/ -KARAB/ +LAKIR/ MANIG/ LAKMO/ ANKEL/ @@ -5657,7 +5657,7 @@ EGUGO/ REBEG -BOXER/ +MATAR/ MIMIB/ SAPNO/ BORLI @@ -5674,7 +5674,7 @@ LAMUG MANIG/ -KONIL/ +ENGUD/ YEEDI/ LST NDB/ AGREK/ @@ -5698,7 +5698,7 @@ PUDUR/ PONAN -NORIC/ +NINEK/ RUGBO/ YKAR @@ -5713,7 +5713,7 @@ GOMOL ESDEG/ -JANNA/ +KAYOK/ SCRUB/ REMBO/ BUTON/ @@ -5751,7 +5751,7 @@ TYNDI/ WENDY -SALEM/ +URBEN/ MORGO @@ -5793,7 +5793,7 @@ COOLA/ SUSGI -KARAB/ +LAKIR/ BOSLI/ YOKRA/ LEO NDB/ @@ -5804,7 +5804,7 @@ WINAL/ HERMA -TAROR/ +VAGPO/ VELGI @@ -5880,7 +5880,7 @@ BAROW CS VOR/ NORIS/ -MASHA/ +RUMGI/ YPMP @@ -5903,9 +5903,9 @@ OVRON PH VOR/ RAVON/ -NORIC/ +NINEK/ DUTAK/ -STURT/ +LAKAV/ WIRAL/ MURCH/ KABRO @@ -5915,9 +5915,9 @@ LEO NDB/ MULDM -ROSMO/ +AVGIK/ KATCM/ -SISTA/ +VIROK/ KG VOR @@ -5945,15 +5945,15 @@ PH VOR GEL VOR/ -IRWIN/ +AVDIS/ HINDS/ -MOROK +TEBIP OK VOR/ -CHAPL/ +MUPIK/ COLLY/ -CRIST/ +NUBTA/ YLLE/ TIGGA/ OOM NDB @@ -5980,7 +5980,7 @@ GORKA TL VOR/ -CONOR/ +KADMU/ PUDIN/ KAKTU @@ -6006,9 +6006,9 @@ YQLP/ CV NDB -NORIC/ +NINEK/ LAKMO/ -NALLY/ +OMLAT/ WLU NDB @@ -6032,7 +6032,7 @@ ONEGI/ URAMU/ LIRRI/ ENTAL/ -CAMEL/ +NOMAV/ OVLUK @@ -6055,9 +6055,9 @@ ISMUD RAVON/ -ROSMO/ +AVGIK/ VILOD/ -KONIL/ +ENGUD/ BULGI/ MIDIM @@ -6132,8 +6132,8 @@ YAMB AMB TAC/ BAKEL/ -GAMBL/ -PIGGY +IDNER/ +TEDEB WAYS/ @@ -6189,16 +6189,6 @@ BOFOR -282037.600+1535209.600 -301922.000+1515442.700 -190102.800+1464748.500 - -243610.900+1185057.020 - -244137.200+1185300.430 - -244514.730+1184806.930 - -243851.680+1184227.120 - -244014.530+1184743.720 - -243846.380+1182328.790 - -243319.680+1182126.710 - -243606.680+1183159.090 - -242943.010+1182620.510 - -243443.270+1182642.840 -162409.000+1282728.200 -162248.200+1283316.300 -163208.800+1282927.800 @@ -6235,7 +6225,6 @@ BOFOR -191109.100+1464922.500 -235558.500+1335119.500 -122607.300+1305634.100 - -295443.100+1150000.000 -342230.500+1550950.100 -312359.000+1483230.000 -185707.600+1462625.500 @@ -6244,7 +6233,9 @@ BOFOR -142915.100+1082633.300 -264226.700+1532138.200 -154956.900+1114542.100 + -243836.000+1472724.000 -271415.400+1401106.500 + -400000.100+1453045.600 -312530.600+1155905.400 -341042.800+1500624.300 -331408.600+1491405.800 @@ -6351,6 +6342,7 @@ BOFOR -125611.300+1253732.600 -275901.100+1182712.500 -335911.900+1505835.400 + -150006.000+1400000.000 -121932.700+1313447.600 -125044.900+1303759.500 -382609.200+1470942.100 @@ -6386,7 +6378,6 @@ BOFOR -265550.200+1323557.000 -321104.300+1455147.200 -373215.600+1445211.600 - -142506.500+1375716.600 -302110.200+1514624.500 -302326.400+1515230.100 -302910.900+1515207.700 @@ -6403,13 +6394,14 @@ BOFOR -303207.200+1513616.900 -290702.800+1463702.600 -274031.000+1531549.000 + -132810.700+1390340.300 -190033.600+1461729.300 -355015.200+1473821.800 -373551.100+1451507.900 - -243836.000+1472724.000 -005241.000+1800000.000 -343539.500+1172256.000 -121338.700+1303704.900 + -253230.000+1470948.000 -234803.700+1335336.000 -234843.700+1335450.400 -234900.200+1334857.600 @@ -6480,12 +6472,10 @@ BOFOR -343738.500+1480149.900 -353106.000+1432024.000 -214032.700+1213538.000 - -104942.000+1405728.300 -351041.400+1500202.100 -345600.000+1384454.000 -374319.800+1451300.600 -422621.300+1474118.100 - -414819.700+1462509.000 -332233.100+1154038.300 -281651.500+1533941.900 -411913.600+1464443.300 @@ -6513,6 +6503,7 @@ BOFOR -340328.700+1511217.900 -265542.100+1535606.200 -271627.600+1531858.200 + -255742.000+1443400.000 -262536.000+1510943.000 -271157.600+1523702.300 -400000.000+1450942.000 @@ -6532,14 +6523,21 @@ BOFOR -375444.200+1443115.200 -344942.200+1490231.700 -322313.700+1515535.000 + -292118.900+1150645.600 -294350.900+1494932.600 -152125.400+1225519.500 + -312644.100+1164431.300 -285900.300+1532920.000 -203954.100+1414327.400 + -275238.700+1173204.400 -190530.000+1464452.000 -253003.800+1322405.300 + -334210.800+1511837.900 + -400000.700+1455300.100 -304844.700+1155137.600 + -323244.900+1545503.200 -190529.500+1463136.100 + -303312.500+1163754.400 -323134.600+1374204.000 -315457.700+1152436.200 -373835.700+1443143.600 @@ -6592,7 +6590,6 @@ BOFOR -275158.900+1523529.200 -333427.800+1374726.500 -294733.600+1470618.900 - -264654.000+1480648.000 -320532.100+1161244.200 -311309.400+1354415.600 -305000.000+1414436.000 @@ -6600,9 +6597,7 @@ BOFOR -250112.000+1164630.000 -315148.700+1154151.900 -171248.000+1462148.000 - -424525.100+1472718.400 -350443.700+1385550.800 - -304900.000+1184654.000 -232052.800+1451658.100 -231902.400+1452252.400 -232840.100+1451948.900 @@ -6611,7 +6606,6 @@ BOFOR -232351.300+1452120.600 -233329.000+1451817.000 -125002.100+1302201.600 - -161454.000+1341536.000 -205150.200+1152441.400 -234444.100+1451858.300 -234612.500+1451414.000 @@ -6652,12 +6646,9 @@ BOFOR -123508.100+1305556.800 -284458.000+1464126.300 -271951.700+1530618.000 - -272902.100+1531613.200 -270819.600+1531608.200 -273833.800+1530429.300 - -270902.100+1530422.700 -272352.000+1530922.800 - -271307.000+1530107.300 -272329.000+1530607.400 -272118.800+1530721.800 -241831.300+1453419.000 @@ -6699,7 +6690,6 @@ BOFOR -174117.318+1753915.890 -313614.000+1535936.300 -272937.800+1524455.800 - -272924.200+1501959.100 -171738.200+1220445.000 -422807.600+1472951.700 -103840.000+0935007.500 @@ -6710,11 +6700,9 @@ BOFOR -145547.900+1324038.100 -290609.800+1674538.600 -273327.700+1531247.700 - -272518.400+1530152.200 -280312.000+1470518.000 -174008.000+1764503.000 -095000.000+1402436.000 - -350730.000+1485654.000 -205637.700+1152146.200 -270910.700+1530113.500 -374805.600+1443026.400 @@ -6731,11 +6719,10 @@ BOFOR -164606.000+1454512.000 -140000.000+1470024.000 -143518.000+1443706.000 - -400000.700+1455300.100 + -313002.000+1545916.700 -264325.700+1502557.500 -285018.100+1532754.800 -333647.800+1510658.400 - -350012.500+1385121.500 -163755.300+1455222.400 -274654.000+1531112.000 -345718.200+1440923.800 @@ -6794,7 +6781,6 @@ BOFOR -352755.600+1492005.800 -425933.900+1474316.100 -263927.300+1531550.100 - -181903.500+1431546.800 -242404.600+1231444.300 -353148.000+1490842.000 -265100.000+1485400.000 @@ -6815,7 +6801,6 @@ BOFOR -242938.400+1393409.800 -243341.900+1393056.600 -242119.700+1392801.600 - -293912.000+1130830.000 -344540.100+1381116.900 -341052.200+1503909.600 -273816.200+1522927.100 @@ -6829,6 +6814,7 @@ BOFOR -185355.400+1463835.700 -295342.000+1361212.000 -285224.000+1361236.000 + -232812.000+1492542.000 -294650.600+1181427.100 -345916.900+1381754.500 -425232.500+1473938.300 @@ -6886,7 +6872,6 @@ BOFOR -323735.500+1513556.900 -113453.200+1315752.100 -281200.000+1531318.000 - -280212.000+1160400.000 -265252.000+1533544.000 -371806.500+1434406.900 -371534.300+1435033.800 @@ -6952,7 +6937,6 @@ BOFOR -284717.500+1531821.000 -284917.400+1533623.000 -285307.800+1532138.500 - -271226.000+1531722.000 -272049.800+1515158.700 -271552.000+1531245.000 -373400.600+1445452.100 @@ -6960,11 +6944,11 @@ BOFOR -340609.600+1511341.200 -141806.000+1340424.000 -285553.900+1514050.300 - -341529.100+1160717.100 -345501.500+1382132.300 + -173240.700+1461345.000 -235856.300+1334157.400 - -302812.700+1150000.000 -200737.100+1630000.000 + -413818.800+1471010.800 -424716.300+1474757.600 -141400.000+1330730.000 -333553.000+1374337.400 @@ -6980,13 +6964,11 @@ BOFOR -185422.100+1464159.800 -161043.400+1323741.000 -274830.000+1555430.000 - -280500.000+1502000.000 -280000.000+1100000.000 -272617.200+1513859.400 -290521.900+1680131.400 -301844.500+1401609.300 -340121.400+1510016.300 - -272244.900+1531548.000 -320114.700+1163932.600 -200000.000+1504112.000 -353256.900+1500021.500 @@ -7001,6 +6983,7 @@ BOFOR -311607.600+1173140.600 -323137.000+1504305.500 -272453.500+1530640.900 + -402240.800+1564645.000 -224627.900+1394254.600 -224113.900+1394529.900 -224953.300+1395058.000 @@ -7016,7 +6999,6 @@ BOFOR -230356.000+1395952.000 -225516.800+1395422.800 -204312.000+1455318.000 - -220618.500+1461849.500 -184744.300+1323118.500 -371809.200+1454010.100 -332404.600+1503259.600 @@ -7035,7 +7017,6 @@ BOFOR -311410.000+1510238.700 -345724.800+1385646.500 -180102.900+1220538.100 - -270003.000+1555446.000 -210016.200+1201613.700 -314457.200+1145428.500 -230743.900+1502149.700 @@ -7068,7 +7049,6 @@ BOFOR -175730.400+1221549.600 -175400.600+1220241.500 -175642.100+1221247.700 - -423154.000+1462848.000 -375621.600+1471201.200 -321249.000+1162719.500 -350018.500+1385526.300 @@ -7148,6 +7128,7 @@ BOFOR -260000.000+1100000.000 -270136.500+1531420.200 -262733.200+1531743.800 + -381400.000+1615357.500 -290003.200+1194014.600 -380912.000+1460606.000 -370440.100+1462049.600 @@ -7159,6 +7140,7 @@ BOFOR -372906.000+1381948.000 -273248.600+1271212.900 -342342.000+1385215.000 + -130048.000+1375654.000 -122439.800+1313130.300 -325811.500+1183919.700 -270200.000+1154124.000 @@ -7166,8 +7148,8 @@ BOFOR -424508.800+1472355.600 -211819.800+1492222.000 -270423.000+1525732.700 - -230712.000+1463654.000 -423750.400+1471406.700 + -235523.000+1194705.000 -123542.800+1304102.300 -212448.000+1180506.000 -083248.000+1293954.000 @@ -7211,13 +7193,9 @@ BOFOR -135622.800+1231009.200 -135622.800+1231631.700 -290000.000+1364951.100 - -374018.000+1444142.000 -310159.900+1162641.000 -170000.000+1493913.700 -250000.000+1100000.000 - -291203.900+1183136.400 - -400000.100+1453045.600 - -321327.500+1153541.800 -362530.000+1350000.000 -164938.900+1454334.400 -322225.200+1162717.500 @@ -7228,7 +7206,6 @@ BOFOR -162826.800+1445806.900 -290721.800+1465807.300 -195022.700+1451750.600 - -130048.000+1375654.000 -261303.600+1150000.000 -185157.300+1461555.100 -244033.700+1134547.500 @@ -7247,7 +7224,6 @@ BOFOR -272106.000+1530306.000 -245323.900+1133938.000 -294116.100+1361421.300 - -425243.700+1473410.100 -284255.300+1504529.200 -121108.100+1305919.700 -192824.900+1460329.500 @@ -7421,15 +7397,11 @@ BOFOR -170706.400+1442846.100 -172023.400+1442946.500 -171032.700+1443149.600 - -272709.200+1500000.000 -203724.000+1472354.000 - -275238.700+1173204.400 - -123200.000+1400000.000 -285805.300+1551853.700 -270350.700+1512644.100 -315246.300+1161554.100 -373356.800+1444750.400 - -272628.600+1530330.900 -361618.000+1434118.000 -281700.000+1534138.000 -160928.400+1205809.400 @@ -7467,7 +7439,6 @@ BOFOR -350559.000+1383621.100 -275821.800+1521733.900 -122648.900+1304706.600 - -341336.000+1510000.000 -203617.000+1482727.200 -250047.600+1200023.000 -320406.000+1154212.000 @@ -7560,7 +7531,6 @@ BOFOR -134108.800+1425556.500 -134505.100+1430523.500 -374239.500+1452058.200 - -122041.500+1342444.300 -272922.200+1473622.200 -350210.600+1382413.900 -333308.400+1375103.500 @@ -7580,17 +7550,14 @@ BOFOR -362952.200+1485502.300 -362006.100+1485746.000 -312903.400+1162440.100 - -190550.600+1433938.500 -233517.300+1201725.400 -271058.500+1533942.100 -344813.000+1384625.300 -251800.000+1502204.700 -314751.200+1513154.600 - -412754.300+1575000.500 -293319.700+1175629.500 -354654.000+1473454.000 -263252.400+1531910.300 - -341949.900+1504708.300 -322954.700+1505444.900 -354837.300+1463013.800 -355029.900+1463653.300 @@ -7611,7 +7578,6 @@ BOFOR -273707.900+1531259.600 -315836.100+1154041.900 -274026.000+1525206.000 - -350618.900+1384537.500 -210024.300+1162930.300 -205746.500+1162207.000 -205918.200+1161238.300 @@ -7650,7 +7616,6 @@ BOFOR -221636.200+1193902.700 -124130.400+1314247.900 -320736.000+1514600.000 - -274200.000+1532518.000 -254824.000+1531512.000 -371624.000+1400454.000 -355539.400+1480312.500 @@ -7661,8 +7626,6 @@ BOFOR -360316.800+1480614.500 -361039.500+1475433.000 -342930.000+1250000.000 - -193419.900+1383445.700 - -272831.200+1442713.000 -100614.600+0872140.100 -164009.700+1453917.500 -164357.900+1453316.500 @@ -7726,10 +7689,8 @@ BOFOR -261240.200+1461023.500 -262724.600+1461829.700 -261708.300+1460752.100 - -313316.800+1160727.600 -281420.600+1533239.300 -050000.000-1743904.601 - -274208.400+1160735.200 -344424.000+1492324.000 -312512.100+1171946.200 -313157.300+1172725.600 @@ -7796,7 +7757,6 @@ BOFOR -310722.800+1484502.800 -272815.000+1530323.600 -162118.100+1441607.900 - -265624.000+1500700.000 -352243.700+1491140.100 -212217.200+1211607.600 -275040.400+1384252.400 @@ -7806,6 +7766,7 @@ BOFOR -144329.700+1344419.200 -253524.000+1413030.000 -271336.000+1524817.000 + -335518.000+1502512.000 -374413.800+1443746.100 -102306.000+1594218.000 -202432.600+1454458.800 @@ -7830,7 +7791,6 @@ BOFOR -164605.400+1121208.800 -340624.000+1511206.000 -213508.500+1311253.600 - -374830.000+1444436.000 -285028.500+1505343.900 -315140.600+1162252.900 -320336.000+1160430.000 @@ -7853,7 +7813,6 @@ BOFOR -300331.800+1210138.600 -211817.200+1331127.300 -235248.400+1335151.900 - -255831.100+1472326.500 -400000.000+1454100.000 -335729.500+1511926.000 -335423.300+1520419.000 @@ -7927,10 +7886,10 @@ BOFOR -140900.000+1282600.000 -120730.000+1275230.000 -203039.100+1444357.700 - -375422.700+1445123.700 -020000.000+0875018.000 -410459.900+1472820.300 -275103.300+1531655.700 + -365801.500+1515904.600 -203326.800+1442501.000 -240000.000+1525218.000 -250000.000+1744106.068 @@ -7938,6 +7897,7 @@ BOFOR -344225.100+1383753.800 -273158.000+1532716.000 -162612.800+1150758.200 + -142506.500+1375716.600 -353859.000+1350000.000 -194859.100+1212053.000 -332246.900+1515428.200 @@ -8011,8 +7971,9 @@ BOFOR -153247.900+0850000.000 -231615.600+1274851.800 -271557.100+1533334.100 + -344222.000+1382030.000 + -290030.400+1564139.000 -360854.500+1475142.800 - -351653.200+1491140.000 -275823.800+1413214.800 -323455.900+1550237.100 -140522.900+1262311.700 @@ -8020,6 +7981,7 @@ BOFOR -380353.100+1465359.900 -274343.700+1533151.000 -123206.500+1311654.200 + -304612.000+1144759.000 -363544.700+1462650.000 -373704.000+1450252.200 -223749.100+1193910.100 @@ -8039,6 +8001,7 @@ BOFOR -333904.800+1510558.900 -132652.900+1343049.000 -212539.248+1800000.000 + -211539.600+1363407.400 -324254.000+1215200.000 -340136.000+1511030.000 -375459.000+1460714.600 @@ -8053,8 +8016,6 @@ BOFOR -410612.000+1463714.600 -410942.200+1462743.400 -411100.900+1462409.000 - -213212.000+1414824.000 - -374230.700+1450934.900 -163323.100+1454106.100 -310000.000+1100000.000 -361056.500+1470414.300 @@ -8088,10 +8049,9 @@ BOFOR -330247.100+1515143.500 -223821.400+1170214.200 -201628.000+1453551.500 - -152149.900+1364006.500 + -282338.600+1503358.200 -235053.500+1513255.900 -153035.200+1280905.400 - -272257.600+1530043.500 -303921.000+1203141.600 -304323.000+1203625.900 -304511.900+1202501.200 @@ -8119,7 +8079,7 @@ BOFOR -120045.000+1353208.000 -120259.200+1354512.500 -120116.000+1353509.000 - -120335.000+1352044.100 + -120334.900+1352044.100 -115821.700+1351815.300 -120005.600+1352818.500 -115416.900+1352223.300 @@ -8138,10 +8098,11 @@ BOFOR -432654.800+1630000.000 -344336.200+1384147.300 -315324.600+1160328.300 - -290030.400+1564139.000 -290214.300+1200000.000 -245709.500+1343627.100 + -332737.800+1505015.000 -324214.300+1375715.400 + -400000.100+1465136.500 -263112.000+1531158.000 -160109.700+1431722.200 -320406.000+1485636.000 @@ -8179,8 +8140,7 @@ BOFOR -344618.000+1504446.800 -351711.800+1492048.700 -240406.300+1175621.500 - -232008.000+1545008.700 - -335331.300+1511536.700 + -295934.100+1181233.600 -144114.800+1322423.800 -375634.200+1470528.800 -273413.100+1530057.700 @@ -8192,6 +8152,7 @@ BOFOR -271743.000+1525604.100 -162646.000+1360440.900 -281355.300+1534640.400 + -214130.000+1451930.000 -372633.500+1450022.000 -192225.300+1462559.200 -320037.800+1153651.900 @@ -8208,6 +8169,7 @@ BOFOR -305646.100+1344500.000 -341155.200+1382638.500 -123950.100+1301613.900 + -354650.900+1580455.300 -192145.800+1464255.300 -374336.300+1445440.900 -291231.700+1160124.900 @@ -8216,8 +8178,10 @@ BOFOR -273957.600+1530535.800 -094554.000+1455420.000 -223551.500+1482104.000 + -255831.100+1472326.500 -375245.600+1445238.200 -271647.800+1533006.300 + -325926.100+1193410.400 -380607.300+1442724.500 -270813.000+1524638.000 -334054.400+1220458.300 @@ -8232,7 +8196,6 @@ BOFOR -333855.500+1214303.100 -334147.600+1215200.200 -333707.700+1213727.700 - -244524.500+1443301.500 -273733.800+1143532.200 -165458.000+1454655.000 -302120.200+1411922.400 @@ -8291,7 +8254,6 @@ BOFOR -282342.000+1533912.000 -333254.000+1280000.000 -345808.300+1381810.400 - -272111.100+1525951.600 -335436.000+1512236.000 -174105.100+1454809.800 -331054.000+1250000.000 @@ -8304,7 +8266,6 @@ BOFOR -234837.300+1512842.900 -234619.500+1512610.700 -235324.400+1513400.300 - -315433.400+1152520.300 -200605.000+1465218.700 -400000.000+1462336.000 -115024.800+1290333.500 @@ -8325,9 +8286,7 @@ BOFOR -163923.300+1455333.600 -432852.100+1574628.300 -200439.100+1452555.000 - -245012.000+1502000.000 -353308.700+1491846.700 - -214130.000+1451930.000 -145908.900+1293825.800 -332605.200+1355227.400 -331900.700+1481044.800 @@ -8344,10 +8303,8 @@ BOFOR -332220.300+1475959.300 -332007.300+1474329.100 -332142.400+1475516.400 - -270412.000+1451542.000 -330250.400+1515045.600 -192342.000+1463406.000 - -323536.000+1203636.000 -304618.700+1282139.600 -305113.200+1282507.700 -305542.700+1282058.100 @@ -8398,7 +8355,6 @@ BOFOR +050000.000+1433700.000 -315052.500+1155105.300 -303804.700+1543200.400 - -285228.500+1530252.700 -265953.600+1524529.500 -200000.000+1512024.000 -282655.400+1554104.000 @@ -8419,10 +8375,10 @@ BOFOR -253550.000+1513955.600 -254116.300+1512651.100 -253705.400+1513654.700 - -120656.600+1350702.000 + -120656.600+1350701.900 -121238.300+1350755.900 -121524.900+1350247.900 - -120812.300+1345846.000 + -120812.200+1345846.000 -120439.200+1345126.200 -121025.300+1350320.900 -120426.300+1344008.800 @@ -8499,10 +8455,7 @@ BOFOR -284701.200+1170057.600 -284113.600+1164742.700 -284541.100+1165754.000 - -364000.000+1475100.000 -353350.600+1491242.600 - -211539.600+1363407.400 - -374922.700+1445105.900 -312124.300+1160252.800 -312422.100+1160701.100 -312840.200+1160512.500 @@ -8516,9 +8469,7 @@ BOFOR -313019.600+1154103.500 -312759.400+1155113.400 -350017.700+1374752.100 - -402240.800+1564645.000 -113636.000+1390048.000 - -353543.000+1484308.000 -374236.000+1480506.000 -100000.000+1761731.589 -352541.300+1373342.400 @@ -8590,7 +8541,6 @@ BOFOR -350352.700+1491224.700 -220138.000+1181918.700 -412356.551+1702324.281 - -323244.900+1545503.200 -204335.400+1163841.400 -261242.200+1325207.700 -272710.500+1525554.300 @@ -8598,6 +8548,7 @@ BOFOR -374511.500+1444345.400 -320420.900+1160510.200 -203141.900+1490519.800 + -414819.700+1462509.000 -192539.400+1464104.800 -113619.400+1302047.100 -113538.700+1301458.800 @@ -8605,7 +8556,6 @@ BOFOR -112741.700+1302210.500 -112209.100+1302711.200 -113154.000+1301822.300 - -322013.600+1183621.300 -372050.200+1413443.300 -271856.000+1531005.100 -200805.500+1180311.400 @@ -8662,10 +8612,12 @@ BOFOR -145628.500+1385236.000 -163913.300+1223438.100 -225621.300+1213054.400 + -161454.000+1341536.000 -422933.000+1472323.300 -142200.000+1400000.000 -345111.100+1380808.300 -344726.500+1384538.800 + -391901.200+1443534.900 -154912.400+1415522.400 -231312.600+1282748.800 -392835.231+1711140.859 @@ -8676,7 +8628,7 @@ BOFOR -192037.400+1470823.400 -144202.500+1251212.700 -315812.700+1160759.000 - -374500.900+1450456.700 + -313316.800+1160727.600 -163550.100+1453720.500 -331212.100+1512818.800 -152655.000+1451114.200 @@ -8723,16 +8675,12 @@ BOFOR -285810.500+1143248.600 -345445.000+1382012.500 -251926.700+1525259.000 - -281317.500+1492314.900 -314759.900+1160021.000 -164634.100+1454604.000 -335052.500+1511544.500 -260754.000+1173223.400 - -323742.000+1184748.000 -265028.400+1141047.900 - -240918.000+1432812.000 -322150.000+1173922.200 - -344222.000+1382030.000 -125410.800+1293758.300 -345749.500+1480134.700 -314350.700+1152028.300 @@ -8794,7 +8742,6 @@ BOFOR -130848.000+1400000.000 -330018.000+1203054.000 -123817.600+1313306.300 - -400000.100+1465136.500 -131434.600+1294937.000 -315646.000+1162341.100 -171314.800+1455416.000 @@ -8816,7 +8763,6 @@ BOFOR -123645.600+1305603.100 -284956.100+1342223.900 -313842.800+1482909.500 - -314933.100+1154657.600 -274922.500+1273408.200 -344820.700+1384059.900 -304741.600+1163216.500 @@ -8880,17 +8826,7 @@ BOFOR -201720.900+1485348.700 -201331.700+1485656.000 -201624.600+1485830.400 - -320044.800+1195922.300 - -320507.470+1200344.690 - -321007.310+1200024.490 - -320603.610+1195201.480 - -320535.680+1195753.120 - -320757.420+1192731.550 - -320703.540+1193915.240 - -320258.440+1193053.460 - -320730.610+1193323.420 -203948.359-1761932.948 - -375936.000+1445142.000 -120000.000+1530932.700 -334818.500+1394209.200 -131604.400+1315755.600 @@ -8901,7 +8837,6 @@ BOFOR -353555.300+1490345.100 -212957.300+1312123.700 -342454.000+1193436.000 - -342101.200+1510758.000 -215651.700+1180743.900 -205051.600+1163250.300 +095454.000+1425000.000 @@ -8933,17 +8868,17 @@ BOFOR -363320.300+1421121.200 -364010.400+1415728.600 -364008.100+1420954.600 - -200058.090+1463010.690 - -195514.800+1463052.620 - -200001.240+1462132.060 - -200350.030+1461403.210 - -195738.090+1462612.410 - -201234.760+1460723.470 - -200959.300+1460156.620 - -200416.160+1460239.620 - -200513.940+1461118.340 - -200125.270+1461847.310 - -200736.680+1460637.550 + -200058.100+1463010.700 + -195514.800+1463052.600 + -200001.200+1462132.100 + -200350.000+1461403.200 + -195738.100+1462612.400 + -201234.800+1460723.500 + -200959.300+1460156.600 + -200416.200+1460239.600 + -200513.900+1461118.300 + -200125.300+1461847.300 + -200736.700+1460637.600 -201254.400+1484359.900 -200725.800+1484552.900 -200713.500+1485158.300 @@ -8985,6 +8920,8 @@ BOFOR -223936.600+1201644.700 -223453.800+1200252.100 -223936.500+1194732.700 + -223453.600+1194359.500 + -223010.700+1194732.800 -223453.700+1195550.500 -223453.600+1194923.600 -223453.800+1200124.600 @@ -9001,7 +8938,6 @@ BOFOR -211226.600+1184235.100 -333751.100+1410051.200 -213940.360-1762413.140 - -400000.000+1430000.000 -381714.500+1422713.300 -270327.800+1522831.800 -160438.300+1361818.100 @@ -9017,6 +8953,7 @@ BOFOR -121538.500+1304105.300 -142253.500+1321655.300 -212100.500+1163258.000 + -285228.500+1530252.700 -313134.600+1432229.300 -292646.400+1450214.800 -181532.700+1110650.800 @@ -9066,6 +9003,8 @@ BOFOR -183930.600+1460919.000 -322532.700+1513629.100 -163055.600+1453757.200 + -374634.400+1443041.600 + -312956.200+1154106.200 -263105.100+1530107.100 -280059.800+1532534.300 -115639.800+1340705.800 @@ -9083,6 +9022,7 @@ BOFOR -345318.300+1381111.400 -423143.400+1470952.400 -163724.000+1572654.000 + -192412.000+1414100.000 -134800.000+1433700.000 -304941.300+1373915.300 -102548.000+1270806.000 @@ -9109,9 +9049,9 @@ BOFOR -271952.000+1534116.200 -174503.900+1393154.300 -422052.800+1474648.500 + -254936.000+1453006.000 -225042.800+1500544.800 -274724.700+1533020.400 - -375018.900+1450638.300 -313840.000+1151256.100 -414624.000+1462742.000 -280117.500+1532453.900 @@ -9119,7 +9059,6 @@ BOFOR -272800.100+1534415.300 -373048.900+1434725.800 -270714.000+1531428.300 - -292118.900+1150645.600 -222254.000+1484030.000 -293056.700+1513947.000 -344049.800+1381650.300 @@ -9204,7 +9143,6 @@ BOFOR -371639.300+1504716.500 -320530.400+1155515.100 -384554.000+1484130.000 - -274430.500+1162601.000 -125106.300+1321154.000 -325639.700+1513023.700 -162639.400+1252821.400 @@ -9220,7 +9158,6 @@ BOFOR -270925.600+1515710.300 -335337.800+1512242.800 -194910.600+1471130.400 - -373842.000+1451536.000 -334839.900+1510917.600 -121344.400+1301515.100 -272206.000+1530628.000 @@ -9251,14 +9188,12 @@ BOFOR -134543.100+1305622.400 -381554.000+1470630.000 -123105.400+1310656.400 - -150006.000+1400000.000 -205502.600+1253928.200 -150930.800+1304633.500 -341457.000+1511931.400 -114745.700+1294213.200 -312458.600+1161738.400 -133312.800+1301025.500 - -350558.300+1591141.200 -263129.700+1202125.600 -262712.300+1201709.400 -262208.300+1202010.100 @@ -9304,6 +9239,7 @@ BOFOR -020000.000+0840936.000 -174854.000+0750000.000 -245321.100+1145149.900 + -190550.600+1433938.500 -334238.900+1501758.600 -425557.000+1473845.000 -333607.700+1485716.500 @@ -9315,6 +9251,7 @@ BOFOR -185738.800+1470454.100 -333332.200+1151831.200 -374312.000+1443612.000 + -412754.300+1575000.500 -332745.000+1373405.000 -164825.000+1455017.000 -290557.500+1222710.900 @@ -9338,9 +9275,7 @@ BOFOR -123544.700+1305927.100 -033018.000+0805330.000 -231048.000+1492900.000 - -313134.200+1564330.100 -235831.100+1453102.600 - -374148.000+1451530.000 -262823.300+1490433.200 -421920.800+1472356.000 -244248.000+1502312.000 @@ -9351,8 +9286,6 @@ BOFOR -185645.300+1221958.300 -055306.000+1421236.000 -120000.000+1464300.000 - -313318.600+1165242.300 - -290000.000+1443541.900 -303511.100+1504103.600 -420515.100+1473952.600 -320409.400+1160604.200 @@ -9370,9 +9303,8 @@ BOFOR -262339.300+1290424.800 -310917.700+1172709.500 -271600.500+1534730.300 - -325926.100+1193410.400 -352948.300+1491140.900 - -385404.100+1430000.000 + -274430.500+1162601.000 -325415.500+1343210.100 -325959.200+1343138.000 -325336.400+1342228.200 @@ -9424,7 +9356,6 @@ BOFOR -345942.800+1381949.400 -130924.000+1363742.000 -304519.100+1340636.700 - -315522.700+1152813.000 +040000.000+1415500.000 -364747.700+1435833.000 -161236.000+1411742.000 @@ -9563,19 +9494,15 @@ BOFOR -153630.400+1283358.200 -154755.300+1284448.300 -154127.300+1283305.700 - -313002.000+1545916.700 -320753.700+1161337.000 -163751.400+1445421.700 -330948.000+1402706.000 - -295934.100+1181233.600 -154249.800+1432534.100 -122411.400+1310639.000 -315133.800+1160703.200 - -374034.500+1443759.000 -255051.000+1224054.000 -293451.700+1465705.500 -272002.000+1531421.000 - -372754.000+1451054.000 -291414.900+1165559.500 -291527.200+1164643.700 -292240.600+1165111.200 @@ -9589,6 +9516,7 @@ BOFOR -291412.800+1164354.500 -290821.700+1163038.300 -291251.900+1164050.600 + -245012.000+1502000.000 -364954.000+1371542.000 -262243.300+1514227.900 -261835.500+1514654.600 @@ -9618,16 +9546,6 @@ BOFOR -355046.300+1372110.100 -385418.000+1502456.000 -192025.900+1464316.300 - -233553.170+1200424.450 - -233138.920+1201034.820 - -234134.590+1200900.400 - -233720.170+1201510.880 - -233636.760+1200947.640 - -235933.230+1201119.990 - -240208.290+1200544.160 - -235811.290+1200110.850 - -235212.680+1200719.020 - -235710.490+1200631.620 -153113.600+1415840.100 -153657.800+1415911.900 -153157.500+1415013.000 @@ -9644,20 +9562,21 @@ BOFOR -282814.500+1422836.100 -373304.900+1453013.300 -304951.600+1213515.200 + -314400.000+1601430.000 -273829.200+1531905.700 -143854.000+1182300.000 -274541.100+1532003.600 -372912.300+1445814.300 + -284326.700+1175749.400 -161346.200+1450943.500 -373342.000+1444912.000 -353447.700+1390104.100 + -313318.600+1165242.300 -294914.800+1173818.200 -213024.100+1453422.200 -130610.500+1312239.900 -233245.500+1503829.100 - -225056.000+1663953.000 -140000.000+1591000.000 - -372706.000+1452442.000 -180916.600+1500235.500 -352109.400+1491539.800 -120000.000+1085300.000 @@ -9671,6 +9590,7 @@ BOFOR -353017.000+1490112.300 -122808.200+1310235.200 -193704.500+1465722.400 + -270003.000+1555446.000 -120403.600+1291133.400 -123045.700+1311027.000 -283133.000+1514922.000 @@ -9692,10 +9612,9 @@ BOFOR -430102.300+1473659.200 -165611.400+1455905.500 -271724.000+1525824.000 - -281643.400+1150000.000 -270040.000+1502150.000 -144742.500+1161913.200 - -374914.100+1451037.300 + -413900.000+1464418.000 -303941.100+1474441.200 -163010.800+1230334.900 -163326.400+1230446.300 @@ -9746,6 +9665,7 @@ BOFOR -104536.000+1465736.000 -271528.300+1264928.700 -320024.300+1154747.500 + -281515.200+1591018.500 -284001.800+1212258.800 -284012.100+1212930.000 -284539.600+1213133.000 @@ -9753,12 +9673,14 @@ BOFOR -285439.900+1211714.800 -284413.300+1212606.100 -285215.300+1211917.600 + -270412.000+1451542.000 -274814.300+1205701.700 -275327.600+1205944.600 -275730.700+1205509.000 -275132.100+1204744.300 -275014.700+1203945.500 -275234.300+1205411.400 + -193419.900+1383445.700 -222848.000+1493500.000 -375841.800+1462537.700 -275302.000+1202727.500 @@ -9798,11 +9720,12 @@ BOFOR -124007.600+1430758.000 -435553.040+1674034.010 -324000.000+1380833.900 + -244524.500+1443301.500 -320229.900+1152858.100 -091800.000+1422000.000 -334614.000+1493557.700 -275208.000+1525243.000 - -413900.000+1464418.000 + -265153.600+1502338.500 -273655.600+1530641.800 -152003.500+1162153.100 -374228.700+1443653.500 @@ -9811,7 +9734,6 @@ BOFOR -282413.800+1240935.500 -203528.700+1474706.400 -271938.800+1200059.800 - -273249.900+1530927.500 -233958.300+1333834.700 -183430.000+1380030.000 -372702.200+1453816.800 @@ -9830,7 +9752,6 @@ BOFOR -272750.700+1415215.600 -273301.100+1414029.600 -272518.000+1414740.300 - -374634.400+1443041.600 -330747.200+1513021.600 -330515.500+1512734.400 -330211.500+1512926.700 @@ -9843,11 +9764,9 @@ BOFOR -343900.000+1280000.000 -274900.000+1501118.000 -211025.400+1164404.900 - -272403.500+1531332.200 -361404.300+1410000.000 -351112.000+1350000.000 -135757.400+1332951.500 - -253230.000+1470948.000 -302932.800+1522133.100 -280757.000+1534459.000 -290500.000+1540000.000 @@ -9958,7 +9877,6 @@ BOFOR -271043.800+1530853.100 -263857.300+1531804.500 -332554.000+1491220.000 - -372941.200+1445214.400 -233000.000+1151057.500 -244854.900+1150000.000 -331007.800+1454526.600 @@ -9992,6 +9910,7 @@ BOFOR -301021.400+1430725.200 -135204.300+1200446.200 -362304.628+1704426.419 + -222400.000+1412536.000 -234935.000+1162243.700 -431558.658+1665605.399 -405203.100+1463402.900 @@ -10005,7 +9924,6 @@ BOFOR -330043.500+1365042.600 -353307.300+1445706.500 -342551.100+1492005.500 - -290000.000+1440351.600 -330644.000+1510821.500 -382952.200+1482528.000 -273144.000+1532950.000 @@ -10017,13 +9935,13 @@ BOFOR -200729.500+1484555.800 -162546.000+1262553.300 -351734.700+1483506.400 - -232812.000+1492542.000 -323124.400+1154630.200 -340234.100+1512045.700 -305116.100+1170955.900 -272748.000+1531155.000 -322718.000+1435636.000 -064306.000+1621242.000 + -240918.000+1432812.000 -320100.000+1154448.000 -342450.000+1380219.200 -291501.800+1432522.000 @@ -10036,11 +9954,10 @@ BOFOR -331913.000+1514429.600 -335554.000+1512854.000 -194433.400+1324618.300 - -154530.600+1432411.700 -181233.100+1221545.800 -294020.300+1514141.900 -130738.300+1332144.400 - -314538.400+1145418.700 + -220618.500+1461849.500 -273437.100+1525638.000 -320331.100+1161432.000 -374000.600+1445537.600 @@ -10108,6 +10025,7 @@ BOFOR -334358.100+1493310.100 -281544.300+1192813.100 -280709.900+1533231.800 + -213212.000+1414824.000 -273513.700+1532015.400 -132350.200+1524201.800 -263040.100+1184615.000 @@ -10117,6 +10035,7 @@ BOFOR -263641.200+1183022.900 -263531.000+1184449.600 -323036.000+1505800.000 + -123200.000+1400000.000 -350702.800+1485648.400 -274839.400+1532548.000 -264218.000+1181914.900 @@ -10127,7 +10046,6 @@ BOFOR -263727.400+1182041.500 -180951.500+1223734.700 -175812.600+1175217.100 - -271942.200+1531034.500 -374834.500+1443842.800 -142218.100+1452020.500 -205457.900+1181228.700 @@ -10231,19 +10149,15 @@ BOFOR -340632.800+1415125.700 -422530.400+1472247.700 -213020.600+1490138.500 - -363206.000+1475042.000 -375042.000+1451130.000 - -272936.700+1530639.600 -281501.000+1533848.000 -402158.100+1630000.000 -265520.700+1150000.000 - -222400.000+1412536.000 -275230.100+1211610.900 -315153.900+1155913.100 -160143.500+1342644.900 -123131.100+1304720.700 - -272046.300+1531626.300 - -383544.800+1573204.700 + -383544.800+1573204.700 -175627.800+1221153.800 -230529.400+1194424.700 -132938.400+1280204.400 @@ -10252,7 +10166,6 @@ BOFOR -184706.700+1465816.100 -242636.000+1510224.000 -274515.300+1461218.800 - -264225.300+1493525.800 -364954.200+1495752.800 -365644.400+1495921.800 -364544.900+1500121.300 @@ -10269,8 +10182,8 @@ BOFOR -262342.000+1174818.000 -235020.300+1335750.400 -240218.000+1154230.000 - -320248.000+1155854.000 -303716.400+1364301.100 + -261800.000+1441142.000 -374550.300+1444038.600 -323550.100+1493804.100 -304941.400+1555331.500 @@ -10290,7 +10203,6 @@ BOFOR -341725.300+1161227.600 -341143.500+1155701.700 -341547.800+1160802.900 - -351224.900+1491135.800 -373556.100+1444928.100 -374706.500+1445137.300 -263704.000+1501702.100 @@ -10430,22 +10342,17 @@ BOFOR -232254.800+1185157.800 -344956.300+1384155.900 -264708.000+1524614.000 - -194630.000+1360006.000 -181650.700+1453836.300 -264327.800+1531242.000 -421018.000+1470439.900 -260124.900+1144908.700 - -254936.000+1453006.000 -030000.000+1651000.000 - -310533.100+1163427.300 -350612.200+1383249.900 - -265153.600+1502338.500 -271739.300+1531048.900 -191916.800+1463130.600 -262620.000+1533758.000 - -274441.000+1162723.900 -412007.400+1481654.100 - -282338.600+1503358.200 + -314116.400+1153737.900 -233330.000+1451752.800 -321806.300+1492622.400 -215210.000+1475738.000 @@ -10473,7 +10380,6 @@ BOFOR -285920.900+1155844.100 -291515.300+1160328.300 -290315.600+1155510.200 - -291312.200+1160202.200 -292050.700+1161332.100 -292605.900+1161051.900 -292541.700+1160418.700 @@ -10534,7 +10440,6 @@ BOFOR -163806.400+1385903.800 -163934.300+1390922.100 -321140.100+1214756.600 - -313441.400+1155858.300 -234734.900+1505953.700 -272216.000+1532047.000 -323339.300+1493537.300 @@ -10543,6 +10448,7 @@ BOFOR -315509.710+1702214.840 -231807.200+1501717.000 -314215.600+1155040.800 + -312211.300+1155121.700 -285318.400+1355610.700 -294707.800+1202837.400 -345309.000+1382514.000 @@ -10564,10 +10470,10 @@ BOFOR -170642.000+1442324.000 -211233.800+1165157.900 -142435.000+1303605.900 + -272709.200+1500000.000 -202544.400+1485743.600 -204625.200+1163733.100 -264539.100+1185846.100 - -314819.900+1163116.600 -271703.000+1530609.000 -350335.600+1391248.200 -171251.600+1445740.500 @@ -10596,7 +10502,6 @@ BOFOR -131255.000+1280714.000 -311834.400+1202718.600 -020000.000+0810000.000 - -281707.100+1185410.700 -323110.500+1512751.900 -233958.400+1335808.700 -373920.600+1443754.700 @@ -10617,7 +10522,6 @@ BOFOR -341142.700+1510625.700 -222507.000+1254255.000 -122128.800+1304245.900 - -310031.100+1572348.500 -313324.000+1370830.000 -345808.200+1431357.500 -320140.800+1155622.100 @@ -10631,7 +10535,6 @@ BOFOR -273747.400+1150000.000 -372630.000+1445636.000 -122947.400+1310728.200 - -374936.000+1445100.000 -121450.800+1310639.100 -190000.000+1464900.000 -324334.800+1521912.600 @@ -10672,15 +10575,14 @@ BOFOR -345741.600+1390752.500 -320305.000+1520015.700 -130748.200+1320354.200 - -345335.500+1381450.400 -395354.000+1473906.000 - -261800.000+1441142.000 -280558.500+1533420.000 -190259.000+1465526.500 -154415.100+1244322.900 -220448.000+1740418.000 -111400.000+1313300.000 -331640.000+1382912.100 + -304053.300+1165428.400 -260000.000+1062905.800 -263220.000+1170514.200 -132748.000+1635736.000 @@ -10692,6 +10594,7 @@ BOFOR -254440.100+1512929.500 -314229.000+1161550.100 -225412.000+1641636.000 + -212044.000+1160340.000 -305415.412+1754352.450 -283644.100+1222521.100 -123244.900+1304300.700 @@ -10704,6 +10607,7 @@ BOFOR -132135.200+1063820.900 -412436.000+1465555.400 -283316.500+1522659.800 + -322013.600+1183621.300 -121112.000+1550000.000 -325717.000+1375721.800 -270850.000+1520254.000 @@ -10712,8 +10616,7 @@ BOFOR -253237.500+1182608.400 -381851.600+1412824.100 -351538.300+1485017.300 - -272524.000+1525934.000 - -220523.800+1552013.900 + -230712.000+1463654.000 -310925.700+1155622.900 -192436.900+1470945.500 -403927.400+1471154.200 @@ -10723,6 +10626,7 @@ BOFOR -385452.800+1465539.100 -360100.000+1493036.000 -115616.300+1302614.200 + -291203.900+1183136.400 -273225.000+1530223.200 -374447.400+1445221.600 -343642.000+1385742.000 @@ -10740,7 +10644,6 @@ BOFOR -274606.700+1534052.400 -263631.200+1192012.300 -424210.100+1473040.400 - -304053.300+1165428.400 -161153.500+1442011.500 -173946.200+1453217.000 -314039.700+1232124.000 @@ -10750,7 +10653,6 @@ BOFOR -315226.300+1230759.100 -314536.400+1232220.200 -315029.400+1231205.300 - -350718.400+1200000.000 -320049.900+1230138.100 -315818.700+1225534.400 -315327.100+1230551.000 @@ -10830,6 +10732,7 @@ BOFOR -175012.400+1411030.700 -174150.000+1410443.700 -330653.000+1544940.000 + -272831.200+1442713.000 -123648.000+1313337.700 -233611.000+1484824.600 -424227.400+1472506.900 @@ -10878,7 +10781,6 @@ BOFOR -320218.000+1155611.300 -293747.000+1490746.600 -324852.100+1170916.000 - -314400.000+1601430.000 -234719.900+1335214.500 -110849.200+1302937.700 -340521.200+1503103.900 @@ -10894,7 +10796,9 @@ BOFOR -315152.400+1483913.600 -350758.000+1491904.000 -181014.200+1172138.600 + -385404.100+1430000.000 -373342.700+1444904.400 + -195858.800+1431125.000 -345116.100+1384001.500 -271309.100+1531201.500 -271516.800+1515058.700 @@ -10923,8 +10827,8 @@ BOFOR -275158.200+1532240.200 -240334.300+1510023.100 -314002.100+1161105.300 + -280500.000+1502000.000 -314732.800+1361807.500 - -250507.600+1473019.000 -144724.800+1254933.000 -243008.100+1331215.400 -194043.600+1465623.200 @@ -10959,8 +10863,10 @@ BOFOR -213736.300+1145726.700 -214918.600+1150123.100 -214043.700+1150634.700 + -242132.000+1161111.000 -272948.900+1513210.300 -380101.300+1472250.200 + -303731.800+1155440.800 -323303.300+1515317.300 -194454.000+1485742.000 -345152.000+1385034.600 @@ -10969,14 +10875,18 @@ BOFOR -270721.100+1532047.000 -291713.600+1530652.100 -302712.700+1370959.700 + -313941.000+1153737.000 -422451.800+1630000.000 -370031.000+1430311.100 -424423.100+1473623.200 + -281707.100+1185410.700 + -342101.200+1510758.000 -233815.400+1460405.800 -123533.100+1305126.600 -382816.400+1453724.300 -151110.500+1170144.700 -123041.400+1305829.900 + -181903.500+1431546.800 -262523.600+1203436.100 -225153.100+1444620.600 -291200.300+1144755.000 @@ -11016,6 +10926,7 @@ BOFOR -203507.900+1485829.100 -342404.100+1515319.800 -343231.700+1444957.800 + -312039.800+1160454.200 -320438.000+1151953.500 -374010.500+1485154.500 -374517.000+1485743.700 @@ -11059,7 +10970,8 @@ BOFOR -271121.800+1531302.600 -180715.400+1163553.900 -282247.000+1522907.000 - -383711.800+1602107.100 + -383711.800+1602107.100 + -274208.400+1160735.200 -272648.400+1175507.100 -280753.200+1674126.300 -201503.600+1220255.600 @@ -11088,6 +11000,7 @@ BOFOR -303538.600+1164647.200 -320623.700+1502015.800 -162417.200+1310024.500 + -290000.000+1440351.600 -373519.000+1444418.000 -424440.400+1472449.400 -202104.200+1485721.200 @@ -11110,7 +11023,7 @@ BOFOR -303052.800+1364633.300 -302812.400+1365517.100 -303232.800+1364105.700 - -265244.200+1582515.100 + -423154.000+1462848.000 -350139.600+1384051.000 -345518.300+1382910.600 -350425.000+1384556.000 @@ -11167,10 +11080,10 @@ BOFOR -232914.700+1191953.600 -113806.000+0782636.000 -345837.800+1402057.200 - -373542.000+1451506.000 + -272924.200+1501959.100 + -194630.000+1360006.000 -350454.000+1382453.000 -380233.200+1464220.300 - -271809.800+1531031.500 -170234.500+1243720.800 -322838.600+1382808.600 -344958.000+1382749.900 @@ -11179,7 +11092,6 @@ BOFOR -382547.900+1463222.000 -274446.300+1522119.900 -373229.000+1443651.600 - -182609.400+1334448.500 -374312.000+1445748.000 -081001.000+1392950.000 -260642.800+1530507.600 @@ -11270,6 +11182,7 @@ BOFOR -131636.000+0750000.000 -335456.800+1511655.000 -375405.900+1443616.800 + -341949.900+1504708.300 -231639.100+1183454.400 -185702.100+1460143.900 -202116.500+1411355.800 @@ -11291,8 +11204,6 @@ BOFOR -305000.000+1160000.000 -305000.000+1153000.000 -303730.000+1142903.000 - -320006.000+1140530.000 - -324559.000+1143138.000 -325618.000+1153141.000 -171216.000+1352134.500 -175556.600+1463005.500 @@ -11329,7 +11240,7 @@ BOFOR -422910.100+1471441.000 -425541.000+1474339.500 -285618.200+1505855.100 - -291145.200+1532346.300 + -315520.900+1154221.600 -304207.200+1481103.300 -320600.600+1174251.100 -343244.400+1383005.400 @@ -11337,7 +11248,6 @@ BOFOR -271125.500+1531422.000 -344013.600+1364402.300 -270357.000+1532018.700 - -132810.700+1390340.300 -352752.500+1491557.900 -331130.000+1414736.000 -423255.300+1473440.000 @@ -11378,17 +11288,17 @@ BOFOR -321048.800+1154432.800 -320609.300+1155213.000 -140502.600+1292308.400 - -140022.900+1292636.500 + -140022.900+1292636.400 -140952.600+1292957.700 -140158.000+1293216.800 -141728.300+1293238.800 -140507.700+1292817.100 -142455.500+1294024.300 -142935.300+1293656.100 - -142800.100+1293115.100 + -142800.100+1293115.000 -142005.600+1293334.700 -141229.900+1293053.300 - -142450.400+1293515.300 + -142450.400+1293515.200 -203643.100+1165903.100 -204102.500+1170305.400 -204605.600+1170009.300 @@ -11432,7 +11342,6 @@ BOFOR -222507.700+1140436.200 -221507.000+1140519.800 -353626.600+1544119.800 - -270952.000+1531139.900 -342230.800+1355427.800 -342140.600+1360119.100 -342643.700+1360437.000 @@ -11489,10 +11398,10 @@ BOFOR -354646.500+1454150.700 -200000.000+0983248.100 -311145.000+1153306.600 - -291842.000+1163124.000 -242105.700+1475145.400 -274501.100+1530828.500 -154801.100+1212958.200 + -244253.300+1541607.000 -315645.600+1163248.700 -273112.900+1532019.800 -212948.900+1491701.800 @@ -11509,13 +11418,13 @@ BOFOR -314432.400+1151207.200 -032930.000+0940954.000 -101330.000+1435536.000 - -332737.800+1505015.000 -310553.300+1564700.500 -345233.000+1504925.200 -214137.100+1250758.500 -272515.100+1532105.000 -344431.000+1382812.000 -193340.900+1470240.400 + -353330.800+1621750.700 -232618.000+1644130.000 -350733.200+1382903.200 -421905.300+1471533.700 @@ -11570,7 +11479,6 @@ BOFOR -141833.700+1321739.900 -143247.900+1322358.900 -142257.500+1321510.500 - -143043.910+1322207.890 -143748.900+1323454.600 -144324.500+1323329.400 -144401.200+1322736.300 @@ -11586,6 +11494,7 @@ BOFOR -322825.000+1374201.700 -361856.800+1413844.200 -272124.900+1531954.900 + -144424.000+1413436.000 -185625.300+1410932.700 -242355.000+1462922.100 -320419.900+1161041.800 @@ -11679,20 +11588,15 @@ BOFOR -263546.500+1440334.400 -115245.200+1301534.700 -270636.000+1530406.000 - -313730.000+1152554.000 -322136.000+1381106.000 -203030.800+1411522.100 -293209.300+1500850.200 -345852.300+1384705.500 - -313941.000+1153737.000 -211520.000+1193544.000 -122353.200+1321606.300 -185217.600+1163004.800 -164200.000+1453206.000 -340218.900+1504129.700 - -271354.000+1530000.000 - -372400.000+1451506.000 - -275013.300+1171155.200 -315302.800+1153033.100 -175858.900+1222122.900 -255206.000+1173318.000 @@ -11744,7 +11648,6 @@ BOFOR -380624.300+1443006.300 -380618.400+1443014.500 -313539.400+1163151.200 - -314151.000+1155258.200 -343812.100+1383622.300 -350315.100+1495737.300 -272524.800+1530142.700 @@ -11794,20 +11697,17 @@ BOFOR -122505.700+1304538.800 -255829.400+1530646.000 -211326.400+1235713.800 - -313754.500+1152858.600 -095538.111+1590915.059 -130431.200+1310402.900 -350721.900+1221832.900 - -315222.400+1160528.900 + -310704.500+1144858.200 -100400.000+1532554.000 -110000.000+1431530.000 - -272104.600+1531458.000 -285651.600+1674256.400 -190908.800+1471115.400 -280545.100+1532743.800 -415715.200+1471837.900 -150000.000+1150819.300 - -314635.000+1155837.000 -231256.200+1500916.500 -361000.400+1420507.000 -242721.900+1171845.700 @@ -11834,11 +11734,9 @@ BOFOR -271542.800+1525221.000 -430000.000+0750000.000 -350406.000+1250000.000 - -292735.000+1170544.200 -282956.400+1350039.500 -331001.900+1513716.200 -335418.900+1495634.200 - -303312.500+1163754.400 -424406.100+1473032.900 -425024.000+1473644.500 -272543.000+1524604.000 @@ -11851,26 +11749,28 @@ BOFOR -202446.100+1490305.900 -200558.800+1484803.000 -203443.700+1490105.000 + -313134.200+1564330.100 -122039.100+1303815.600 - -372939.200+1444342.900 -274436.000+1332736.000 -354518.000+1280000.000 -351208.900+1383041.900 -294538.800+1473202.200 -284923.100+1531526.800 - -315728.300+1153130.200 -321205.100+1630000.000 -255100.000+1483300.000 -344402.400+1373902.700 -340455.600+1523355.800 -380132.000+1465343.000 + -264225.300+1493525.800 -125800.000+1435800.000 + -200644.100+1402351.700 + -373608.600+1462805.200 -272808.200+1531935.500 -253658.500+1184351.600 -374215.500+1442941.600 -140000.000+1582500.000 + -264654.000+1480648.000 -070755.200+0872005.700 - -341311.100+1511257.300 -271802.800+1525852.700 -341650.700+1502549.100 -325728.200+1520510.800 @@ -11940,15 +11840,12 @@ BOFOR -374821.700+1444525.900 -373121.000+1445459.300 -374517.200+1450109.800 - -413818.800+1471010.800 -380000.700+1471917.900 -344954.700+1360000.000 -350340.900+1385420.700 -343548.200+1380526.600 - -391426.700+1440946.400 -373528.300+1444922.400 -281103.300+1494007.600 - -320730.000+1160336.000 -171300.100+1460953.600 -314734.600+1161454.200 -261932.500+1484411.300 @@ -11968,11 +11865,9 @@ BOFOR -105649.700+1391216.300 -252759.700+1294135.300 -283132.600+1533614.400 - -312644.100+1164431.300 -131218.800+1251433.700 -263013.600+1533044.700 -260848.300+1505451.400 - -372744.900+1444225.000 -352747.200+1490947.100 -203808.000+1184234.300 -202951.300+1183844.000 @@ -12038,8 +11933,12 @@ BOFOR -292049.100+1165656.000 -233958.600+1333834.300 -271859.000+1524954.000 + -182609.400+1334448.500 + -265408.200+1532929.200 + -275013.300+1171155.200 -315614.600+1160658.700 -361116.600+1470427.400 + -154530.600+1432411.700 -361947.300+1474342.500 -270737.000+1630000.000 -273745.600+1530349.400 @@ -12061,8 +11960,8 @@ BOFOR -273502.300+1531923.700 -375747.400+1470051.100 -124434.600+1320036.100 + -314151.000+1155258.200 -341850.500+1391058.600 - -195858.800+1431125.000 -272541.000+1525349.000 -272625.600+1531503.700 -270907.000+1530123.200 @@ -12115,6 +12014,7 @@ BOFOR -314840.300+1151620.100 -143100.000+1025800.000 -264136.900+1531745.400 + -350558.300+1591141.200 -271655.500+1530952.200 -081016.800+0852003.600 -313929.900+1152104.200 @@ -12123,7 +12023,6 @@ BOFOR -425141.600+1474621.200 -345042.180+1714100.110 -273818.500+1532340.100 - -415236.000+1461736.000 -272210.800+1532424.400 -344543.100+1383740.400 -372612.000+1445500.000 @@ -12136,6 +12035,7 @@ BOFOR -181444.000+1785636.000 -375542.000+1444518.000 -321820.500+1374300.500 + -313743.200+1155059.400 -295338.700+1452904.400 -132119.300+1414321.100 -285924.300+1675046.300 @@ -12166,9 +12066,7 @@ BOFOR -383450.800+1630000.000 -192748.000+1464006.000 -110412.000+1243412.000 - -300736.000+1540508.000 -272858.700+1403753.300 - -192412.000+1414100.000 -273110.700+1540335.700 -123642.500+1310211.900 -334912.800+1504822.900 @@ -12208,7 +12106,6 @@ BOFOR -320301.700+1505120.400 -211925.300+1332729.100 -275206.000+1534800.000 - -313743.200+1155059.400 -263818.500+1164404.400 -235830.000+1664006.000 -160542.000+1295412.000 @@ -12222,7 +12119,6 @@ BOFOR -284036.000+1535342.000 -190500.000+1462100.000 -161625.800+1222545.600 - -244253.300+1541607.000 -134029.900+1341727.900 -305059.700+1233737.000 -205804.900+1493632.400 @@ -12253,9 +12149,9 @@ BOFOR -120638.200+1301814.700 -103558.000+1290920.000 -115810.700+1302420.400 + -265624.000+1500700.000 -191042.000+1401718.000 -272445.600+1523603.000 - -334210.800+1511837.900 -361240.300+1452034.800 -361017.700+1452701.800 -361423.500+1453159.900 @@ -12282,7 +12178,6 @@ BOFOR -264348.000+1530418.000 -271239.200+1531340.000 -290744.900+1680550.200 - -305711.400+1190946.800 -265423.500+1262207.100 -222300.000+1444954.000 -352755.600+1492536.800 @@ -12361,7 +12256,6 @@ BOFOR -371157.600+1443548.000 -131317.300+1331956.900 -330006.000+1494624.000 - -391901.200+1443534.900 -315955.700+1160609.800 -024844.000+0772337.000 -235500.000+0750000.000 @@ -12378,6 +12272,7 @@ BOFOR -253110.900+1524235.800 -335040.700+1551107.600 -193124.000-1772406.000 + -104942.000+1405728.300 -363206.000+1475042.000 -284139.400+1514434.100 -283652.600+1514056.500 @@ -12391,12 +12286,10 @@ BOFOR -273617.100+1315530.500 -341541.500+1365426.800 -310433.000+1160030.000 - -273659.000+1530756.000 -384927.500+1414745.200 -340431.400+1374436.700 -101851.900+1253331.300 -314927.900+1161113.300 - -315715.400+1153939.800 -310751.700+1190726.100 -310216.200+1190859.200 -310136.500+1191537.100 @@ -12479,7 +12372,6 @@ BOFOR -350346.500+1384445.200 -132654.900+1314704.500 -124637.900+1312905.000 - -284326.700+1175749.400 -310947.000+1510511.700 -311528.400+1510417.400 -311641.300+1505744.500 @@ -12518,6 +12410,7 @@ BOFOR -364021.300+1474957.400 -273521.500+1525419.000 -350629.200+1382817.300 + -281317.500+1492314.900 -395130.700+1630000.000 -380012.100+1443515.200 -331235.400+1514537.000 @@ -12532,15 +12425,16 @@ BOFOR -383027.900+1451248.700 -275034.100+1531848.600 -272057.000+1524407.000 + -250507.600+1473019.000 -292007.000+1151141.000 -185213.600+1152400.300 -345037.200+1390401.700 -265508.200+1523422.200 -275750.200+1532059.500 -163349.200+1453157.500 + -152149.900+1364006.500 -373451.400+1445710.700 -253541.900+1514023.400 - -380406.000+1451224.000 -240000.000+1100000.000 -164530.300+1453330.100 -174712.500+1464939.300 @@ -12548,7 +12442,6 @@ BOFOR -122541.200+1303803.200 -360802.500+1393904.100 -204809.900+1165255.500 - -320624.000+1154536.000 -123555.400+1304203.700 -351759.600+1434713.100 -352245.100+1435109.000 @@ -12580,8 +12473,6 @@ BOFOR -335324.700+1510805.600 -335751.400+1511050.300 -421312.000+1465348.000 - -281515.200+1591018.500 - -365801.500+1515904.600 -395430.000+1350000.000 -383132.000+1442825.000 -350652.700+1491215.500 @@ -12620,11 +12511,9 @@ BOFOR -224106.300+1495826.300 -191100.000+1452600.000 -263212.000+1522124.000 - -310000.000+1424844.500 -120000.000+1165504.400 -423134.400+1473640.100 -321135.400+1441047.400 - -200644.100+1402351.700 -395959.000+1460422.000 -425049.600+1473136.000 -104539.500+1331520.600 @@ -12647,8 +12536,8 @@ BOFOR -341143.100+1360128.900 -342109.600+1360530.900 -194556.900+1335927.500 - -194218.600+1335444.400 - -193652.600+1335643.900 + -194218.600+1335444.300 + -193652.500+1335643.900 -193934.300+1340456.100 -193705.900+1341406.300 -194056.500+1335950.300 @@ -12666,10 +12555,11 @@ BOFOR -381305.600+1452507.500 -381157.600+1452713.000 -243219.300+1180819.800 + -310533.100+1163427.300 -270001.500+1534554.800 -381314.200+1465653.500 -232824.000+1630000.000 - -144424.000+1413436.000 + -291145.200+1532346.300 -414250.200+1472112.500 -374706.000+1442700.000 -214232.500+1404107.400 @@ -12678,7 +12568,6 @@ BOFOR -214513.200+1404926.700 -215207.200+1405449.100 -214109.600+1404617.200 - -320030.000+1160424.000 -214517.300+1222738.700 -215102.000+1222801.800 -215320.100+1222222.700 @@ -12723,8 +12612,9 @@ BOFOR -213612.000+1640612.000 -184318.000+1760312.000 -121518.800+1304140.700 + -302830.100+1161655.100 -175610.900+1384907.100 - -243754.000+1450354.000 + -280212.000+1160400.000 -052916.000+0752312.000 -281424.000+1533312.000 -253741.800+1525429.300 @@ -12763,7 +12653,7 @@ BOFOR -203231.300+1302010.200 -113729.300+1302628.900 -113215.800+1302856.900 - -113245.600+1303446.100 + -113245.500+1303446.100 -114057.500+1303403.100 -114754.800+1303808.200 -113636.700+1303129.900 @@ -12779,7 +12669,6 @@ BOFOR -194129.400+1451425.900 -403001.700+1445251.200 -123932.600+1304600.900 - -350017.800+1384315.500 -291643.500+1420519.700 -291618.900+1421033.100 -292028.900+1421247.000 @@ -12796,7 +12685,6 @@ BOFOR -292726.800+1420314.900 -120000.000+1512231.100 -274336.800+1410447.100 - -381400.000+1615357.500 -314940.800+1370430.300 -321023.500+1512741.600 -190741.000+1161917.100 @@ -12804,7 +12692,6 @@ BOFOR -320706.000+1155448.000 -213618.000+1414518.000 -124008.900+1305616.300 - -273331.300+1531239.400 -193000.000+1141456.500 -193612.000+1450524.000 -183406.000+1451206.000 @@ -12901,7 +12788,6 @@ BOFOR -410936.400+1472545.800 -272848.400+1525634.600 -424753.400+1472736.900 - -273811.100+1144849.900 -234018.700+1141322.000 -270223.800+1525813.000 -410814.500+1630000.000 @@ -12913,7 +12799,6 @@ BOFOR -334303.900+1510741.900 -314730.800+1161129.500 -331603.400+1513348.700 - -285421.200+1552214.700 -291100.000+1164007.100 -345155.100+1503808.700 -072400.000+1333530.000 @@ -12955,11 +12840,8 @@ BOFOR -320000.000+1100000.000 -345300.000+1442518.000 -374641.200+1471517.200 - -315256.500+1154108.000 -265219.500+1532113.000 -322333.600+1514238.200 - -292551.600+1200000.000 - -344738.900+1383506.800 -350510.100+1380920.300 -135826.500+1332809.000 -335308.200+1394828.700 @@ -13001,7 +12883,6 @@ BOFOR -140850.600+1262727.400 -140352.600+1262059.100 -141156.700+1263130.200 - -405355.800+1604237.100 -292848.000+1531606.000 -285518.000+1532212.000 -205354.600+1152350.300 @@ -13010,7 +12891,9 @@ BOFOR -350138.200+1382501.300 -241449.300+1332652.600 -413112.000+1410000.000 + -243754.000+1450354.000 -371956.300+1444631.100 + -341311.100+1511257.300 -342607.000+1383346.000 -361910.100+1422441.500 -231348.600+1180552.300 @@ -13019,10 +12902,12 @@ BOFOR -122030.100+1303952.000 -345509.900+1385218.000 -204557.200+1214132.500 - -372432.600+1451042.700 + -122041.500+1342444.300 -180552.000+1765030.000 -292450.300+1170330.300 + -405355.800+1604237.100 -191222.800+1464734.500 + -391426.700+1440946.400 -273406.900+1521016.000 -273948.300+1521112.100 -274232.000+1520530.800 @@ -13084,6 +12969,7 @@ BOFOR -121337.400+1321513.300 -401101.619+1634403.509 -254809.900+1495346.500 + -275455.300+1175123.200 -381454.500+1472348.600 -381624.700+1471938.800 -381357.500+1471617.300 @@ -13112,11 +12998,13 @@ BOFOR -164153.200+1455657.900 -123120.800+1305620.800 -303454.000+1514536.000 + -310031.100+1572348.500 -373616.300+1464527.300 -123333.700+1304504.200 -304204.500+1363800.500 -151116.900+1230703.200 -294831.100+1502648.400 + -310630.000+1151656.900 -343124.900+1383854.600 -383558.900+1473012.300 -383339.600+1472440.600 @@ -13124,6 +13012,7 @@ BOFOR -383402.300+1472037.400 -345804.700+1384653.000 -264550.500+1202708.200 + -415236.000+1461736.000 -270318.600+1533808.400 -355354.100+1500833.900 -344913.300+1382312.700 @@ -13153,8 +13042,8 @@ BOFOR -332349.000+1153801.000 -123714.500+1311610.700 -350633.600+1490310.800 + -310000.000+1424844.500 -140033.800+1245023.000 - -255742.000+1443400.000 -370827.900+1473307.800 -232700.000+1414148.000 -372152.300+1452057.000 @@ -13193,6 +13082,7 @@ BOFOR -370421.000+1583000.200 -381617.839+1705550.700 -380910.100+1472337.200 + -265244.200+1582515.100 -323221.500+1170428.100 -332824.400+1434624.500 -212246.000+1151259.900 @@ -13200,12 +13090,12 @@ BOFOR -335529.700+1513457.500 -311544.400+1153527.200 -374504.400+1450445.700 + -290000.000+1443541.900 -342446.800+1630000.000 -222158.300+1191455.300 -374149.900+1451243.900 -274945.900+1532145.200 -171611.300+1050000.000 - -271302.100+1531328.900 -233409.000+1152131.400 -163933.000+1391013.400 -245847.500+1630000.000 @@ -13250,6 +13140,7 @@ BOFOR -303139.500+1502153.400 -271312.000+1544429.000 -112548.500+1280310.900 + -305711.400+1190946.800 -332259.300+1490727.800 -285706.800+1343327.300 -374017.500+1450135.300 @@ -13263,17 +13154,14 @@ BOFOR -333626.400+1504755.800 -271117.300+1524511.100 -280853.500+1184525.500 - -272427.100+1532653.200 -340806.000+1381430.500 -292730.600+1202925.200 -194126.200+1473526.300 - -354650.900+1580455.300 -130747.600+1302657.100 -315242.000+1155852.800 -380100.000+1451842.000 -244957.900+1141943.500 -335423.300+1540655.600 - -335518.000+1502512.000 -315215.000+1153142.100 -314650.200+1163049.700 -364756.900+1463747.100 @@ -13342,7 +13230,6 @@ BOFOR -252502.400+1423934.700 -321706.000+1480848.000 -215342.000+1171348.000 - -275455.300+1175123.200 -120000.000+1501801.100 -124346.000+1420833.700 -124931.500+1420838.500 @@ -13365,7 +13252,6 @@ BOFOR -340805.800+1501829.800 -375024.000+1435842.000 -261549.800+1285645.100 - -315520.900+1154221.600 -191130.000+1470100.000 -345955.400+1473833.500 -350231.800+1474446.900 @@ -13580,7 +13466,6 @@ BOFOR -344600.700+1504847.000 -344744.800+1504424.400 -343403.100+1504720.500 - -374312.000+1451512.000 -322640.800+1520551.800 -220000.000+1100000.000 -245529.600+1194449.000 @@ -13588,7 +13473,6 @@ BOFOR -271416.900+1522416.900 -121652.800+1321538.500 -315130.000+1154854.000 - -353330.800+1621750.700 -344407.600+1403159.100 -314511.200+1160441.300 -664512.300+1105856.400 @@ -13809,7 +13693,7 @@ BOFOR -151818.600+1275928.400 -153139.300+1281102.000 -152310.600+1275811.800 - -152957.700+1280827.900 + -152957.600+1280827.900 -340132.300+1481349.200 -340013.500+1481937.400 -340954.700+1481633.000 @@ -13879,18 +13763,18 @@ BOFOR -111442.900+1271313.000 -335729.200+1510645.200 -170010.500+1460312.300 - -300011.630+1193810.170 - -300532.300+1194036.380 - -300921.450+1193539.750 - -300313.150+1192923.640 + -300011.600+1193810.200 + -300532.300+1194036.400 + -300921.500+1193539.800 + -300313.200+1192923.600 -300121.900+1192025.600 -300422.900+1193459.700 - -300341.040+1190817.710 - -295820.210+1190552.020 - -300039.830+1191704.090 - -295431.280+1191048.350 + -300341.000+1190817.700 + -295820.200+1190552.000 + -300039.800+1191704.100 + -295431.300+1191048.400 -300231.300+1192602.000 - -295930.020+1191128.020 + -295930.000+1191128.000 -114705.400+1304157.000 -174419.000+1224407.000 -375345.000+1451050.000 @@ -15051,18 +14935,18 @@ BOFOR -405952.700+1454229.600 -273829.500+1524258.000 -173440.700+1234945.400 - -122449.400+1305259.700 + -122447.100+1305300.400 -344217.100+1383644.600 -380607.800+1470916.000 -221328.200+1140532.800 -345700.200+1503159.800 -314026.000+1160103.000 -311624.700+1154944.800 - -333626.600+1504756.000 + -333626.200+1504756.100 -123710.900+1420520.000 -143124.400+1322222.800 - -191644.400+1464433.100 - -324749.700+1514959.200 + -191644.500+1464433.400 + -324749.700+1514959.200 -345727.540+1383106.500 -345628.170+1383118.900 -345626.230+1383235.750 @@ -15104,9 +14988,9 @@ BOFOR -351835.990+1491155.540 -351853.310+1491140.000 -302018.150+1530623.570 - -301900.400+1530655.220 + -301900.350+1530655.240 -301926.950+1530714.360 - -301907.350+1530721.230 + -301907.280+1530721.220 -280923.440+1533002.540 -280951.680+1533024.310 -281021.250+1533039.310 @@ -15145,12 +15029,8 @@ BOFOR -320620.090+1155313.280 -204250.490+1164552.960 -204242.290+1164711.300 - -413228.330+1471251.660 -413213.440+1471214.750 - -413221.620+1471303.780 -413307.470+1471300.960 - -413247.620+1471307.570 - -413243.100+1471255.460 -375846.270+1450553.260 -375822.470+1450555.120 -375832.540+1450553.960 @@ -15168,9 +15048,9 @@ BOFOR -373944.120+1445053.130 -374108.800+1445027.600 -345655.820+1503211.270 - -345652.370+1503135.730 + -345652.320+1503135.750 -345608.370+1503307.670 - -345657.560+1503258.030 + -345657.290+1503254.470 -272421.910+1514351.200 -272432.760+1514329.020 -272409.610+1514413.540 @@ -17049,13 +16929,13 @@ BOFOR BAVUR/HB510/-42.878308+147.655375/-42.885281+147.640317/-42.889159+147.623307/-42.889676+147.605506/-42.886797+147.588129/-42.881001+147.572995/HB520/HB30T - - GUPUG/MMLWF/MMLWM - - + BELTA ANBEM/MMLNF/ML16T + + GUPUG/MMLWF/MMLWM + VISAS/MMLEF/MMLEM @@ -17157,66 +17037,61 @@ BOFOR - - + + - - - - - - + - - + + - + - + - + - - + + - + - - + + - + @@ -17224,38 +17099,38 @@ BOFOR - + - - + + - + - + - - + + - + - - - - + + + + @@ -17267,57 +17142,57 @@ BOFOR - + - + - + - - + + - - + + - + - - + + - + - + @@ -17325,81 +17200,81 @@ BOFOR - + - - + + - + - + - - + + - + - + - + - - + + - + - + - - + + - + - + - - - + + + - - + + @@ -17407,41 +17282,41 @@ BOFOR - + - + - - + + - - + + - - + + - + - - - + + + @@ -17449,89 +17324,89 @@ BOFOR - + - - + + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - - + + - + @@ -17540,179 +17415,176 @@ BOFOR - + - + - + - + - - + + - - - - - - + + + - - - - - + + + + + - + - + - + - + - + - + - + - - + + - - - + + + - + - + - - + + - - - + + + - - + + - - + + - + - + - + - + - + - - - + + + - + - - - + + + - + - + - + - + - + @@ -17721,23 +17593,23 @@ BOFOR - - - + + + - + - - - + + + - - + + @@ -17745,71 +17617,71 @@ BOFOR - + - + - - - + + + - + - - + + - + - - - - + + + + - + - + - - - + + + - + - - - - - - + + + + + + - - + + - - + + @@ -17817,86 +17689,86 @@ BOFOR - + - + - + - + - + - + - + - - - + + + - + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - + - - + + @@ -17908,26 +17780,26 @@ BOFOR - + - - - + + + - + - - - + + + - - + + @@ -17936,100 +17808,101 @@ BOFOR - - - - - - - - + + + + + + + + - - - + + + - + - + + - + - + - - + + - + - + - + - - - + + + - + - + - - - + + + - - + + - - + + - - - - - + + + + + - + - + - - + + @@ -18038,39 +17911,39 @@ BOFOR - + - - - + + + - - + + - + - - + + - - + + - + - + @@ -18078,84 +17951,81 @@ BOFOR - - + + - + - + - + - + - - + + - - - - - + - + - + - - + + - - - + + + - - + + - + - - + + - + + - + @@ -18163,7 +18033,7 @@ BOFOR - + @@ -18171,32 +18041,32 @@ BOFOR - - + + - + - - - + + + - + - + - + @@ -18205,7 +18075,7 @@ BOFOR - + @@ -18213,160 +18083,159 @@ BOFOR - - - + + + - + - - - - - + + + + + - - - + + + - - + + - + - + - + - + - + - + - - + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - + - - - + + + - - - + + + - - + + - - - - + + + + - + - - + + - - + + - + - - + + - + - + @@ -18375,13 +18244,13 @@ BOFOR - + - + @@ -18389,120 +18258,115 @@ BOFOR - - + + - + - - - - - - - + + + - + - + - - + + - - - + + + - + - + - - + + - + - + - + - - + - - + + - - - - + + + + - - - + + + - + - + - + - + - + - + @@ -18510,75 +18374,70 @@ BOFOR - - - + + + - + - + - + - + - + - + - - + + - + - - - - - - + - - - + + + - - + + - + - - + + - - + + - + - + @@ -18586,66 +18445,58 @@ BOFOR - - + + - + - - - - + + + - - - - - - + + + - - + + - + - + - - + + - - + + - + - - - + - - - + @@ -18659,21 +18510,21 @@ BOFOR - - - + + + - + - - + + - - + + @@ -18681,41 +18532,41 @@ BOFOR - + - + - + - - + + - + - + - + - - + + @@ -18723,30 +18574,31 @@ BOFOR + - + - - + + - + - + - - - + + + @@ -18754,40 +18606,40 @@ BOFOR - + - + - + - + - + - + - - - - + + + + @@ -18795,25 +18647,26 @@ BOFOR - + + - + - + - - + + @@ -18821,152 +18674,153 @@ BOFOR - + - - - + + + - + - - + + - - + + - + - - - - - - - - - - - + + + + + + + + + + + + - + - - + + - + - - - - - + + + + + - - - + + + - - + + - - + + - - - + + + - - + + - + - + - - + + - - + + - + - + - - + + - + - + - + - + - + @@ -18974,26 +18828,26 @@ BOFOR - + - + - + - + - + - + - + @@ -19001,7 +18855,7 @@ BOFOR - + @@ -19009,33 +18863,33 @@ BOFOR - + - + - - + + - + - + - + @@ -19043,45 +18897,45 @@ BOFOR - + - + - + - + - + - + - + - + - - + + - + @@ -19091,7 +18945,7 @@ BOFOR - + @@ -19103,22 +18957,22 @@ BOFOR - + - + - + - - + + - + @@ -19126,94 +18980,94 @@ BOFOR - + - + - - + + + - + - - + + - + - + - - - - + + + - + - + - + - + - + - - + - + + - + - - + + - - - + + + - + - + @@ -19222,130 +19076,127 @@ BOFOR - - + + - + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + - + - - + + - + - + - + - + - + - + - + - + - - + + - - + + - + - - - - - - + + + - + - - + + - + - - + + @@ -19353,7 +19204,7 @@ BOFOR - + @@ -19361,15 +19212,15 @@ BOFOR - + - + - + - + @@ -19381,55 +19232,55 @@ BOFOR - - + + - - - - - + + + + + - + - + - + - + - + - - + + - + - + - + @@ -19438,29 +19289,29 @@ BOFOR - + - + - + - - - + + + - - + + @@ -19468,47 +19319,47 @@ BOFOR - + - - - - + + + + - + - + - - - - - + + + + + - + - - + + - - + + - + @@ -19516,32 +19367,33 @@ BOFOR - + - + - + + - + - - - - + + + + - - + + @@ -19552,8 +19404,8 @@ BOFOR - - + + @@ -19565,131 +19417,131 @@ BOFOR - + - - + + - + - - - + + + - - + + - - + + - - + + - - - + + + - + - + - - - - + + + + - - - + + + - + - + - + - + - - + + - + - + - + - + - - - + + + - + - - + + - - + + - - + + @@ -19698,56 +19550,56 @@ BOFOR - - + + - - + + - + - + - - - + + + - + - + - + - + - - + + @@ -19770,6 +19622,7 @@ BOFOR + @@ -19802,6 +19655,7 @@ BOFOR + @@ -19827,6 +19681,7 @@ BOFOR + @@ -19837,7 +19692,9 @@ BOFOR + + @@ -19846,8 +19703,9 @@ BOFOR - + + @@ -19896,27 +19754,27 @@ BOFOR - + - - - + + + - + - + - + diff --git a/MET.xml b/MET.xml index b776c42d..074a1bb0 100644 --- a/MET.xml +++ b/MET.xml @@ -12,5 +12,6 @@ + diff --git a/Maps/ALL_AIRPORTS.xml b/Maps/ALL_AIRPORTS.xml index 7c558600..6a5564f4 100644 --- a/Maps/ALL_AIRPORTS.xml +++ b/Maps/ALL_AIRPORTS.xml @@ -3,7 +3,6 @@ YABA - YABR YAMB YANG YAPH @@ -1381,7 +1385,6 @@ YBWP YBWW YBWX - YCAH YCAR YCBA YCBB @@ -1456,7 +1459,6 @@ YGON YGPT YGRM - YGRS YGTE YGTH YGTN @@ -1494,7 +1496,6 @@ YKOW YKRY YKSC - YKWA YLBD YLCG YLEC @@ -1512,7 +1513,6 @@ YMAV YMAY YMBA - YMCO YMDG YMEK YMEN @@ -1521,7 +1521,6 @@ YMGB YMGD YMHB - YMHL YMHU YMIA YMJM @@ -1620,7 +1619,6 @@ YSNW YSOL YSPE - YSPT YSRD YSRI YSRN @@ -1685,7 +1683,6 @@ YAAL YAAP YABB - YABC YABD YABG YABI @@ -1810,6 +1807,7 @@ YBYU YCAB YCAG + YCAH YCAP YCAS YCAV @@ -1947,6 +1945,7 @@ YEUO YEVD YEVP + YEWI YEXM YEYD YFAR @@ -2010,6 +2009,7 @@ YHDY YHEC YHEW + YHGN YHGS YHHY YHIP @@ -2054,7 +2054,6 @@ YJUR YKAB YKAL - YKAT YKBN YKBT YKCH @@ -2107,7 +2106,6 @@ YLIL YLIO YLIV - YLJN YLKE YLKN YLKS @@ -2145,6 +2143,7 @@ YMCK YMCL YMCM + YMCO YMCR YMCT YMDA @@ -2162,8 +2161,8 @@ YMFD YMGG YMGI - YMGR YMGT + YMHL YMHO YMHW YMIG @@ -2194,6 +2193,7 @@ YMOU YMOX YMPA + YMPN YMPY YMRE YMRG @@ -2220,6 +2220,7 @@ YNAP YNAT YNBO + YNBS YNBY YNEN YNER @@ -2241,6 +2242,7 @@ YNSH YNSM YNTH + YNTI YNTM YNUB YNUE @@ -2305,6 +2307,7 @@ YQRN YRAC YRAR + YRAT YRAW YRAY YRBC @@ -2317,7 +2320,6 @@ YREM YRFB YRID - YRKP YRLL YROB YROC @@ -2327,8 +2329,8 @@ YRPA YRPT YRSB - YRSH YRSS + YRST YRSY YRTH YRTP @@ -2367,6 +2369,7 @@ YSNY YSPI YSPK + YSPT YSPY YSRG YSRT @@ -2407,6 +2410,7 @@ YTRS YTUB YTUM + YTUR YTUY YTWA YTWG @@ -2517,6 +2521,7 @@ YXBT YXBU YXBY + YXBZ YXCB YXCH YXCI @@ -2549,6 +2554,7 @@ YXHE YXHG YXHH + YXHK YXHS YXHT YXHU @@ -2574,6 +2580,7 @@ YXLT YXLU YXLX + YXMA YXMB YXMG YXMI @@ -2584,7 +2591,9 @@ YXMQ YXMR YXMS + YXMT YXMV + YXMW YXMX YXMY YXNA @@ -2595,6 +2604,7 @@ YXNR YXNS YXOD + YXOF YXOH YXOK YXOO diff --git a/Maps/ALL_CTA.xml b/Maps/ALL_CTA.xml index 98bc7d5e..24e93256 100644 --- a/Maps/ALL_CTA.xml +++ b/Maps/ALL_CTA.xml @@ -4932,6 +4932,7 @@ -340827.036+1510825.940/ -340819.000+1510735.000/ -340507.000+1511011.000/ +-340507.000+1511011.000/ -340508.000+1511057.000/ -340500.239+1511243.928/ -340437.193+1511427.592/ diff --git a/Maps/ALL_NAVAIDS.xml b/Maps/ALL_NAVAIDS.xml index 7d195c6d..eae237e7 100644 --- a/Maps/ALL_NAVAIDS.xml +++ b/Maps/ALL_NAVAIDS.xml @@ -138,7 +138,7 @@ -173519.600+1235107.200 -165100.100+1454438.000 -173440.700+1234945.400 - -122449.400+1305259.700 + -122447.100+1305300.400 -122523.800+1305423.300 -344217.100+1383644.600 -380607.800+1470916.000 @@ -177,7 +177,7 @@ -202948.800+1483310.700 -092712.000+1471254.000 -311624.700+1154944.800 - -333626.600+1504756.000 + -333626.200+1504756.100 -232258.100+1502817.500 -072226.200+1124616.400 -123710.900+1420520.000 @@ -186,7 +186,7 @@ -191439.100+1464529.100 -143109.100+1322215.600 -193805.100+1341055.000 - -191644.400+1464433.100 + -191644.500+1464433.400 -310357.900+1504948.900 -173943.700+1681438.159 -350956.700+1472808.700 @@ -335,7 +335,7 @@ -173519.600+1235107.200 -165100.100+1454438.000 -173440.700+1234945.400 - -122449.400+1305259.700 + -122447.100+1305300.400 -122523.800+1305423.300 -344217.100+1383644.600 -380607.800+1470916.000 @@ -374,7 +374,7 @@ -202948.800+1483310.700 -092712.000+1471254.000 -311624.700+1154944.800 - -333626.600+1504756.000 + -333626.200+1504756.100 -232258.100+1502817.500 -072226.200+1124616.400 -123710.900+1420520.000 @@ -383,7 +383,7 @@ -191439.100+1464529.100 -143109.100+1322215.600 -193805.100+1341055.000 - -191644.400+1464433.100 + -191644.500+1464433.400 -310357.900+1504948.900 -173943.700+1681438.159 -350956.700+1472808.700 diff --git a/Maps/ALL_RTES_PTS.xml b/Maps/ALL_RTES_PTS.xml index 014bd217..81be7f34 100644 --- a/Maps/ALL_RTES_PTS.xml +++ b/Maps/ALL_RTES_PTS.xml @@ -43,7 +43,7 @@ LEC NDB.H119.ML VOR MK VOR.H12.TESAT ML VOR.H129.DOSEL - ENTRA.H133.GAMBL + ENTRA.H133.IDNER LEC NDB.H135.AD VOR KEPPA.H155.MIA VOR AVNEX.H16.LM VOR @@ -72,7 +72,7 @@ RIC NDB.H76.NBR NDB WHA NDB.H84.AD VOR BN VOR.H91.CORKY - GAMBL.H98.SANAD + IDNER.H98.SANAD SANAD.H99.BOREE JANUS.J138.TL VOR KG VOR.J141.PKS VOR @@ -104,7 +104,7 @@ KABIN.L508.MILLA SBR VOR.L511.TARUN TAPAX.L513.VELMO - EGATU.L514.REVOP + EGATU.L514.AVPAL TESAT.L521.LUNBI LELED.L774.ELATI DADAR.L894.MERIB @@ -116,7 +116,7 @@ SATNA.M766.DN VOR ELBIS.M768.DN VOR PD VOR.N509.ELATI - JUMPA.N584.LAMSI + SAKBI.N584.LAMSI DADAR.N628.SABEK POSOD.N633.PEDPI ELATI.N640.AD VOR @@ -129,13 +129,13 @@ ADKOS.P766.TONIM LIBLA.P880.SCOTT MUBID.Q10.HAMTN - SUGAB.Q11.CAMEL + SUGAB.Q11.NOMAV MEPEM.Q144.ATROP - HOOKS.Q15.WOL NDB + OMLAV.Q15.WOL NDB ML VOR.Q158.PH VOR - HACHI.Q165.TL VOR + SULMI.Q165.TL VOR KEPPA.Q168.WR NDB - ISLIP.Q181.REVOP + ISLIP.Q181.AVPAL AVNEX.Q20.ONGAR SANEG.Q210.NBR NDB BORTO.Q22.CLAMY @@ -145,16 +145,16 @@ TAPAX.Q27.HAMTN RAZZI.Q29.ML VOR ITIDE.Q295.SOSTU - TL VOR.Q30.BOXER + TL VOR.Q30.MATAR BIVAT.Q303.YCCA - BORLI.Q32.GRABL + BORLI.Q32.NODEV AD VOR.Q33.ESP VOR PULOL.Q36.ANGAS BRM NDB.Q38.PH VOR - ELLAS.Q39.SAVER + DUBUD.Q39.SAVER KADOM.Q401.UVUPU AYE NDB.Q41.HAMTN - MORRO.Q421.UNVAT + LIKTO.Q421.UNVAT BORTO.Q46.LESON GOMOL.Q47.ITIDE IBUNA.Q473.HAWKE @@ -167,12 +167,12 @@ BN VOR.Q67.CS VOR GOMOL.Q69.SU VOR PBO VOR.Q7.HALEM - VALRA.Q73.CAMEL + VALRA.Q73.NOMAV BIRDY.Q75.HELLI MNG VOR.Q76.NONUM ADMAR.Q78.OLTIN HAWKY.Q8.AKDAV - PD VOR.Q9.REVOP + PD VOR.Q9.AVPAL DUMAV.Q91.ALLEE SU VOR.Q923.CANTY CS VOR.R204.KEONE @@ -214,7 +214,7 @@ BORLI.UH205.CULIN MUDGI.UH206.SGE NDB NBR NDB.UH209.SCO NDB - SETER.UH224.BN VOR + PONUX.UH224.BN VOR RIC NDB.UH226.ENPAG LHI NDB.UH258.RIKNI KEPPA.UH336.NATYA @@ -230,7 +230,7 @@ BISAB.UQ489.NONID CAPRI.UQ493.PROBO OCTOB.UQ61.SHEPP - EGORE.UQ95.BUNDY + SURVO.UQ95.BUNDY NOLAN.UY327.MAKRL EML NDB.UY409.NIROK PN VOR.UY495.COCKA @@ -273,7 +273,7 @@ GUPDA.W677.ASIXA NWA TAC.W778.DONIC OTLED.Y10.ESDEG - KARAG.Y105.TARAL + VEPAP.Y105.TARAL APPLE.Y108.GEMAC BENDO.Y12.ARBEY MANIG.Y13.VALRA @@ -298,7 +298,7 @@ PH VOR.Y31.BRM NDB ROM NDB.Y316.BEPNA ELDEK.Y32.REBEG - BOXER.Y33.BORLI + MATAR.Y33.BORLI HAWKE.Y340.LAMUG MANIG.Y36.BIDAP AKDAV.Y38.RIKAB @@ -308,14 +308,14 @@ SEDAN.Y465.BN VOR APOMA.Y52.VELGI BURGU.Y53.WENDY - SALEM.Y557.MORGO + URBEN.Y557.MORGO DOSEL.Y59.TESAT ESDEG.Y60.GUVNA POONA.Y61.RUROX CORRS.Y66.GIVID BOSLI.Y67.KG VOR - KARAB.Y69.HERMA - TAROR.Y71.VELGI + LAKIR.Y69.HERMA + VAGPO.Y71.VELGI SCOTT.Y76.SIFRA GEL VOR.Y77.SAGNO ROM NDB.Y79.BN VOR @@ -436,17 +436,17 @@ WANGI WODAY MILLA - REVOP + AVPAL NETTY JACKI RIKAB BADGR ANGEX - GRABL + NODEV HAMTN - HOOKS + OMLAV KROWS - KATHI + ESMIN ONGAR UPSIX FERGI @@ -479,6 +479,7 @@ VENEL OLDIB MAKRU + RULUN BICKL SU VOR UXILO @@ -499,7 +500,7 @@ BRIGG AGROS GRACY - KAYTU + OKISI DOTVU CLARK RIDRI @@ -542,6 +543,7 @@ MANIG STILE VETEL + BODAP WALTA LAMUG SMOKA @@ -558,7 +560,7 @@ PALGA OTGAT AMANA - KARAB + LAKIR COOBI KAPNI EGUGO @@ -597,7 +599,7 @@ IDOTO ELDEK LEEAM - PADDY + VEMLA TEKEP IGLET SALAG @@ -616,7 +618,7 @@ MIGAX NIVED OMUBI - ELLAS + DUBUD RIGMI UPLAR PKS VOR @@ -625,7 +627,7 @@ TIMMI TATUK JORDY - NATLI + UPSAD UBLIN VIRAR PUPEX @@ -652,7 +654,7 @@ DASSA GURVA RIPNA - SETER + PONUX KELPI VIPAM CC VOR @@ -695,7 +697,7 @@ GURDI IBAKA IFFEY - TABAL + LENRI VESUN POXAK PULON @@ -714,7 +716,7 @@ BODEG ONIBA SGE NDB - BIDAG + ONARA GULOP ROOKI HOBAT @@ -741,15 +743,15 @@ KISME GOOFI LM VOR - TAROR + VAGPO AYE NDB JUGGL METUM BIKER VINAX ROM NDB - MIMMI - MORRO + RILGO + LIKTO SAVER DOVOM UBDAK @@ -780,7 +782,7 @@ GEL VOR WARRA AKNUM - BENZO + AVNAS IRSOM MUBID MARTO @@ -796,19 +798,19 @@ ADMAR JANUS NERTI - EGORE + SURVO SEVSI FRT NDB CDU NDB KOOKA - PILLO - COLLA + AROXO + TUSTU TOBIE SAFIR NUNPA TL VOR WISKA - RUSSO + OKODU UVUPU BHI VOR SPRIG @@ -896,7 +898,7 @@ LIBLA NUMSA SUGAB - CAMEL + NOMAV ATROP WOL NDB CANDY @@ -904,7 +906,7 @@ COBEL CRICK BEVLY - HACHI + SULMI OPORI TAPIT BAXMN @@ -922,7 +924,7 @@ LODGE LUCRE DONDI - WEEDA + UNVAX JULIM KATAR NALAR @@ -944,7 +946,7 @@ COOPA OLTIN TUREK - RANGR + RULVI KIMMI LIDIT KALIN @@ -979,7 +981,7 @@ POTIP BRM NDB VIRUV - SALEM + URBEN YUSEF MOCHO RASKY @@ -1002,7 +1004,7 @@ GOOMA BISAB KILIK - GORDO + AVNIB KEBAB COCKA NUBNI @@ -1026,7 +1028,7 @@ HOLLA HUSKY HYDRA - CULAB + OSTOL MADOG STAIR KANKO @@ -1043,7 +1045,7 @@ ASEBU BEPNA YEEDI - JANNA + KAYOK REMBO IGIPA ALASU @@ -1110,7 +1112,7 @@ BIGUP ONALA AGOXI - ATERA + SOVRO MELBO DIPSO NATYA @@ -1121,7 +1123,7 @@ SCO NDB MATLA SORTI - GAMBL + IDNER EURAD TOLAG ML VOR @@ -1174,7 +1176,7 @@ ARG VOR LRE NDB ONSLO - TUBBY + TUVBI UNTET LAXAR MUNNI @@ -1194,7 +1196,7 @@ BOBOP SHADY MOLGA - BOXER + MATAR MESED YCCA PULOL @@ -1244,7 +1246,7 @@ SANOX ATVIL DUKAD - LIFFY + LAXOT LEBIT SPENA OLNAM @@ -1270,7 +1272,7 @@ LAKMO MURCH REBEG - KONIL + ENGUD LST NDB BUTON MTG VOR @@ -1293,7 +1295,7 @@ BUTPA KIKEM TN VOR - TASHA + RILVO APOMA ATMAP SAPDA @@ -1323,7 +1325,7 @@ TNK VOR SARIK SIFRA - COOPS + KAGRI ECKHO TARUN TAPAX @@ -1332,7 +1334,7 @@ TUNGO HEWIT BANKS - WALTZ + ERVON LELED IDEVI ELATI @@ -1340,7 +1342,7 @@ POLUM MERIB GIVID - GILLY + BOTGU PLUGA DOGAR PIBED @@ -1350,14 +1352,14 @@ SATNA TANEM MUTMI - JUMPA + SAKBI POSOD PEDPI EGAVI UPNOT ATMAL GEMAC - MIKEL + MIKEG AKALU KADAP KABTA @@ -1380,7 +1382,7 @@ AGSEL RISMI MILIV - KARAG + VEPAP VALRA WARTY REEFE @@ -1403,11 +1405,11 @@ KIBAV.A216.HOOVR - PADDY.A346.SALAG + VEMLA.A346.SALAG DN VOR.A461.LEC NDB - ELLAS.A464.UPLAR + DUBUD.A464.UPLAR TESAT.A576.KADOM - NATLI.A579.CUFFY + UPSAD.A579.CUFFY AD VOR.A585.SAPDA MAJ NDB.A598.GURVA VIPAM.B220.PY VOR @@ -1418,21 +1420,21 @@ NTN NDB.B472.GV VOR ISTEM.B474.ADISN ISTEM.B578.IBAKA - TABAL.B580.BAYUS + LENRI.B580.BAYUS HUTEL.B586.LTO VOR HOBAT.B598.PAKMI VEVEK.G205.GOOFI PKS VOR.G222.BRM NDB - TABAL.G329.NF VOR + LENRI.G329.NF VOR MEKAD.G342.HN VOR - ATERA.G459.PASNI + SOVRO.G459.PASNI MUGEN.G591.TEPAM TESAS.G595.MALNI MIA VOR.H102.NATYA TASUM.H111.LT VOR NATYA.H119.ML VOR ML VOR.H129.DOSEL - ENTRA.H133.GAMBL + ENTRA.H133.IDNER AVNEX.H16.LM VOR ML VOR.H169.IRSOM WOL NDB.H20.MOTRA @@ -1448,7 +1450,7 @@ TESAT.H65.RAZZI ML VOR.H66.LAGOB WHA NDB.H84.AD VOR - GAMBL.H98.SANAD + IDNER.H98.SANAD SANAD.H99.BOREE KG VOR.J141.FRT NDB CDU NDB.J149.WHA NDB @@ -1474,7 +1476,7 @@ TENCH.J917.AYMS LM VOR.J93.KU VOR TESAS.L503.KABKA - MUNNI.L514.REVOP + MUNNI.L514.AVPAL TOMAR.M625.GOPLU DONYA.M768.DN VOR KAMBI.N640.AD VOR @@ -1482,10 +1484,10 @@ PH VOR.Q17.ONGAR SANEG.Q210.NBR NDB TN VOR.Q23.DN VOR - TL VOR.Q30.BOXER + TL VOR.Q30.MATAR BIVAT.Q303.YCCA BRM NDB.Q38.OPALL - MORRO.Q421.UNVAT + LIKTO.Q421.UNVAT BN VOR.Q484.ROM NDB YBWW.Q607.UPMOG YGGE.Q65.OVLUK @@ -1512,7 +1514,7 @@ DU NDB.V138.AKMIR TESAT.V140.CFS VOR AY VOR.V147.TEMIS - STURT.V15.MOG NDB + LAKAV.V15.MOG NDB CS VOR.V153.RK VOR NWN VOR.V16.WOORA BUD NDB.V163.LAMUG @@ -1522,7 +1524,7 @@ VAVPA.V175.AD VOR MK VOR.V176.CLIFT BHI VOR.V180.AKMIR - CORDO.V20.TEMIS + PEGSU.V20.TEMIS VAVPA.V200.TYNDI BENDO.V211.PUBAP SU VOR.V217.GAYLA @@ -1556,15 +1558,15 @@ LEBIT.V412.ROM NDB ACTIN.V432.MARGO ESL NDB.V434.MONTY - CORDO.V501.NWA NDB + PEGSU.V501.NWA NDB AD VOR.V504.VAVPA COLDS.V512.ESDAN PN VOR.V527.ALISN IBUNA.V530.YKRY YORKE.V538.PLC NDB - WYY NDB.V544.LIFFY + WYY NDB.V544.LAXOT LTV NDB.V588.MONTY - CWR NDB.V599.WATLE + CWR NDB.V599.DARGI CDU NDB.V621.RIKAB DOLVU.V623.BENDO DUNNE.V650.BADGR @@ -1592,7 +1594,7 @@ ENKOG.W128.SANAD OLTIN.W130.TW VOR CB VOR.W137.MUDGI - CORDO.W138.CB VOR + PEGSU.W138.CB VOR OTKUN.W14.LM VOR WHA NDB.W142.AD VOR RIC TAC.W144.NWA NDB @@ -1637,7 +1639,7 @@ LTV NDB.W219.LT VOR KAMBA.W220.NBR NDB YHOT.W222.CB VOR - GAMBL.W223.MATLA + IDNER.W223.MATLA GV VOR.W226.OLMAR SAGLI.W228.LINSU SAGLI.W231.GLA VOR @@ -1701,7 +1703,7 @@ BOU NDB.W349.VESOP AGETA.W353.HUUGO BN VOR.W354.DULIN - DN VOR.W356.GAMBL + DN VOR.W356.IDNER CANTY.W357.PKS VOR MUDGI.W359.TW VOR DN VOR.W364.VEVAV @@ -1768,7 +1770,7 @@ ABA NDB.W486.PLC NDB RIC NDB.W487.QDI NDB VESOP.W492.NTN NDB - LAGOB.W494.GAMBL + LAGOB.W494.IDNER MONTY.W495.WYY NDB ISNOL.W497.MAKIV RIGTU.W499.GODIM @@ -1828,7 +1830,7 @@ CB VOR.W643.MER NDB CV NDB.W644.CCY NDB ESL NDB.W649.MAKIV - WOL NDB.W652.WATLE + WOL NDB.W652.DARGI BOGES.W654.VIRUR UGPUR.W657.ESDIG TL VOR.W660.LRE NDB @@ -1884,7 +1886,7 @@ ESL NDB.W809.MOZZA ANBAN.W811.AGETA LHI NDB.W812.CFS VOR - AY VOR.W817.WATLE + AY VOR.W817.DARGI TW VOR.W821.PMQ NDB DU NDB.W822.BITUL OLTIN.W824.UGPOT @@ -1908,16 +1910,16 @@ SU VOR.W909.BURPA SPARK.W934.BN VOR AGETA.W946.TN VOR - PIGGY.W949.ENAID + TEDEB.W949.ENAID ROM NDB.W951.VALDZ AMOCO.W952.CALTX MOBIL.W953.DOLKO - CFS VOR.W954.OCTAN + CFS VOR.W954.LADUR OTLED.Y10.ESDEG PH VOR.Y15.VETEL ROM NDB.Y166.ROWLO ROM NDB.Y195.BN VOR - WATLE.Y20.BK NDB + DARGI.Y20.BK NDB LM VOR.Y207.BORVI VENGA.Y208.BORVI MASMI.Y24.BIVAT @@ -1928,10 +1930,10 @@ HUG NDB.Y34.BATIR RUGBO.Y37.YGGE BELUL.Y408.PONAN - NORIC.Y41.YKAR + NINEK.Y41.YKAR ESDEG.Y44.PD VOR MTG VOR.Y53.WENDY - SALEM.Y557.MORGO + URBEN.Y557.MORGO MOVBA.Y684.SUSGI GEL VOR.Y77.SAGNO ROM NDB.Y79.BN VOR @@ -1948,12 +1950,12 @@ SWIFT.Z17.OVRON PH VOR.Z19.KABRO LEO NDB.Z22.MULDM - ROSMO.Z23.KG VOR + AVGIK.Z23.KG VOR SWIFT.Z25.ALBUX IPLAV.Z32.TERAR OVMIS.Z35.DN VOR NISOP.Z38.PH VOR - GEL VOR.Z41.MOROK + GEL VOR.Z41.TEBIP OK VOR.Z418.OOM NDB CS VOR.Z42.SAMOR PH VOR.Z44.ESP VOR @@ -1964,7 +1966,7 @@ LTV NDB.Z54.CB VOR KA VOR.Z55.GEL VOR WDH NDB.Z56.CV NDB - NORIC.Z61.WLU NDB + NINEK.Z61.WLU NDB KATCM.Z67.YAHMO KAKDO.Z68.BUNGL JULIE.Z69.METAN @@ -1985,7 +1987,7 @@ TL VOR.ZZ929.YGON YAMB.ZZ931.SEMAJ SEMAJ.ZZ932.YAMB - AMB TAC.ZZ933.PIGGY + AMB TAC.ZZ933.TEDEB WAYS.ZZ975.BOFOR HAWKY @@ -2047,9 +2049,9 @@ BULOK MUSEY WANGI - REVOP + AVPAL RIKAB - KATHI + ESMIN HAMTN PH VOR OTLED @@ -2083,17 +2085,17 @@ REVGU LATUT DUGGI - STURT + LAKAV IBUXI BINUN WALTA DAGSI POONA ABVAS - MOROK + TEBIP WOORA LAMUG - CORDO + PEGSU WAZZA BOYSE VAVPA @@ -2144,7 +2146,7 @@ RUPEM TOROB REVKI - WATLE + DARGI GULLY BADGR BODAS @@ -2167,7 +2169,7 @@ RIC TAC TONTO NELSN - LLOYD + IGNES TEMPL AV VOR MER NDB @@ -2281,7 +2283,7 @@ YMMU VEVOS ABASS - HOOKS + OMLAV IDNUT BAROW MEEGA @@ -2299,11 +2301,11 @@ BORDA SPARK ENAID - PIGGY + TEDEB LOUEY DEWEY - DINOS - ETHER + ESLES + LIDBU AMOCO BOOMA CALTX @@ -2313,7 +2315,7 @@ VEGDI DOLKO GALON - OCTAN + LADUR VETEL AGIVA GLENN @@ -2322,17 +2324,17 @@ KAPNI BATIR RUGBO - NORIC + NINEK MORID SAGNO NODOR SWIFT RAVON MULDM - ROSMO + AVGIK KATCM TERAR - IRWIN + AVDIS HINDS CANRI PUMRY @@ -2358,7 +2360,7 @@ FACED GALEE HOOVR - PADDY + VEMLA TEKEP IGLET SALAG @@ -2369,10 +2371,10 @@ AS VOR IDANU LEC NDB - ELLAS + DUBUD RIGMI UPLAR - NATLI + UPSAD UBLIN VIRAR PUPEX @@ -2424,7 +2426,7 @@ NILAX GURDI IBAKA - TABAL + LENRI VESUN POXAK PULON @@ -2455,7 +2457,7 @@ KISME GOOFI PKS VOR - TAROR + VAGPO AYE NDB JUGGL DOVOM @@ -2478,7 +2480,7 @@ GEL VOR WARRA LM VOR - BENZO + AVNAS IRSOM MOTRA MUDGI @@ -2488,7 +2490,7 @@ SEVSI FRT NDB CDU NDB - COLLA + TUSTU TOBIE CIN VOR SAFIR @@ -2497,7 +2499,7 @@ PEKAY TL VOR WISKA - RUSSO + OKODU UVUPU BHI VOR DOTOP @@ -2511,7 +2513,7 @@ GTE NDB DOSAM GAFER - BIDAG + ONARA CFS VOR KU VOR JULUP @@ -2536,7 +2538,7 @@ NBR NDB VEGPU DONDI - MORRO + LIKTO UNVAT SAMVI UPMOG @@ -2554,7 +2556,7 @@ MUNDA NIPOK GUXIB - SALEM + URBEN EML NDB SPARO CONNI @@ -2586,7 +2588,7 @@ DERAK SNOOD ENRES - CRISO + LERGU UGPOT RUDEY SGE NDB @@ -2594,9 +2596,9 @@ UNSOV ANTLA LT VOR - HELIX - MIBOX - GAMBL + ELMOR + SOVRU + IDNER GV VOR EGUMI KETEN @@ -2614,8 +2616,8 @@ ROM NDB BELUL WDH NDB - BLIGH - CARDO + TEROG + BUPMO GULFF CV NDB YKRY @@ -2623,23 +2625,23 @@ RARIE TURET ALIRA - ROHAN + TUVRA LINDO IRONS NIFTI FORMA DUMPA ASIXA - CAMUS + AKLAB PENNY KIPPA CCY NDB SEBVA - ATILA + GOTLU NATTY BENTA GUPDA - SOFIE + GULNU GALAH OMKEK GEPEC @@ -2651,8 +2653,8 @@ JAFFA MUNEL GODIP - KANGA - KOALA + RIBLU + BENVO FASIE POSUM BILBY @@ -2663,12 +2665,12 @@ VALDZ TEXAN PETRL - BARON + GUKVI SAVER KELPI LAMEK ESDEG - CULAB + OSTOL MADOG KADLU VESIM @@ -2679,7 +2681,7 @@ ASEBU BEPNA DAVEY - JANNA + KAYOK MOVBA VOMPA GUSNI @@ -2691,14 +2693,14 @@ GRENE YLLE NECTA - CONOR + KADMU PUDIN DADER POGAV - NALLY + OMLAT METAN ENTAL - CAMEL + NOMAV BULGI BANAM GAANY @@ -2743,7 +2745,7 @@ GOMUL BIGUP AGOXI - ATERA + SOVRO NATYA SALRI MATLA @@ -2801,7 +2803,7 @@ ESP VOR OSTAM BOBOP - BOXER + MATAR MESED YCCA OPALL @@ -2846,7 +2848,7 @@ MILTY SUSGI OTLEB - LIFFY + LAXOT SILVN SOSTU CHITT @@ -2868,6 +2870,7 @@ BORAH HUUGO GLB NDB + UPTEK BUVEL HAMEL COMAC @@ -2884,7 +2887,7 @@ CUN NDB VEMON OCKLY - FORTT + KRATT TUCKI LOFFA GUBVO @@ -2928,7 +2931,7 @@ MAKIV LST NDB ISMUN - SAVAN + IKOLA HOBBS BANCA IDKEG @@ -2938,12 +2941,12 @@ ENPIM STEEL WILLS - BONGO + OLGUM ALORA NICOL YARDD LITEL - MORIS + IPMAD QDI NDB WOOFA MATVI @@ -2974,7 +2977,7 @@ LHR NDB JAMBO ENTRE - OLLIE + SUPGA SANDI AREST PUMET @@ -3007,7 +3010,7 @@ COBHI SUNAL ONUMA - MOREL + PANRO KANLU TYERS ELONG @@ -3038,18 +3041,18 @@ HARVS BONEY NORIS - MASHA + RUMGI YBIE DUTAK MURCH - SISTA + VIROK JULES LOUIE NISOP YAHMO - CHAPL + MUPIK COLLY - CRIST + NUBTA TIGGA SAMOR GORKA @@ -3059,7 +3062,7 @@ KAKDO LIRRI YOKRA - KONIL + ENGUD MIDIM MAKEE MESER @@ -3078,7 +3081,7 @@ TN VOR WR NDB TNK VOR - TASHA + RILVO SARIK BANKS NWN VOR @@ -3111,51 +3114,51 @@ VINAX ANBAN DOTTE - ARTON + AKEVU OLDER - BURTO + NOKAV OVENS WIRMA BARTA FLATS - TEDDY - LORNE + PUBOX + ARUTA COPPA DAPPA TINAH MYALL - MIDEL - HAMER - BAMBI + MADLU + MANSA + RIRSA ALONE - DAMIN - NIKIL + SHIKO + MIPAM PEPPY UGVER GOMOM TRUMP MANNA - BROAD + PADBU BEETI - ARGON - JUDIE + DOMTI + ANLAR PILTA KELVN HEALE HOKOR BILIN - TERIK - DYMON - FOYLE + TUNGU + MEGOL + ENSAB KANBU DOORA MEPAS - MANDO + BIMAV SHINN MUNGA ORTOS KIDEX - FREDD + LEPTA VANVA IDODA @@ -3221,9 +3224,9 @@ BULOK MUSEY WANGI - REVOP + AVPAL RIKAB - KATHI + ESMIN HAMTN PH VOR OTLED @@ -3257,17 +3260,17 @@ REVGU LATUT DUGGI - STURT + LAKAV IBUXI BINUN WALTA DAGSI POONA ABVAS - MOROK + TEBIP WOORA LAMUG - CORDO + PEGSU WAZZA BOYSE VAVPA @@ -3318,7 +3321,7 @@ RUPEM TOROB REVKI - WATLE + DARGI GULLY BADGR BODAS @@ -3341,7 +3344,7 @@ RIC TAC TONTO NELSN - LLOYD + IGNES TEMPL AV VOR MER NDB @@ -3455,7 +3458,7 @@ YMMU VEVOS ABASS - HOOKS + OMLAV IDNUT BAROW MEEGA @@ -3473,11 +3476,11 @@ BORDA SPARK ENAID - PIGGY + TEDEB LOUEY DEWEY - DINOS - ETHER + ESLES + LIDBU AMOCO BOOMA CALTX @@ -3487,7 +3490,7 @@ VEGDI DOLKO GALON - OCTAN + LADUR VETEL AGIVA GLENN @@ -3496,17 +3499,17 @@ KAPNI BATIR RUGBO - NORIC + NINEK MORID SAGNO NODOR SWIFT RAVON MULDM - ROSMO + AVGIK KATCM TERAR - IRWIN + AVDIS HINDS CANRI PUMRY @@ -3530,7 +3533,7 @@ FACED GALEE HOOVR - PADDY + VEMLA TEKEP IGLET SALAG @@ -3541,10 +3544,10 @@ AS VOR IDANU LEC NDB - ELLAS + DUBUD RIGMI UPLAR - NATLI + UPSAD UBLIN VIRAR PUPEX @@ -3596,7 +3599,7 @@ NILAX GURDI IBAKA - TABAL + LENRI VESUN POXAK PULON @@ -3627,7 +3630,7 @@ KISME GOOFI PKS VOR - TAROR + VAGPO AYE NDB JUGGL DOVOM @@ -3650,7 +3653,7 @@ GEL VOR WARRA LM VOR - BENZO + AVNAS IRSOM MOTRA MUDGI @@ -3660,7 +3663,7 @@ SEVSI FRT NDB CDU NDB - COLLA + TUSTU TOBIE CIN VOR SAFIR @@ -3669,7 +3672,7 @@ PEKAY TL VOR WISKA - RUSSO + OKODU UVUPU BHI VOR DOTOP @@ -3683,7 +3686,7 @@ GTE NDB DOSAM GAFER - BIDAG + ONARA CFS VOR KU VOR JULUP @@ -3708,7 +3711,7 @@ NBR NDB VEGPU DONDI - MORRO + LIKTO UNVAT SAMVI UPMOG @@ -3726,7 +3729,7 @@ MUNDA NIPOK GUXIB - SALEM + URBEN EML NDB SPARO CONNI @@ -3758,7 +3761,7 @@ DERAK SNOOD ENRES - CRISO + LERGU UGPOT RUDEY SGE NDB @@ -3766,9 +3769,9 @@ UNSOV ANTLA LT VOR - HELIX - MIBOX - GAMBL + ELMOR + SOVRU + IDNER GV VOR EGUMI KETEN @@ -3786,8 +3789,8 @@ ROM NDB BELUL WDH NDB - BLIGH - CARDO + TEROG + BUPMO GULFF CV NDB YKRY @@ -3795,23 +3798,23 @@ RARIE TURET ALIRA - ROHAN + TUVRA LINDO IRONS NIFTI FORMA DUMPA ASIXA - CAMUS + AKLAB PENNY KIPPA CCY NDB SEBVA - ATILA + GOTLU NATTY BENTA GUPDA - SOFIE + GULNU GALAH OMKEK GEPEC @@ -3823,8 +3826,8 @@ JAFFA MUNEL GODIP - KANGA - KOALA + RIBLU + BENVO FASIE POSUM BILBY @@ -3835,12 +3838,12 @@ VALDZ TEXAN PETRL - BARON + GUKVI SAVER KELPI LAMEK ESDEG - CULAB + OSTOL MADOG KADLU VESIM @@ -3851,7 +3854,7 @@ ASEBU BEPNA DAVEY - JANNA + KAYOK MOVBA VOMPA GUSNI @@ -3863,14 +3866,14 @@ GRENE YLLE NECTA - CONOR + KADMU PUDIN DADER POGAV - NALLY + OMLAT METAN ENTAL - CAMEL + NOMAV BULGI BANAM GAANY @@ -3913,7 +3916,7 @@ GOMUL BIGUP AGOXI - ATERA + SOVRO NATYA SALRI MATLA @@ -3971,7 +3974,7 @@ ESP VOR OSTAM BOBOP - BOXER + MATAR MESED YCCA OPALL @@ -4016,7 +4019,7 @@ MILTY SUSGI OTLEB - LIFFY + LAXOT SILVN SOSTU CHITT @@ -4038,6 +4041,7 @@ BORAH HUUGO GLB NDB + UPTEK BUVEL HAMEL COMAC @@ -4054,7 +4058,7 @@ CUN NDB VEMON OCKLY - FORTT + KRATT TUCKI LOFFA GUBVO @@ -4098,7 +4102,7 @@ MAKIV LST NDB ISMUN - SAVAN + IKOLA HOBBS BANCA IDKEG @@ -4108,12 +4112,12 @@ ENPIM STEEL WILLS - BONGO + OLGUM ALORA NICOL YARDD LITEL - MORIS + IPMAD QDI NDB WOOFA MATVI @@ -4144,7 +4148,7 @@ LHR NDB JAMBO ENTRE - OLLIE + SUPGA SANDI AREST PUMET @@ -4177,7 +4181,7 @@ COBHI SUNAL ONUMA - MOREL + PANRO KANLU TYERS ELONG @@ -4208,18 +4212,18 @@ HARVS BONEY NORIS - MASHA + RUMGI YBIE DUTAK MURCH - SISTA + VIROK JULES LOUIE NISOP YAHMO - CHAPL + MUPIK COLLY - CRIST + NUBTA TIGGA SAMOR GORKA @@ -4229,7 +4233,7 @@ KAKDO LIRRI YOKRA - KONIL + ENGUD MIDIM MAKEE MESER @@ -4246,7 +4250,7 @@ TN VOR WR NDB TNK VOR - TASHA + RILVO SARIK BANKS NWN VOR @@ -4277,51 +4281,51 @@ VINAX ANBAN DOTTE - ARTON + AKEVU OLDER - BURTO + NOKAV OVENS WIRMA BARTA FLATS - TEDDY - LORNE + PUBOX + ARUTA COPPA DAPPA TINAH MYALL - MIDEL - HAMER - BAMBI + MADLU + MANSA + RIRSA ALONE - DAMIN - NIKIL + SHIKO + MIPAM PEPPY UGVER GOMOM TRUMP MANNA - BROAD + PADBU BEETI - ARGON - JUDIE + DOMTI + ANLAR PILTA KELVN HEALE HOKOR BILIN - TERIK - DYMON - FOYLE + TUNGU + MEGOL + ENSAB KANBU DOORA MEPAS - MANDO + BIMAV SHINN MUNGA ORTOS KIDEX - FREDD + LEPTA VANVA IDODA @@ -4427,17 +4431,17 @@ WANGI WODAY MILLA - REVOP + AVPAL NETTY JACKI RIKAB BADGR ANGEX - GRABL + NODEV HAMTN - HOOKS + OMLAV KROWS - KATHI + ESMIN ONGAR UPSIX FERGI @@ -4470,6 +4474,7 @@ VENEL OLDIB MAKRU + RULUN BICKL SU VOR UXILO @@ -4490,7 +4495,7 @@ BRIGG AGROS GRACY - KAYTU + OKISI DOTVU CLARK RIDRI @@ -4533,6 +4538,7 @@ MANIG STILE VETEL + BODAP WALTA LAMUG SMOKA @@ -4549,7 +4555,7 @@ PALGA OTGAT AMANA - KARAB + LAKIR COOBI KAPNI EGUGO @@ -4586,7 +4592,7 @@ IDOTO ELDEK LEEAM - PADDY + VEMLA TEKEP IGLET SALAG @@ -4605,7 +4611,7 @@ MIGAX NIVED OMUBI - ELLAS + DUBUD RIGMI UPLAR PKS VOR @@ -4614,7 +4620,7 @@ TIMMI TATUK JORDY - NATLI + UPSAD UBLIN VIRAR PUPEX @@ -4641,7 +4647,7 @@ DASSA GURVA RIPNA - SETER + PONUX KELPI VIPAM CC VOR @@ -4684,7 +4690,7 @@ GURDI IBAKA IFFEY - TABAL + LENRI VESUN POXAK PULON @@ -4703,7 +4709,7 @@ BODEG ONIBA SGE NDB - BIDAG + ONARA GULOP ROOKI HOBAT @@ -4730,15 +4736,15 @@ KISME GOOFI LM VOR - TAROR + VAGPO AYE NDB JUGGL METUM BIKER VINAX ROM NDB - MIMMI - MORRO + RILGO + LIKTO SAVER DOVOM UBDAK @@ -4769,7 +4775,7 @@ GEL VOR WARRA AKNUM - BENZO + AVNAS IRSOM MUBID MARTO @@ -4785,19 +4791,19 @@ ADMAR JANUS NERTI - EGORE + SURVO SEVSI FRT NDB CDU NDB KOOKA - PILLO - COLLA + AROXO + TUSTU TOBIE SAFIR NUNPA TL VOR WISKA - RUSSO + OKODU UVUPU BHI VOR SPRIG @@ -4885,7 +4891,7 @@ LIBLA NUMSA SUGAB - CAMEL + NOMAV ATROP WOL NDB CANDY @@ -4893,7 +4899,7 @@ COBEL CRICK BEVLY - HACHI + SULMI OPORI TAPIT BAXMN @@ -4911,7 +4917,7 @@ LODGE LUCRE DONDI - WEEDA + UNVAX JULIM KATAR NALAR @@ -4933,7 +4939,7 @@ COOPA OLTIN TUREK - RANGR + RULVI KIMMI LIDIT KALIN @@ -4968,7 +4974,7 @@ POTIP BRM NDB VIRUV - SALEM + URBEN YUSEF MOCHO RASKY @@ -4991,7 +4997,7 @@ GOOMA BISAB KILIK - GORDO + AVNIB KEBAB COCKA NUBNI @@ -5015,7 +5021,7 @@ HOLLA HUSKY HYDRA - CULAB + OSTOL MADOG STAIR KANKO @@ -5032,7 +5038,7 @@ ASEBU BEPNA YEEDI - JANNA + KAYOK REMBO IGIPA ALASU @@ -5097,7 +5103,7 @@ BIGUP ONALA AGOXI - ATERA + SOVRO MELBO DIPSO NATYA @@ -5108,7 +5114,7 @@ SCO NDB MATLA SORTI - GAMBL + IDNER EURAD TOLAG ML VOR @@ -5161,7 +5167,7 @@ ARG VOR LRE NDB ONSLO - TUBBY + TUVBI UNTET LAXAR MUNNI @@ -5181,7 +5187,7 @@ BOBOP SHADY MOLGA - BOXER + MATAR MESED YCCA PULOL @@ -5231,7 +5237,7 @@ SANOX ATVIL DUKAD - LIFFY + LAXOT LEBIT SPENA OLNAM @@ -5257,7 +5263,7 @@ LAKMO MURCH REBEG - KONIL + ENGUD LST NDB BUTON MTG VOR @@ -5278,7 +5284,7 @@ BUTPA KIKEM TN VOR - TASHA + RILVO APOMA ATMAP SAPDA @@ -5308,7 +5314,7 @@ TNK VOR SARIK SIFRA - COOPS + KAGRI ECKHO TARUN TAPAX @@ -5317,7 +5323,7 @@ TUNGO HEWIT BANKS - WALTZ + ERVON LELED IDEVI ELATI @@ -5325,7 +5331,7 @@ POLUM MERIB GIVID - GILLY + BOTGU PLUGA DOGAR PIBED @@ -5335,14 +5341,14 @@ SATNA TANEM MUTMI - JUMPA + SAKBI POSOD PEDPI EGAVI UPNOT ATMAL GEMAC - MIKEL + MIKEG AKALU KADAP KABTA @@ -5365,7 +5371,7 @@ AGSEL RISMI MILIV - KARAG + VEPAP VALRA WARTY REEFE diff --git a/Maps/APP_RNP_ALL.xml b/Maps/APP_RNP_ALL.xml index 0cb5cd71..83f65a9f 100644 --- a/Maps/APP_RNP_ALL.xml +++ b/Maps/APP_RNP_ALL.xml @@ -162,8 +162,8 @@ MMBSA MMBSB MMBSC - GUPUG BELTA + GUPUG VISAS AKDEL LUNGA @@ -281,8 +281,8 @@ MLTSF MMBNF MMBSF - MMLWF MMLNF + MMLWF MMLEF BOSGI PADSF @@ -385,16 +385,6 @@ STWEI WM2WI WM2EI - AE2EA - AE2EB - AE2EC - AE2EF - AE2EI - AE2WD - AE2WE - AE2WG - AE2WF - AE2WI AG2ND AG2NE AG2NG @@ -1338,15 +1328,6 @@ HLTSJ HLTSF HLTSI - HO2EA - HO2EB - HO2EC - HO2EF - HO2EI - HO2WE - HO2WG - HO2WF - HO2WI HOZEA HOZEB HOZEC @@ -1386,6 +1367,8 @@ IA2EF IA2EI IA2WB + IA2WC + IA2WD IA2WF IA2WI IB3EA @@ -1610,16 +1593,6 @@ KSCSJ KSCSF KSCSI - KW2ND - KW2NE - KW2NG - KW2NF - KW2NI - KW2SA - KW2SB - KW2SC - KW2SF - KW2SI KWMED KWMEE KWMEG @@ -3166,8 +3139,8 @@ MLTSF MMBNF MMBSF - MMLWF MMLNF + MMLWF MMLEF BOSGI PADSF @@ -3201,8 +3174,6 @@ STWEF WM2WF WM2EF - AE2EF - AE2WF AG2NF AG2SF ALHWF @@ -3398,8 +3369,6 @@ HISWF HLTNF HLTSF - HO2EF - HO2WF HOZEF HSMEF HSMWF @@ -3455,8 +3424,6 @@ KRYSF KSCNF KSCSF - KW2NF - KW2SF KWMEF KWMWF LBDEF @@ -3845,8 +3812,6 @@ STWEI WM2WI WM2EI - AE2EI - AE2WI AG2NI AG2SI ALHWI @@ -4042,8 +4007,6 @@ HISWI HLTNI HLTSI - HO2EI - HO2WI HOZEI HSMEI HSMWI @@ -4099,8 +4062,6 @@ KRYSI KSCNI KSCSI - KW2NI - KW2SI KWMEI KWMWI LBDEI @@ -4566,8 +4527,8 @@ MMBSA MMBSB MMBSC - GUPUG BELTA + GUPUG VISAS AKDEL LUNGA @@ -4640,12 +4601,6 @@ WM2ED WM2EE WM2EG - AE2EA - AE2EB - AE2EC - AE2WD - AE2WE - AE2WG AG2ND AG2NE AG2NG @@ -5201,11 +5156,6 @@ HLTSE HLTSG HLTSJ - HO2EA - HO2EB - HO2EC - HO2WE - HO2WG HOZEA HOZEB HOZEC @@ -5229,6 +5179,8 @@ IA2EG IA2EJ IA2WB + IA2WC + IA2WD IB3EA IB3EB IB3EC @@ -5360,12 +5312,6 @@ KSCSE KSCSG KSCSJ - KW2ND - KW2NE - KW2NG - KW2SA - KW2SB - KW2SC KWMED KWMEE KWMEG @@ -6247,16 +6193,6 @@ ZW2WE ZW2WG - AE2EA/AE2EI - AE2EB/AE2EI - AE2EC/AE2EI - AE2EI/AE2EF - -243737.060+1183742.710/AE2EF - AE2WD/AE2WI - AE2WE/AE2WI - AE2WG/AE2WI - AE2WI/AE2WF - -243720.900+1183641.200/AE2WF AG2ND/AG2NI AG2NE/AG2NI AG2NG/AG2NI @@ -6680,12 +6616,12 @@ CNYNC/CNYNI CNYND/CNYNI CNYNI/CNYNF - -184513.530+1384218.320/CNYNF + -184513.470+1384217.990/CNYNF CNYSE/CNYSI CNYSG/CNYSI CNYSJ/CNYSI CNYSI/CNYSF - -184549.450+1384247.930/CNYSF + -184549.340+1384248.030/CNYSF COEWA/COEWI COEWB/COEWI COEWC/COEWI @@ -6785,22 +6721,22 @@ CWRNC/CWRNI CWRND/CWRNI CWRNI/CWRNF - -335021.160+1483841.600/CWRNF + -335021.160+1483841.570/CWRNF CWRSE/CWRSI CWRSG/CWRSI CWRSJ/CWRSI CWRSI/CWRSF - -335111.320+1483901.760/CWRSF + -335111.330+1483901.730/CWRSF DBOEA/DBOEI DBOEB/DBOEI DBOEC/DBOEI DBOEI/DBOEF - -321249.350+1483500.430/DBOEF + -321249.290+1483500.450/DBOEF DBOWD/DBOWI DBOWE/DBOWI DBOWG/DBOWI DBOWI/DBOWF - -321322.160+1483407.810/DBOWF + -321322.090+1483407.820/DBOWF DG2EC/DG2EI DG2ED/DG2EI DG2EI/DG2EF @@ -6916,12 +6852,12 @@ ESPEE/ESPEI ESPEG/ESPEI ESPEI/ESPEF - -334106.210+1214951.210/ESPEF + -334106.250+1214951.240/ESPEF ESPWA/ESPWI ESPWB/ESPWI ESPWC/ESPWI ESPWI/ESPWF - -334045.340+1214846.030/ESPWF + -334045.350+1214845.990/ESPWF EWZEA/EWZEI EWZEB/EWZEI EWZEI/EWZEF @@ -7207,15 +7143,6 @@ HLTSJ/HLTSI HLTSI/HLTSF -373914.420+1420342.810/HLTSF - HO2EA/HO2EI - HO2EB/HO2EI - HO2EC/HO2EI - HO2EI/HO2EF - -320631.500+1194607.000/HO2EF - HO2WE/HO2WI - HO2WG/HO2WI - HO2WI/HO2WF - -320636.250+1194506.260/HO2WF HOZEA/HOZEI HOZEB/HOZEI HOZEC/HOZEI @@ -7255,17 +7182,19 @@ IA2EI/IA2EF IA2EM/IA2EF IA2WB/IA2WI + IA2WC/IA2WI + IA2WD/IA2WI IA2WI/IA2WF IA2WM/IA2WF IB3EA/IB3EI IB3EB/IB3EI IB3EC/IB3EI IB3EI/IB3EF - -211731.110+1185331.060/IB3EF + -211731.060+1185331.100/IB3EF IB3WD/IB3WI IB3WG/IB3WI IB3WI/IB3WF - -211655.080+1185213.320/IB3WF + -211655.030+1185213.360/IB3WF IE2NE/IE2NI IE2NG/IE2NI IE2NJ/IE2NI @@ -7483,16 +7412,6 @@ KSCSJ/KSCSI KSCSI/KSCSF -354325.090+1373118.260/KSCSF - KW2ND/KW2NI - KW2NE/KW2NI - KW2NG/KW2NI - KW2NI/KW2NF - -234620.750+1200814.950/KW2NF - KW2SA/KW2SI - KW2SB/KW2SI - KW2SC/KW2SI - KW2SI/KW2SF - -234725.030+1200804.740/KW2SF KWMED/KWMEI KWMEE/KWMEI KWMEG/KWMEI @@ -7834,7 +7753,7 @@ MR2NE/MR2NI MR2NG/MR2NI MR2NI/MR2NF - MR2NM/MR2NF + -291149.840+1160105.750/MR2NF MR2SA/MR2SI MR2SB/MR2SI MR2SC/MR2SI @@ -8479,7 +8398,7 @@ TC2WB/TC2WI TC2WC/TC2WI TC2WI/TC2WF - -193809.160+1341010.820/TC2WF + -193809.090+1341010.920/TC2WF TDNEG/TDNEI TDNEI/TDNEF TDNEM/TDNEF @@ -8749,12 +8668,12 @@ WGZEE/WGZEI WGZEG/WGZEI WGZEI/WGZEF - -210215.200+1183910.770/WGZEF + -210215.150+1183910.810/WGZEF WGZWA/WGZWI WGZWB/WGZWI WGZWC/WGZWI WGZWI/WGZWF - -210207.990+1183758.440/WGZWF + -210207.940+1183758.480/WGZWF WHCEA/WHCEI WHCEB/WHCEI WHCEC/WHCEI @@ -9018,12 +8937,12 @@ ZW2EB/ZW2EI ZW2EC/ZW2EI ZW2EI/ZW2EF - -300203.540+1192347.390/ZW2EF + -300203.550+1192347.370/ZW2EF ZW2WD/ZW2WI ZW2WE/ZW2WI ZW2WG/ZW2WI ZW2WI/ZW2WF - -300149.630+1192240.260/ZW2WF + -300149.610+1192240.240/ZW2WF MUDAN/MUDAN GLZWC/MUDAN GLZWA/MUDAN @@ -9203,9 +9122,9 @@ MMBSA/MMBSI MMBSB/MMBSI MMBSC/MMBSI - GUPUG/MMLWF/MMLWM ANBEM/MMLNF/ML16T BELTA/ANBEM + GUPUG/MMLWF/MMLWM VISAS/MMLEF/MMLEM AKDEL/BOSGI/MMLSM PADSI/PADSF/PADSM diff --git a/Maps/Albury/AY_RWY07.xml b/Maps/Albury/AY_RWY07.xml index 23404e62..19de1ecf 100644 --- a/Maps/Albury/AY_RWY07.xml +++ b/Maps/Albury/AY_RWY07.xml @@ -89,7 +89,7 @@ AVBEG KEDDY AKMIR - WATLE + DARGI \ No newline at end of file diff --git a/Maps/Albury/AY_RWY25.xml b/Maps/Albury/AY_RWY25.xml index 4b0d5416..392f02f1 100644 --- a/Maps/Albury/AY_RWY25.xml +++ b/Maps/Albury/AY_RWY25.xml @@ -89,7 +89,7 @@ AVBEG KEDDY AKMIR - WATLE + DARGI \ No newline at end of file diff --git a/Maps/Albury/AY_TCU.xml b/Maps/Albury/AY_TCU.xml index b3c06ea8..2fbb530b 100644 --- a/Maps/Albury/AY_TCU.xml +++ b/Maps/Albury/AY_TCU.xml @@ -68,7 +68,7 @@ AVBEG/ KEDDY/ AKMIR/ - WATLE + DARGI diff --git a/Maps/Amberley/AM_TCU.xml b/Maps/Amberley/AM_TCU.xml index c0520450..763c8349 100644 --- a/Maps/Amberley/AM_TCU.xml +++ b/Maps/Amberley/AM_TCU.xml @@ -50,7 +50,7 @@ GDH NDB/ ALDAR/ - GAMBL/ + IDNER/ HUUGO @@ -79,7 +79,7 @@ MOR NDB GDH NDB ALDAR - GAMBL + IDNER HUUGO ROM NDB AGIVA diff --git a/Maps/Brisbane/BN_RWY01PROPS.xml b/Maps/Brisbane/BN_RWY01PROPS.xml index 3e82f605..d11aa243 100644 --- a/Maps/Brisbane/BN_RWY01PROPS.xml +++ b/Maps/Brisbane/BN_RWY01PROPS.xml @@ -309,8 +309,8 @@ IRTED MEPEM ROM NDB - MIMMI - MORRO + RILGO + LIKTO SAVER BONEY HUUGO @@ -329,6 +329,7 @@ TAPET LOAFA GLA VOR + RULUN BICKL SU VOR RUDEY @@ -337,7 +338,7 @@ HARVS MISLY LAROS - SETER + PONUX HAWKE COOLA IBUNA @@ -364,7 +365,7 @@ BNA NDB KADSI UGPOT - GAMBL + IDNER SORTI RUROX BUD NDB @@ -373,7 +374,7 @@ RIDVO OK VOR MATVI - DAMIN + SHIKO BERNI KANKO BEPNA diff --git a/Maps/Brisbane/BN_RWY19PROPS.xml b/Maps/Brisbane/BN_RWY19PROPS.xml index b46a6b01..d5e6e442 100644 --- a/Maps/Brisbane/BN_RWY19PROPS.xml +++ b/Maps/Brisbane/BN_RWY19PROPS.xml @@ -337,8 +337,8 @@ TEGIL MEPEM ROM NDB - MIMMI - MORRO + RILGO + LIKTO SAVER BONEY HUUGO @@ -357,6 +357,7 @@ TAPET LOAFA GLA VOR + RULUN BICKL SU VOR RUDEY @@ -365,7 +366,7 @@ HARVS MISLY LAROS - SETER + PONUX HAWKE COOLA IBUNA @@ -392,7 +393,7 @@ BNA NDB KADSI UGPOT - GAMBL + IDNER SORTI RUROX BUD NDB @@ -401,7 +402,7 @@ RIDVO OK VOR MATVI - DAMIN + SHIKO BERNI KANKO BEPNA diff --git a/Maps/Brisbane/BN_RWYSODPROPS.xml b/Maps/Brisbane/BN_RWYSODPROPS.xml index aa724e1e..dbe18c2e 100644 --- a/Maps/Brisbane/BN_RWYSODPROPS.xml +++ b/Maps/Brisbane/BN_RWYSODPROPS.xml @@ -273,8 +273,8 @@ TEGIL MEPEM ROM NDB - MIMMI - MORRO + RILGO + LIKTO SAVER BONEY HUUGO @@ -293,6 +293,7 @@ TAPET LOAFA GLA VOR + RULUN BICKL SU VOR RUDEY @@ -301,7 +302,7 @@ HARVS MISLY LAROS - SETER + PONUX HAWKE COOLA IBUNA @@ -327,7 +328,7 @@ BNA NDB KADSI UGPOT - GAMBL + IDNER SORTI RUROX BUD NDB @@ -336,7 +337,7 @@ RIDVO OK VOR MATVI - DAMIN + SHIKO BERNI KANKO BEPNA diff --git a/Maps/Brisbane/BN_TCU.xml b/Maps/Brisbane/BN_TCU.xml index 4dac0d5f..bf88f727 100644 --- a/Maps/Brisbane/BN_TCU.xml +++ b/Maps/Brisbane/BN_TCU.xml @@ -45,8 +45,8 @@ ROM NDB/ - MIMMI/ - MORRO/ + RILGO/ + LIKTO/ WOODY @@ -95,6 +95,7 @@ + RULUN/ ITIDE/ BICKL/ SU VOR @@ -103,7 +104,7 @@ RUDEY/ MESED/ - MORRO/ + LIKTO/ ROM NDB @@ -118,7 +119,7 @@ - SETER/ + PONUX/ ATROP/ TEBOT @@ -180,7 +181,7 @@ - GAMBL/ + IDNER/ CFS VOR/ SORTI @@ -203,7 +204,7 @@ RUDEY/ OK VOR/ MATVI/ - DAMIN/ + SHIKO/ ROM NDB diff --git a/Maps/Brisbane/CG_RWY14.xml b/Maps/Brisbane/CG_RWY14.xml index 21786f68..b2cd9b8d 100644 --- a/Maps/Brisbane/CG_RWY14.xml +++ b/Maps/Brisbane/CG_RWY14.xml @@ -134,8 +134,8 @@ MEPEM GUMKI ROM NDB - MIMMI - MORRO + RILGO + LIKTO WOODY UGTUG SAVER @@ -158,6 +158,7 @@ TAPET LOAFA GLA VOR + RULUN BICKL SU VOR RUDEY @@ -166,7 +167,7 @@ HARVS MISLY LAROS - SETER + PONUX TEBOT HAWKE COOLA @@ -197,7 +198,7 @@ BNA NDB KADSI UGPOT - GAMBL + IDNER SORTI RUROX BUD NDB @@ -206,7 +207,7 @@ RIDVO OK VOR MATVI - DAMIN + SHIKO KANKO BEPNA YCCA diff --git a/Maps/Brisbane/CG_RWY32.xml b/Maps/Brisbane/CG_RWY32.xml index 1226d52b..d90a268f 100644 --- a/Maps/Brisbane/CG_RWY32.xml +++ b/Maps/Brisbane/CG_RWY32.xml @@ -117,8 +117,8 @@ MEPEM GUMKI ROM NDB - MIMMI - MORRO + RILGO + LIKTO WOODY UGTUG SAVER @@ -141,6 +141,7 @@ TAPET LOAFA GLA VOR + RULUN BICKL SU VOR RUDEY @@ -149,7 +150,7 @@ HARVS MISLY LAROS - SETER + PONUX TEBOT HAWKE COOLA @@ -180,7 +181,7 @@ BNA NDB KADSI UGPOT - GAMBL + IDNER SORTI RUROX BUD NDB @@ -189,7 +190,7 @@ RIDVO OK VOR MATVI - DAMIN + SHIKO KANKO BEPNA YCCA diff --git a/Maps/Cairns/CS_RWY15.xml b/Maps/Cairns/CS_RWY15.xml index 2a4c405e..38f44896 100644 --- a/Maps/Cairns/CS_RWY15.xml +++ b/Maps/Cairns/CS_RWY15.xml @@ -340,7 +340,7 @@ DOTOD GULOP ANDEE - BIDAG + ONARA BULOK MUSEY KOOKA @@ -367,8 +367,9 @@ COE NDB BENTA GUPDA + BODAP NORIS - MASHA + RUMGI \ No newline at end of file diff --git a/Maps/Cairns/CS_RWY33.xml b/Maps/Cairns/CS_RWY33.xml index dd2ea7b5..f76ba8d9 100644 --- a/Maps/Cairns/CS_RWY33.xml +++ b/Maps/Cairns/CS_RWY33.xml @@ -275,7 +275,7 @@ DOTOD GULOP ANDEE - BIDAG + ONARA MUSEY KOOKA SWALO @@ -300,9 +300,10 @@ COE NDB BENTA GUPDA + BODAP SWIFT NORIS - MASHA + RUMGI \ No newline at end of file diff --git a/Maps/Cairns/CS_TCU.xml b/Maps/Cairns/CS_TCU.xml index 0c346f96..d2a85d6d 100644 --- a/Maps/Cairns/CS_TCU.xml +++ b/Maps/Cairns/CS_TCU.xml @@ -30,7 +30,7 @@ - BIDAG/ + ONARA/ BULOK/ MUSEY @@ -96,13 +96,14 @@ + BODAP/ SWIFT/ WALTA NORIS/ - MASHA + RUMGI diff --git a/Maps/Canberra/CB_RWY1712.xml b/Maps/Canberra/CB_RWY1712.xml index 90897d01..ced2b7f9 100644 --- a/Maps/Canberra/CB_RWY1712.xml +++ b/Maps/Canberra/CB_RWY1712.xml @@ -213,7 +213,7 @@ TESAT WOL NDB AY VOR - CORDO + PEGSU EXETA WAZZA TEMIS @@ -222,7 +222,7 @@ MUDGI GLB NDB YHOT - MIBOX + SOVRU BORLI COM NDB VISER diff --git a/Maps/Canberra/CB_RWY3530.xml b/Maps/Canberra/CB_RWY3530.xml index 63a1270c..7fd2ac01 100644 --- a/Maps/Canberra/CB_RWY3530.xml +++ b/Maps/Canberra/CB_RWY3530.xml @@ -254,7 +254,7 @@ TESAT WOL NDB AY VOR - CORDO + PEGSU EXETA WAZZA TEMIS @@ -263,7 +263,7 @@ MUDGI GLB NDB YHOT - MIBOX + SOVRU BORLI COM NDB VISER diff --git a/Maps/Canberra/CB_TCU.xml b/Maps/Canberra/CB_TCU.xml index f06989eb..fc636dea 100644 --- a/Maps/Canberra/CB_TCU.xml +++ b/Maps/Canberra/CB_TCU.xml @@ -25,7 +25,7 @@ TESAT/ - CORDO/ + PEGSU/ EXETA/ BUNGO @@ -44,13 +44,13 @@ - CORDO/ + PEGSU/ GLB NDB YHOT/ - MIBOX + SOVRU diff --git a/Maps/Coffs Harbour/CFS_TCU.xml b/Maps/Coffs Harbour/CFS_TCU.xml index 2c39798b..e8a06a76 100644 --- a/Maps/Coffs Harbour/CFS_TCU.xml +++ b/Maps/Coffs Harbour/CFS_TCU.xml @@ -7,8 +7,8 @@ - - + + @@ -58,7 +58,7 @@ GOMOL/ - GAMBL + IDNER @@ -70,7 +70,7 @@ - GAMBL/ + IDNER/ GFN NDB @@ -131,7 +131,7 @@ BNA NDB KADSI UGPOT - GAMBL + IDNER SORTI OLTIN MAKOR @@ -219,8 +219,8 @@ - - + + \ No newline at end of file diff --git a/Maps/Darwin/DN_RWY11.xml b/Maps/Darwin/DN_RWY11.xml index 2614454e..6ec87611 100644 --- a/Maps/Darwin/DN_RWY11.xml +++ b/Maps/Darwin/DN_RWY11.xml @@ -249,7 +249,7 @@ SOCAR KU VOR JULUP - COLLA + TUSTU RAGER ZAMMI TOBIE diff --git a/Maps/Darwin/DN_RWY29.xml b/Maps/Darwin/DN_RWY29.xml index e80c0c9a..d1bf0809 100644 --- a/Maps/Darwin/DN_RWY29.xml +++ b/Maps/Darwin/DN_RWY29.xml @@ -232,7 +232,7 @@ SOCAR KU VOR JULUP - COLLA + TUSTU RAGER ZAMMI TOBIE diff --git a/Maps/Darwin/DN_TCU.xml b/Maps/Darwin/DN_TCU.xml index 7a8a32e1..023fb463 100644 --- a/Maps/Darwin/DN_TCU.xml +++ b/Maps/Darwin/DN_TCU.xml @@ -46,7 +46,7 @@ - COLLA/ + TUSTU/ RAGER diff --git a/Maps/Hobart/HB_RWY12.xml b/Maps/Hobart/HB_RWY12.xml index af8dbff6..3206ccd9 100644 --- a/Maps/Hobart/HB_RWY12.xml +++ b/Maps/Hobart/HB_RWY12.xml @@ -139,12 +139,12 @@ KAREN NUNPA DOTVU - SALEM + URBEN IRSOM - LIFFY + LAXOT MOTRA GOMOM - BROAD + PADBU \ No newline at end of file diff --git a/Maps/Hobart/HB_RWY30.xml b/Maps/Hobart/HB_RWY30.xml index 476f018d..22aa1785 100644 --- a/Maps/Hobart/HB_RWY30.xml +++ b/Maps/Hobart/HB_RWY30.xml @@ -112,12 +112,12 @@ KAREN NUNPA DOTVU - SALEM + URBEN IRSOM - LIFFY + LAXOT MOTRA GOMOM - BROAD + PADBU \ No newline at end of file diff --git a/Maps/Hobart/HB_TCU.xml b/Maps/Hobart/HB_TCU.xml index e0839613..65d05c43 100644 --- a/Maps/Hobart/HB_TCU.xml +++ b/Maps/Hobart/HB_TCU.xml @@ -21,13 +21,13 @@ DOTVU/ - SALEM/ + URBEN/ CLARK IRSOM/ - LIFFY/ + LAXOT/ MORGO @@ -39,7 +39,7 @@ GOMOM/ - BROAD + PADBU diff --git a/Maps/Launceston/LT_RWY14R.xml b/Maps/Launceston/LT_RWY14R.xml index f8df1367..f33f4f41 100644 --- a/Maps/Launceston/LT_RWY14R.xml +++ b/Maps/Launceston/LT_RWY14R.xml @@ -124,7 +124,7 @@ ESL NDB ANTLA LTV NDB - HELIX + ELMOR GOMOM diff --git a/Maps/Launceston/LT_RWY32L.xml b/Maps/Launceston/LT_RWY32L.xml index decccdda..129c260e 100644 --- a/Maps/Launceston/LT_RWY32L.xml +++ b/Maps/Launceston/LT_RWY32L.xml @@ -98,7 +98,7 @@ ESL NDB ANTLA LTV NDB - HELIX + ELMOR GOMOM ISMIR diff --git a/Maps/Launceston/LT_TCU.xml b/Maps/Launceston/LT_TCU.xml index b19a8f32..3ce11b35 100644 --- a/Maps/Launceston/LT_TCU.xml +++ b/Maps/Launceston/LT_TCU.xml @@ -2,18 +2,10 @@ - - - - - - - - @@ -48,7 +40,7 @@ LTV NDB/ - HELIX + ELMOR @@ -174,20 +166,10 @@ - - - - - - - - - - \ No newline at end of file diff --git a/Maps/Melbourne/AV_RWY18.xml b/Maps/Melbourne/AV_RWY18.xml index 4ba68d9b..c79b80cc 100644 --- a/Maps/Melbourne/AV_RWY18.xml +++ b/Maps/Melbourne/AV_RWY18.xml @@ -72,7 +72,7 @@ KEPPA AKNUM SUNTI - BENZO + AVNAS IRSOM NEVIS BORTO @@ -102,7 +102,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/AV_RWY36.xml b/Maps/Melbourne/AV_RWY36.xml index b80f723e..ae0c35f5 100644 --- a/Maps/Melbourne/AV_RWY36.xml +++ b/Maps/Melbourne/AV_RWY36.xml @@ -70,7 +70,7 @@ KEPPA AKNUM SUNTI - BENZO + AVNAS IRSOM NEVIS BORTO @@ -100,7 +100,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/EN_RWY08.xml b/Maps/Melbourne/EN_RWY08.xml index 4d48131a..9888d990 100644 --- a/Maps/Melbourne/EN_RWY08.xml +++ b/Maps/Melbourne/EN_RWY08.xml @@ -20,7 +20,7 @@ KEPPA AKNUM SUNTI - BENZO + AVNAS IRSOM NEVIS BORTO @@ -50,7 +50,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/EN_RWY17.xml b/Maps/Melbourne/EN_RWY17.xml index 7d4c40c1..5dddcd42 100644 --- a/Maps/Melbourne/EN_RWY17.xml +++ b/Maps/Melbourne/EN_RWY17.xml @@ -20,7 +20,7 @@ KEPPA AKNUM SUNTI - BENZO + AVNAS IRSOM NEVIS BORTO @@ -50,7 +50,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/EN_RWY26.xml b/Maps/Melbourne/EN_RWY26.xml index 5adeb231..a42fb8bf 100644 --- a/Maps/Melbourne/EN_RWY26.xml +++ b/Maps/Melbourne/EN_RWY26.xml @@ -20,7 +20,7 @@ KEPPA AKNUM SUNTI - BENZO + AVNAS IRSOM NEVIS BORTO @@ -50,7 +50,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/EN_RWY35.xml b/Maps/Melbourne/EN_RWY35.xml index 0829393b..2d8b6fe3 100644 --- a/Maps/Melbourne/EN_RWY35.xml +++ b/Maps/Melbourne/EN_RWY35.xml @@ -20,7 +20,7 @@ KEPPA AKNUM SUNTI - BENZO + AVNAS IRSOM NEVIS BORTO @@ -50,7 +50,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/EN_RWYCURFEW.xml b/Maps/Melbourne/EN_RWYCURFEW.xml index fd84e902..454adebb 100644 --- a/Maps/Melbourne/EN_RWYCURFEW.xml +++ b/Maps/Melbourne/EN_RWYCURFEW.xml @@ -24,7 +24,7 @@ KEPPA AKNUM SUNTI - BENZO + AVNAS IRSOM NEVIS BORTO @@ -54,7 +54,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/ML_RWY09.xml b/Maps/Melbourne/ML_RWY09.xml index b0df714e..6d3cd48b 100644 --- a/Maps/Melbourne/ML_RWY09.xml +++ b/Maps/Melbourne/ML_RWY09.xml @@ -160,7 +160,7 @@ KEPPA AKNUM SUNTI - BENZO + AVNAS IRSOM NEVIS BORTO @@ -187,7 +187,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/ML_RWY09A16D.xml b/Maps/Melbourne/ML_RWY09A16D.xml index 1c926450..d548c974 100644 --- a/Maps/Melbourne/ML_RWY09A16D.xml +++ b/Maps/Melbourne/ML_RWY09A16D.xml @@ -268,7 +268,7 @@ SALRI CANTY AKNUM - BENZO + AVNAS IRSOM BORTO DUKES @@ -293,7 +293,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/ML_RWY09LAHSO34.xml b/Maps/Melbourne/ML_RWY09LAHSO34.xml index 0897772a..53f1da6d 100644 --- a/Maps/Melbourne/ML_RWY09LAHSO34.xml +++ b/Maps/Melbourne/ML_RWY09LAHSO34.xml @@ -361,7 +361,7 @@ SALRI CANTY AKNUM - BENZO + AVNAS IRSOM BORTO DUKES @@ -386,7 +386,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/ML_RWY16.xml b/Maps/Melbourne/ML_RWY16.xml index a9989b09..c0d65a78 100644 --- a/Maps/Melbourne/ML_RWY16.xml +++ b/Maps/Melbourne/ML_RWY16.xml @@ -242,7 +242,7 @@ SALRI CANTY AKNUM - BENZO + AVNAS IRSOM BORTO DUKES @@ -267,7 +267,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/ML_RWY16A27D.xml b/Maps/Melbourne/ML_RWY16A27D.xml index 49a11315..e37aa328 100644 --- a/Maps/Melbourne/ML_RWY16A27D.xml +++ b/Maps/Melbourne/ML_RWY16A27D.xml @@ -229,7 +229,7 @@ SALRI CANTY AKNUM - BENZO + AVNAS IRSOM BORTO DUKES @@ -254,7 +254,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/ML_RWY27.xml b/Maps/Melbourne/ML_RWY27.xml index c4395f5c..11a7af35 100644 --- a/Maps/Melbourne/ML_RWY27.xml +++ b/Maps/Melbourne/ML_RWY27.xml @@ -193,7 +193,7 @@ SALRI CANTY AKNUM - BENZO + AVNAS IRSOM BORTO DUKES @@ -218,7 +218,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/ML_RWY2734D.xml b/Maps/Melbourne/ML_RWY2734D.xml index e4d6ccdf..fac6cad3 100644 --- a/Maps/Melbourne/ML_RWY2734D.xml +++ b/Maps/Melbourne/ML_RWY2734D.xml @@ -257,7 +257,7 @@ SALRI CANTY AKNUM - BENZO + AVNAS IRSOM BORTO DUKES @@ -282,7 +282,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/ML_RWY27LAHSO34.xml b/Maps/Melbourne/ML_RWY27LAHSO34.xml index 6efb7ddc..280a92bd 100644 --- a/Maps/Melbourne/ML_RWY27LAHSO34.xml +++ b/Maps/Melbourne/ML_RWY27LAHSO34.xml @@ -326,7 +326,7 @@ SALRI CANTY AKNUM - BENZO + AVNAS IRSOM BORTO DUKES @@ -351,7 +351,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/ML_RWY34.xml b/Maps/Melbourne/ML_RWY34.xml index c7a89ee2..662614d5 100644 --- a/Maps/Melbourne/ML_RWY34.xml +++ b/Maps/Melbourne/ML_RWY34.xml @@ -275,7 +275,7 @@ SALRI CANTY AKNUM - BENZO + AVNAS IRSOM BORTO DUKES @@ -300,7 +300,7 @@ PUBAP MENOG TAITE - ROHAN + TUVRA KII NDB IBOBO diff --git a/Maps/Melbourne/ML_TCU.xml b/Maps/Melbourne/ML_TCU.xml index 0c22e710..e4ee02b7 100644 --- a/Maps/Melbourne/ML_TCU.xml +++ b/Maps/Melbourne/ML_TCU.xml @@ -66,7 +66,7 @@ SUNTI/ - BENZO/ + AVNAS/ IRSOM @@ -137,7 +137,7 @@ MENOG/ TAITE/ - ROHAN/ + TUVRA/ KII NDB diff --git a/Maps/Nowra/NW_TCU.xml b/Maps/Nowra/NW_TCU.xml index b0600640..4bced9fa 100644 --- a/Maps/Nowra/NW_TCU.xml +++ b/Maps/Nowra/NW_TCU.xml @@ -7,8 +7,8 @@ - - + + @@ -117,8 +117,8 @@ - - + + \ No newline at end of file diff --git a/Maps/Oakey/OK_TCU.xml b/Maps/Oakey/OK_TCU.xml index 1523099a..08270d4f 100644 --- a/Maps/Oakey/OK_TCU.xml +++ b/Maps/Oakey/OK_TCU.xml @@ -57,13 +57,13 @@ - BAMBI/ + RIRSA/ ALONE DEBEE/ - GAMBL + IDNER @@ -73,7 +73,7 @@ MATVI/ - DAMIN/ + SHIKO/ ROM NDB @@ -91,7 +91,7 @@ - CHAPL/ + MUPIK/ COLLY @@ -113,20 +113,20 @@ MASMI SUSGI GLA VOR - BAMBI + RIRSA ALONE DEBEE - GAMBL + IDNER BN VOR RUDEY MATVI - DAMIN + SHIKO ROM NDB MOR NDB PARRY ELENI GLENN - CHAPL + MUPIK COLLY diff --git a/Maps/Perth/PE_RWY18.xml b/Maps/Perth/PE_RWY18.xml index b569b716..66657c80 100644 --- a/Maps/Perth/PE_RWY18.xml +++ b/Maps/Perth/PE_RWY18.xml @@ -132,11 +132,11 @@ OTLED ONGAR DALWU - REVOP + AVPAL HINDS CALIG JULIM - KATHI + ESMIN SAILS BRIGG KEELS @@ -149,13 +149,13 @@ AVNEX ESDEG AMANA - KARAB + LAKIR MANIG LAKMO RAVON - NORIC + NINEK DUTAK - STURT + LAKAV BUNGL YAHMO KELLA diff --git a/Maps/Perth/PE_RWY36.xml b/Maps/Perth/PE_RWY36.xml index feb95f9b..f3de16c7 100644 --- a/Maps/Perth/PE_RWY36.xml +++ b/Maps/Perth/PE_RWY36.xml @@ -132,11 +132,11 @@ OTLED ONGAR DALWU - REVOP + AVPAL HINDS CALIG JULIM - KATHI + ESMIN SAILS BRIGG KEELS @@ -149,13 +149,13 @@ AVNEX ESDEG AMANA - KARAB + LAKIR MANIG LAKMO RAVON - NORIC + NINEK DUTAK - STURT + LAKAV BUNGL YAHMO KELLA diff --git a/Maps/Perth/PH_RWY0306.xml b/Maps/Perth/PH_RWY0306.xml index eaff4289..216a4d4f 100644 --- a/Maps/Perth/PH_RWY0306.xml +++ b/Maps/Perth/PH_RWY0306.xml @@ -592,21 +592,21 @@ BURGU ONGAR DALWU - REVOP + AVPAL HINDS CALIG - KATHI + ESMIN MERIB BLN NDB JOSBU ABA NDB ESDEG - KARAB + LAKIR MANIG LAKMO - NORIC + NINEK DUTAK - STURT + LAKAV BUNGL YAHMO KELLA diff --git a/Maps/Perth/PH_RWY2124.xml b/Maps/Perth/PH_RWY2124.xml index 016e5b28..c189935c 100644 --- a/Maps/Perth/PH_RWY2124.xml +++ b/Maps/Perth/PH_RWY2124.xml @@ -466,22 +466,22 @@ ISRUP ONGAR DALWU - REVOP + AVPAL HINDS CALIG - KATHI + ESMIN HAMTN MERIB BLN NDB JOSBU ABA NDB ESDEG - KARAB + LAKIR MANIG LAKMO - NORIC + NINEK DUTAK - STURT + LAKAV BUNGL YAHMO KELLA diff --git a/Maps/Perth/PH_TCU.xml b/Maps/Perth/PH_TCU.xml index 35f55e68..e9de1429 100644 --- a/Maps/Perth/PH_TCU.xml +++ b/Maps/Perth/PH_TCU.xml @@ -56,14 +56,14 @@ DALWU/ - REVOP/ + AVPAL/ HINDS/ CALIG/ JULIM - KATHI/ + ESMIN/ HAMTN/ BEVLY @@ -93,16 +93,16 @@ AMANA/ - KARAB/ + LAKIR/ MANIG/ LAKMO RAVON/ - NORIC/ + NINEK/ DUTAK/ - STURT + LAKAV diff --git a/Maps/Rockhampton/RK_RWY15.xml b/Maps/Rockhampton/RK_RWY15.xml index 08203b63..7b39abc0 100644 --- a/Maps/Rockhampton/RK_RWY15.xml +++ b/Maps/Rockhampton/RK_RWY15.xml @@ -89,7 +89,7 @@ WELKE CLIFT ALISN - BURTO + NOKAV LUKPU ESLAR LEMER diff --git a/Maps/Rockhampton/RK_RWY33.xml b/Maps/Rockhampton/RK_RWY33.xml index 64abad60..9cb7b9c8 100644 --- a/Maps/Rockhampton/RK_RWY33.xml +++ b/Maps/Rockhampton/RK_RWY33.xml @@ -91,7 +91,7 @@ WELKE CLIFT ALISN - BURTO + NOKAV LUKPU ESLAR LEMER diff --git a/Maps/Rockhampton/RK_RWY33A15D.xml b/Maps/Rockhampton/RK_RWY33A15D.xml index 44c19b33..2df3e874 100644 --- a/Maps/Rockhampton/RK_RWY33A15D.xml +++ b/Maps/Rockhampton/RK_RWY33A15D.xml @@ -92,7 +92,7 @@ WELKE CLIFT ALISN - BURTO + NOKAV LUKPU ESLAR LEMER diff --git a/Maps/Rockhampton/RK_TCU.xml b/Maps/Rockhampton/RK_TCU.xml index 13b46bda..40bd8b92 100644 --- a/Maps/Rockhampton/RK_TCU.xml +++ b/Maps/Rockhampton/RK_TCU.xml @@ -47,7 +47,7 @@ - BURTO/ + NOKAV/ LUKPU/ ESLAR/ LEMER diff --git a/Maps/SECTOR_FREQS.xml b/Maps/SECTOR_FREQS.xml index fafa72f0..2cd01864 100644 --- a/Maps/SECTOR_FREQS.xml +++ b/Maps/SECTOR_FREQS.xml @@ -4,7 +4,12 @@ \ No newline at end of file diff --git a/Maps/Tindal/TN_TCU.xml b/Maps/Tindal/TN_TCU.xml index a81c7bf7..9ef3df2e 100644 --- a/Maps/Tindal/TN_TCU.xml +++ b/Maps/Tindal/TN_TCU.xml @@ -60,7 +60,7 @@ PETRL/ - BARON + GUKVI @@ -82,8 +82,8 @@ - - + + \ No newline at end of file diff --git a/Maps/Townsville/TL_RWY01.xml b/Maps/Townsville/TL_RWY01.xml index 2e680b45..2540cd50 100644 --- a/Maps/Townsville/TL_RWY01.xml +++ b/Maps/Townsville/TL_RWY01.xml @@ -186,8 +186,8 @@ BEBUD ALBEE WISKA - RUSSO - BOXER + OKODU + MATAR WYNOT ABTOX EKOKU @@ -228,7 +228,7 @@ CARBY VATKO BOWLY - FOYLE + ENSAB DOTTE ITORT EYSAW diff --git a/Maps/Townsville/TL_RWY19.xml b/Maps/Townsville/TL_RWY19.xml index 9b27d544..f1a78fc8 100644 --- a/Maps/Townsville/TL_RWY19.xml +++ b/Maps/Townsville/TL_RWY19.xml @@ -199,8 +199,8 @@ LAPES ALBEE WISKA - RUSSO - BOXER + OKODU + MATAR WYNOT ABTOX EKOKU @@ -243,7 +243,7 @@ CARBY VATKO BOWLY - FOYLE + ENSAB DOTTE ITORT EYSAW diff --git a/Maps/Townsville/TL_TCU.xml b/Maps/Townsville/TL_TCU.xml index 79c2cdf5..b97d674b 100644 --- a/Maps/Townsville/TL_TCU.xml +++ b/Maps/Townsville/TL_TCU.xml @@ -15,12 +15,12 @@ ALBEE/ WISKA/ - RUSSO + OKODU ANRUB/ - BOXER + MATAR @@ -122,7 +122,7 @@ BOWLY/ - FOYLE + ENSAB diff --git a/Profile.xml b/Profile.xml index 260d6771..08176669 100644 --- a/Profile.xml +++ b/Profile.xml @@ -1,6 +1,10 @@ +<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes diff --git a/RestrictedAreas.xml b/RestrictedAreas.xml index 8041b1d0..38ae2630 100644 --- a/RestrictedAreas.xml +++ b/RestrictedAreas.xml @@ -4227,56 +4227,56 @@ -331736.797+1504401.944/ -331422.000+1505210.000/ -333139.000+1505947.000/ --333056.475+1505921.562/ --332922.349+1505802.232/ --332801.122+1505624.556/ --332655.248+1505431.503/ --332606.721+1505226.498/ --332537.006+1505013.322/ --332527.000+1504756.000/ --332537.006+1504538.678/ --332606.721+1504325.502/ --332655.248+1504120.497/ --332801.122+1503927.444/ --332922.349+1503749.768/ --333056.475+1503630.438/ --333240.648+1503531.872/ --333431.712+1503455.868/ --333626.298+1503443.540/ --333820.927+1503455.291/ --334012.113+1503530.789/ --334156.473+1503628.979/ +-333055.475+1505921.560/ +-332921.349+1505802.230/ +-332800.122+1505624.555/ +-332654.248+1505431.502/ +-332605.721+1505226.497/ +-332536.006+1505013.322/ +-332526.000+1504756.000/ +-332536.006+1504538.678/ +-332605.721+1504325.503/ +-332654.248+1504120.498/ +-332800.122+1503927.445/ +-332921.349+1503749.770/ +-333055.475+1503630.440/ +-333239.648+1503531.875/ +-333430.712+1503455.870/ +-333625.298+1503443.543/ +-333819.927+1503455.294/ +-334011.113+1503530.792/ +-334155.473+1503628.981/ -334211.000+1503641.000 -334257.000+1503844.000/ -334211.000+1503641.000/ --334156.473+1503628.979/ --334012.113+1503530.789/ --333820.927+1503455.291/ --333626.298+1503443.540/ --333431.712+1503455.868/ --333240.648+1503531.872/ --333056.475+1503630.438/ --332922.349+1503749.768/ --332801.122+1503927.444/ --332655.248+1504120.497/ --332606.721+1504325.502/ --332537.006+1504538.678/ --332527.000+1504756.000/ --332537.006+1505013.322/ --332606.721+1505226.498/ --332655.248+1505431.503/ --332801.122+1505624.556/ --332922.349+1505802.232/ --333056.475+1505921.562/ +-334155.473+1503628.981/ +-334011.113+1503530.792/ +-333819.927+1503455.294/ +-333625.298+1503443.543/ +-333430.712+1503455.870/ +-333239.648+1503531.875/ +-333055.475+1503630.440/ +-332921.349+1503749.770/ +-332800.122+1503927.445/ +-332654.248+1504120.498/ +-332605.721+1504325.503/ +-332536.006+1504538.678/ +-332526.000+1504756.000/ +-332536.006+1505013.322/ +-332605.721+1505226.497/ +-332654.248+1505431.502/ +-332800.122+1505624.555/ +-332921.349+1505802.230/ +-333055.475+1505921.560/ -333139.000+1505947.000/ --333240.648+1510020.128/ --333431.712+1510056.132/ --333626.298+1510108.460/ --333820.927+1510056.709/ --334012.113+1510021.211/ +-333239.648+1510020.125/ +-333430.712+1510056.130/ +-333625.298+1510108.457/ +-333819.927+1510056.706/ +-334011.113+1510021.208/ -334105.000+1505953.000/ -334505.000+1505400.000/ -334257.000+1503844.000 @@ -4364,11 +4364,11 @@ -331736.797+1504401.944/ -331422.000+1505210.000/ -333139.000+1505947.000/ --333240.648+1510020.128/ --333431.712+1510056.132/ --333626.298+1510108.460/ --333820.927+1510056.709/ --334012.113+1510021.211/ +-333239.648+1510020.125/ +-333430.712+1510056.130/ +-333625.298+1510108.457/ +-333819.927+1510056.706/ +-334011.113+1510021.208/ -334105.000+1505953.000/ -334505.000+1505400.000/ -334257.000+1503844.000/ @@ -9159,22 +9159,6 @@ -380206.000+1451537.000/ -380706.000+1452859.000/ -381154.000+1452836.000/ --381221.000+1452628.000/ --381217.429+1452623.491/ --381210.034+1452614.079/ --381204.037+1452603.175/ --381159.618+1452551.113/ --381156.911+1452538.258/ --381156.000+1452525.000/ --381156.911+1452511.742/ --381159.618+1452458.887/ --381204.037+1452446.825/ --381210.034+1452435.921/ --381217.429+1452426.509/ --381225.995+1452418.873/ --381235.473+1452413.245/ --381245.574+1452409.797/ --381251.000+1452409.000/ -381442.000+1451524.000 @@ -9480,48 +9464,6 @@ -375645.000+1443755.000 - - -381156.000+1452525.000/ --381156.911+1452538.258/ --381159.618+1452551.113/ --381204.037+1452603.175/ --381210.034+1452614.079/ --381217.429+1452623.491/ --381225.995+1452631.127/ --381235.473+1452636.755/ --381245.574+1452640.203/ --381255.993+1452641.366/ --381306.412+1452640.209/ --381316.515+1452636.766/ --381325.995+1452631.143/ --381334.563+1452623.508/ --381341.960+1452614.096/ --381347.960+1452603.191/ --381352.381+1452551.124/ --381355.088+1452538.264/ --381356.000+1452525.000/ --381355.088+1452511.736/ --381352.381+1452458.876/ --381347.960+1452446.809/ --381341.960+1452435.904/ --381334.563+1452426.492/ --381325.995+1452418.857/ --381316.515+1452413.234/ --381306.412+1452409.791/ --381255.993+1452408.634/ --381245.574+1452409.797/ --381235.473+1452413.245/ --381225.995+1452418.873/ --381217.429+1452426.509/ --381210.034+1452435.921/ --381204.037+1452446.825/ --381159.618+1452458.887/ --381156.911+1452511.742/ --381156.000+1452525.000 - - - - -373436.000+1441318.000/ -373624.000+1442000.000/ @@ -9779,14 +9721,14 @@ -332013.057+1504548.860/ -331835.000+1504927.000/ -332613.000+1505252.000/ --332606.721+1505226.498/ --332537.006+1505013.322/ --332527.000+1504756.000/ --332537.006+1504538.678/ --332606.721+1504325.502/ --332655.248+1504120.497/ --332801.122+1503927.444/ --332922.349+1503749.768/ +-332605.721+1505226.497/ +-332536.006+1505013.322/ +-332526.000+1504756.000/ +-332536.006+1504538.678/ +-332605.721+1504325.503/ +-332654.248+1504120.498/ +-332800.122+1503927.445/ +-332921.349+1503749.770/ -332940.000+1503734.000/ -332731.000+1503436.000 diff --git a/Sectors.xml b/Sectors.xml index 35aaa0a8..a1e24f8b 100644 --- a/Sectors.xml +++ b/Sectors.xml @@ -110,7 +110,7 @@ JAR - + KAT From e8236d5d56c26b2e4936b8c1c8711d5282385130 Mon Sep 17 00:00:00 2001 From: Pip <92968130+codepip55@users.noreply.github.com> Date: Sun, 13 Nov 2022 19:54:44 +0100 Subject: [PATCH 02/22] Fix merge conflicts --- Maps/SECTOR_FREQS.xml | 4 ---- Profile.xml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/Maps/SECTOR_FREQS.xml b/Maps/SECTOR_FREQS.xml index 2cd01864..e2fed8bb 100644 --- a/Maps/SECTOR_FREQS.xml +++ b/Maps/SECTOR_FREQS.xml @@ -4,12 +4,8 @@ - + CSA CSD - + CSA diff --git a/Volumes.xml b/Volumes.xml index 13cb163a..512d9245 100644 --- a/Volumes.xml +++ b/Volumes.xml @@ -5050,7 +5050,7 @@ CROSS - + CAIRNS_APPROACH @@ -5173,7 +5173,7 @@ KENNEDY - + CAIRNS_APPROACH From e8fe387e0211b1e876f3d08e8488c4d381ba9203 Mon Sep 17 00:00:00 2001 From: Zach Date: Sat, 19 Nov 2022 15:53:13 +1100 Subject: [PATCH 07/22] fix default jurisdictions --- DefaultJurisdiction.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/DefaultJurisdiction.xml b/DefaultJurisdiction.xml index be4a7f9a..8824d110 100644 --- a/DefaultJurisdiction.xml +++ b/DefaultJurisdiction.xml @@ -31,7 +31,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -144,7 +144,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -177,7 +177,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -330,7 +330,7 @@ - + @@ -502,7 +502,7 @@ - + @@ -513,7 +513,7 @@ - + From d611e7d3cde29b28bc8632f5d969529b13eed23a Mon Sep 17 00:00:00 2001 From: Zach Date: Sat, 19 Nov 2022 15:56:40 +1100 Subject: [PATCH 08/22] fixed CB_TMA, ML_TMA + WON CAP, resp sectors, added DNW --- Sectors.xml | 27 +++++++------ Volumes.xml | 112 +++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 103 insertions(+), 36 deletions(-) diff --git a/Sectors.xml b/Sectors.xml index 4da4c6c3..d340f950 100644 --- a/Sectors.xml +++ b/Sectors.xml @@ -54,7 +54,7 @@ ELW,ELW_ML_TMA_CAP - SNO,BLA,MDN,MDS,MAE + SNO,BLA,MAE ESP @@ -111,7 +111,7 @@ KEN,KEN_CS_TMA_CAP - BAR,TBP,SWY,CSA,CSD + BAR,TBP,SWY,CSA KPL @@ -156,7 +156,7 @@ NSA,NSA_BN_TMA_CAP - BAN,BAS,BDN,BDS,BAG + BAN OCN @@ -173,7 +173,7 @@ PIY,PIY_PH_TMA_CAP - JAR,HYD,CRS,GVE,GEL,LEA,PHD,PHA,PEA + JAR,HYD,CRS,GVE,GEL,LEA,PHA POT @@ -201,7 +201,7 @@ TBD,TBD_TMA_CAP - AUG,AAE,AAW + AUG,AAW TRT,TRTTMA @@ -235,7 +235,7 @@ WOL,WOL_CB_TMA_CAP - WON + WON,WON_ML_TMA_CAP WRA @@ -345,13 +345,16 @@ CSA - CBE + CBA CAW - CBW + CBA - + + DNA + + DNA @@ -364,7 +367,7 @@ LTA - + MKA @@ -375,7 +378,7 @@ MLA - MLA,AVCTR,AVCTA + MLA @@ -397,7 +400,7 @@ PHA - + RKA diff --git a/Volumes.xml b/Volumes.xml index 512d9245..89eb9763 100644 --- a/Volumes.xml +++ b/Volumes.xml @@ -925,6 +925,30 @@ -345224.000+1491138.000/ -354040.000+1491142.000 + + -350920.000+1483619.000/ + -345232.000+1490600.000/ + -345200.000+1493214.000/ + -345351.842+1493515.690/ + -345732.743+1493947.458/ + -350148.854+1494328.706/ + -350632.474+1494612.642/ + -351135.053+1494754.154/ + -351647.443+1494829.975/ + -352006.000+1494812.000/ + -353327.000+1492531.000/ + -354549.000+1490148.000/ + -354503.790+1485906.427/ + -354250.444+1485316.554/ + -353949.566+1484800.902/ + -353606.735+1484329.134/ + -353148.811+1483949.504/ + -352703.712+1483708.607/ + -352200.168+1483531.190/ + -351647.443+1483500.025/ + -351135.053+1483535.846/ + -350920.000+1483619.000 + -35.405556+149.085278/ -35.181944+149.093333/ @@ -2714,6 +2738,33 @@ -261500.000+1120835.000 + -380722.000+1443605.000/ + -380730.281+1443557.418/ + -380829.520+1443442.299/ + -380907.000+1443338.000/ + -381247.000+1443617.000/ + -381320.292+1443511.239/ + -381413.463+1443246.517/ + -381446.032+1443012.197/ + -381457.000+1442733.000/ + -381446.032+1442453.803/ + -381413.463+1442219.483/ + -381343.000+1442049.000/ + -380836.000+1442149.000/ + -380033.000+1442323.000/ + -375849.437+1442122.645/ + -375431.430+1441736.248/ + -374946.265+1441450.481/ + -374442.677+1441310.221/ + -373929.939+1441238.303/ + -373417.565+1441315.458/ + -372915.031+1441500.324/ + -372431.478+1441749.509/ + -372015.449+1442137.726/ + -371634.636+1442617.963/ + -371335.653+1443141.710/ + -371123.851+1443739.213/ + -371003.165+1444359.763/ -370936.000+1445032.000/ -371003.165+1445704.237/ -371123.851+1450324.787/ @@ -2735,22 +2786,7 @@ -380936.000+1445032.000/ -380908.469+1444354.525/ -380746.731+1443729.369/ - -380533.316+1443128.447/ - -380232.355+1442602.881/ - -375849.437+1442122.645/ - -375431.430+1441736.248/ - -374946.265+1441450.481/ - -374442.677+1441310.221/ - -373929.939+1441238.303/ - -373417.565+1441315.458/ - -372915.031+1441500.324/ - -372431.478+1441749.509/ - -372015.449+1442137.726/ - -371634.636+1442617.963/ - -371335.653+1443141.710/ - -371123.851+1443739.213/ - -371003.165+1444359.763/ - -370936.000+1445032.000 + -380722.000+1443605.000 -374947.000+1445354.000/ @@ -4531,9 +4567,18 @@ -384614.000+1431550.000/ -380836.000+1442149.000/ - -380033.000+1442323.000/ - -380232.355+1442602.881/ - -380533.316+1443128.447/ + -381343.000+1442049.000/ + -381413.463+1442219.483/ + -381446.032+1442453.803/ + -381457.000+1442733.000/ + -381446.032+1443012.197/ + -381413.463+1443246.517/ + -381320.292+1443511.239/ + -381247.000+1443617.000/ + -380907.000+1443338.000/ + -380829.520+1443442.299/ + -380730.281+1443557.418/ + -380722.000+1443605.000/ -380746.731+1443729.369/ -380908.469+1444354.525/ -380936.000+1445032.000/ @@ -4567,6 +4612,25 @@ -385404.000+1432539.000/ -384614.000+1431550.000 + + -380722.000+1443605.000/ + -380730.281+1443557.418/ + -380829.520+1443442.299/ + -380907.000+1443338.000/ + -381247.000+1443617.000/ + -381320.292+1443511.239/ + -381413.463+1443246.517/ + -381446.032+1443012.197/ + -381457.000+1442733.000/ + -381446.032+1442453.803/ + -381413.463+1442219.483/ + -381343.000+1442049.000/ + -380836.000+1442149.000/ + -380033.000+1442323.000/ + -380232.355+1442602.881/ + -380533.316+1443128.447/ + -380722.000+1443605.000 + -310844.000+1363722.000/ -305120.000+1363717.000/ @@ -4999,11 +5063,8 @@ NOOSA_A - - CANBERRA_EAST_TMA - - - CANBERRA_WEST_TMA + + CB_TMA_FULL CANBERRA_CONTROL_ZONE_(C) @@ -5419,6 +5480,9 @@ WONTHAGGI + + WONTHAGGI_ML_CAP + WOOMERA From 630ac7a321848c5207332b45b0ef3f188a11cac3 Mon Sep 17 00:00:00 2001 From: Zach Date: Sat, 19 Nov 2022 18:26:48 +1100 Subject: [PATCH 09/22] update met.xml --- MET.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MET.xml b/MET.xml index 074a1bb0..54f9f3e3 100644 --- a/MET.xml +++ b/MET.xml @@ -8,10 +8,10 @@ - - - + + + From 549fd01c5d4b61746e07e8bd29585cd500350984 Mon Sep 17 00:00:00 2001 From: Pip <92968130+codepip55@users.noreply.github.com> Date: Sat, 19 Nov 2022 08:32:38 +0100 Subject: [PATCH 10/22] Update BAY_NUMBERS.xml --- Maps/BAY_NUMBERS.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Maps/BAY_NUMBERS.xml b/Maps/BAY_NUMBERS.xml index 1d62ab7f..19f6ff3b 100644 --- a/Maps/BAY_NUMBERS.xml +++ b/Maps/BAY_NUMBERS.xml @@ -159,8 +159,6 @@ -272251.59+1530728.47 -272250.26+1530729.23 -272248.93+1530729.99 - -272245.92+1530730.59 - -272247.07+1530733.12 -272249.49+1530731.22 -272250.82+1530730.45 -272252.15+1530729.69 @@ -444,7 +442,6 @@ -122430.97+1305234.20 -122431.68+1305236.32 -122429.72+1305231.58 - -122427.09+1305230.60 @@ -649,7 +646,6 @@ -374031.13+1445050.77 -374031.34+1445049.67 -374034.17+1445051.03 - -374034.94+1445052.65 -374031.65+1445049.12 -374034.93+1445049.47 -374031.17+1445047.05 @@ -727,7 +723,7 @@ -315627.37+1155819.92 -315625.94+1155820.60 -315626.22+1155823.68 - -315625.38+1155825.86 + -31.940331+115.973842 -315624.90+1155828.19 -315624.77+1155830.58 -315624.90+1155833.04 From 9e8f638f664b568cd5e25a9820f3ffe359409ede Mon Sep 17 00:00:00 2001 From: Zach Date: Sat, 19 Nov 2022 18:37:55 +1100 Subject: [PATCH 11/22] updates --- DefaultJurisdiction.xml | 4 +- Sectors.xml | 118 ++++++++++++++++++++-------------------- Volumes.xml | 14 ++--- 3 files changed, 68 insertions(+), 68 deletions(-) diff --git a/DefaultJurisdiction.xml b/DefaultJurisdiction.xml index 8824d110..0c709e42 100644 --- a/DefaultJurisdiction.xml +++ b/DefaultJurisdiction.xml @@ -78,7 +78,7 @@ - + @@ -446,7 +446,7 @@ - + diff --git a/Sectors.xml b/Sectors.xml index d340f950..9b2cd7e7 100644 --- a/Sectors.xml +++ b/Sectors.xml @@ -319,42 +319,42 @@ AMBAPP - + BAG_NORTH,BAG_SOUTH - + BNA BAS,BDN,BDS - + BNA - BAG + BAC - + BNA - + BNA - + CSA CSD - + CSA - + CBA CAW - + CBA - + DNA - + DNA @@ -370,14 +370,14 @@ MKA - + MLA MDN,MDS - + MLA - + MLA @@ -403,23 +403,23 @@ RKA - + SYA SAS,SFW,SFE,SDS,SDN - + SYA - + SYA - + SYA - + SYA - + SYA @@ -435,13 +435,13 @@ ADTWR - + ADTWR ADTWR - + AYTWR @@ -453,7 +453,7 @@ AMBTWR - + AMBTWR @@ -465,13 +465,13 @@ AFTWR - + AVTWR AVTWR - + BKTWR @@ -480,13 +480,13 @@ BNTWR - + BNTWR - + BNTWR - + BNTWR @@ -495,7 +495,7 @@ BNTWR - + BRMTWR @@ -504,19 +504,19 @@ CSTWR - + CSTWR CSTWR - + CNTWR CNTWR - + CBTWR @@ -528,7 +528,7 @@ DNTWR - + DNTWR @@ -537,19 +537,19 @@ ESTWR - + ESTWR ESTWR - + EDTWR EDTWR - + ENTWR @@ -561,7 +561,7 @@ CGTWR - + CGTWR @@ -571,19 +571,19 @@ HMTWR - + HBTWR HBTWR - + JTTWR JTTWR - + KATWR @@ -595,7 +595,7 @@ LTTWR - + MKTWR @@ -606,13 +606,13 @@ MLTWR - + MLTWR MLTWR - + MBTWR @@ -626,19 +626,19 @@ NWTWR - + NWTWR NWTWR - + OKTWR OKTWR - + PFTWR @@ -647,7 +647,7 @@ PEATWR - + PEATWR @@ -656,10 +656,10 @@ PHTWR - + PHTWR - + PHTWR @@ -674,13 +674,13 @@ RITWR - + RKTWR RKTWR - + SUTWR @@ -689,19 +689,19 @@ SYTWR - + SYTWR - + SYTWR SYTWR - + SYTWR - + TWTWR @@ -710,7 +710,7 @@ TNTWR - + TNTWR @@ -720,7 +720,7 @@ TLTWR - + TLTWR @@ -729,7 +729,7 @@ WLMTWR - + WLMTWR diff --git a/Volumes.xml b/Volumes.xml index 89eb9763..c82ad630 100644 --- a/Volumes.xml +++ b/Volumes.xml @@ -5024,7 +5024,7 @@ BINDOOK - + SY_TMA_FULL @@ -5054,13 +5054,13 @@ BURNETT_B_C_D - + BURNETT_A NOOSA_B_C - + NOOSA_A @@ -5111,7 +5111,7 @@ CROSS - + CAIRNS_APPROACH @@ -5234,7 +5234,7 @@ KENNEDY - + CAIRNS_APPROACH @@ -5369,7 +5369,7 @@ ROCKHAMPTON_CONTROL_ZONE_(D) - + SY_TMA_FULL @@ -5384,7 +5384,7 @@ STRADDY_A - + STRADDY_B From 2ea32dbcae3cfae4797080568ce6d5d8d97059f6 Mon Sep 17 00:00:00 2001 From: Zach Date: Sun, 20 Nov 2022 14:53:30 +1100 Subject: [PATCH 12/22] Update MET.xml --- MET.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MET.xml b/MET.xml index 54f9f3e3..bddbe005 100644 --- a/MET.xml +++ b/MET.xml @@ -11,7 +11,7 @@ - + From e86364c66be8ee2cda1c10ca9fe7988e80890ab2 Mon Sep 17 00:00:00 2001 From: Pip <92968130+codepip55@users.noreply.github.com> Date: Mon, 21 Nov 2022 08:14:27 +0100 Subject: [PATCH 13/22] fix errors; DAH Updates --- Airspace.xml | 427 ++++++++++---------- AlertParameters.xml | 2 +- Maps/ALL_AIRPORTS.xml | 4 + Maps/APP_RNP_ALL.xml | 889 +++++++++++++++++++++--------------------- Positions.xml | 18 +- Sectors.xml | 14 +- Volumes.xml | 70 ---- 7 files changed, 699 insertions(+), 725 deletions(-) diff --git a/Airspace.xml b/Airspace.xml index 3dc22403..fd5907bb 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -6189,6 +6189,18 @@ BOFOR -282037.600+1535209.600 -301922.000+1515442.700 -190102.800+1464748.500 + -243610.900+1185057.000 + -244137.200+1185300.400 + -244514.700+1184806.900 + -243851.700+1184227.100 + -243647.200+1183432.900 + -244014.500+1184743.700 + -243846.400+1182328.800 + -243319.700+1182126.700 + -243606.700+1183159.100 + -242943.000+1182620.500 + -243810.800+1183951.100 + -243443.300+1182642.800 -162409.000+1282728.200 -162248.200+1283316.300 -163208.800+1282927.800 @@ -6343,6 +6355,7 @@ BOFOR -275901.100+1182712.500 -335911.900+1505835.400 -150006.000+1400000.000 + -360704.000+1480633.000 -121932.700+1313447.600 -125044.900+1303759.500 -382609.200+1470942.100 @@ -6646,9 +6659,12 @@ BOFOR -123508.100+1305556.800 -284458.000+1464126.300 -271951.700+1530618.000 + -272902.100+1531613.200 -270819.600+1531608.200 -273833.800+1530429.300 + -270902.100+1530422.700 -272352.000+1530922.800 + -271307.000+1530107.300 -272329.000+1530607.400 -272118.800+1530721.800 -241831.300+1453419.000 @@ -6726,6 +6742,7 @@ BOFOR -163755.300+1455222.400 -274654.000+1531112.000 -345718.200+1440923.800 + -254440.100+1512929.500 -273058.900+1525502.600 -270938.200+1531523.200 -321050.000+1165400.200 @@ -6742,12 +6759,10 @@ BOFOR -223552.300+1173052.900 -223147.200+1172327.000 -223120.400+1172833.800 - -223221.800+1171648.500 -223237.500+1171348.300 -222858.200+1170118.100 -223257.000+1171001.800 -223330.300+1170336.800 - -223228.500+1171531.800 -223156.000+1172145.600 -200135.100+1274721.600 -195614.300+1274937.000 @@ -7366,15 +7381,23 @@ BOFOR -280747.500+1533057.400 -280535.600+1533401.600 -281648.800+1533446.300 + -275618.400+1532813.100 + -280620.000+1532805.900 + -281200.700+1533142.600 + -280119.200+1532809.500 + -281815.700+1534148.400 + -282339.400+1533147.800 + -281443.300+1533326.100 + -275847.400+1532906.800 + -281905.200+1533613.200 + -280709.100+1532837.200 -280712.400+1532839.200 -282109.400+1533732.100 -281540.200+1533402.200 -281524.600+1533649.400 -281337.700+1533317.500 -281229.500+1533200.900 - -280709.100+1532837.200 -280342.400+1532800.200 - -275847.400+1532906.800 -281714.400+1533447.800 -281759.000+1533717.100 -281253.200+1533206.800 @@ -7605,11 +7628,9 @@ BOFOR -221601.200+1195310.100 -222036.400+1195654.700 -222526.700+1195333.400 - -222113.900+1193916.800 -221639.000+1193741.100 -222128.300+1193225.200 -222142.500+1192539.000 - -222117.000+1193749.600 -222629.000+1192359.700 -222153.700+1192015.500 -221703.600+1192337.000 @@ -7831,18 +7852,6 @@ BOFOR -274057.000+1222006.200 -273337.700+1222009.900 -274557.800+1222003.700 - -275705.600+1213007.700 - -280248.300+1212922.600 - -280407.800+1212304.100 - -275608.200+1212056.500 - -275047.700+1211412.300 - -275928.300+1212509.400 - -274746.300+1210227.400 - -274203.700+1210313.700 - -274844.900+1211137.700 - -274045.100+1210931.200 - -275405.500+1211821.600 - -274524.400+1210725.600 -352414.200+1450815.100 -352712.000+1451415.300 -353250.700+1451254.200 @@ -7920,6 +7929,7 @@ BOFOR -371446.000+1442927.000 -184154.000+1445242.000 -404959.400+1450454.000 + -364924.000+1474723.000 -263657.000+1532313.700 -341132.400+1404033.400 -284022.800+1630000.000 @@ -7933,16 +7943,18 @@ BOFOR -410825.700+1460835.900 -410815.000+1462947.100 -411234.900+1461217.400 - -244704.340+1500026.200 + -244704.300+1500026.200 -244346.700+1500536.200 - -245348.600+1500535.510 - -244704.920+1501045.740 - -244847.650+1500535.860 - -251119.990+1501045.100 - -251437.800+1500534.090 - -251119.400+1500023.530 - -250435.930+1500534.780 - -250936.860+1500534.430 + -245348.600+1500535.500 + -244704.900+1501045.700 + -250251.000+1500534.900 + -244847.700+1500535.900 + -251120.000+1501045.100 + -251437.800+1500534.100 + -251119.400+1500023.500 + -250435.900+1500534.800 + -245533.400+1500535.400 + -250936.900+1500534.400 -123951.600+1305201.200 -270954.500+1530503.700 -172028.300+1235244.800 @@ -8136,6 +8148,7 @@ BOFOR -324519.600+1494845.600 -373839.300+1445727.700 -270629.500+1531128.600 + -220032.000+1495704.300 -302038.800+1501832.800 -112812.000+1002942.000 -205617.100+1151835.200 @@ -8659,6 +8672,18 @@ BOFOR -230200.100+1184124.800 -100930.000+1522142.000 -233808.600+1593048.100 + -283422.200+1144148.900 + -283243.400+1144803.300 + -283720.100+1145156.700 + -284214.300+1144428.600 + -284950.900+1144136.400 + -283728.900+1144616.100 + -290109.200+1144258.600 + -285317.000+1144018.500 + -290247.700+1143642.400 + -284540.300+1144311.000 + -285802.400+1143830.500 + -285810.500+1143248.600 -343656.400+1495033.900 -343811.100+1495721.000 -344456.900+1494824.300 @@ -8671,18 +8696,6 @@ BOFOR -345210.100+1493848.800 -344646.100+1494559.600 -345532.500+1493419.100 - -283422.200+1144148.900 - -283243.400+1144803.300 - -283720.100+1145156.700 - -284214.300+1144428.600 - -284950.900+1144136.400 - -283728.900+1144616.100 - -290109.200+1144258.600 - -285317.000+1144018.500 - -290247.700+1143642.400 - -284540.300+1144311.000 - -285802.400+1143830.500 - -285810.500+1143248.600 -345445.000+1382012.500 -251926.700+1525259.000 -314759.900+1160021.000 @@ -8836,6 +8849,17 @@ BOFOR -201720.900+1485348.700 -201331.700+1485656.000 -201624.600+1485830.400 + -320044.800+1195922.300 + -320507.500+1200344.700 + -321007.300+1200024.500 + -320603.600+1195201.500 + -320648.000+1194236.000 + -320535.700+1195753.100 + -320757.400+1192731.600 + -320703.500+1193915.200 + -320258.400+1193053.500 + -320619.700+1194837.300 + -320730.600+1193323.400 -203948.359-1761932.948 -120000.000+1530932.700 -334818.500+1394209.200 @@ -8928,13 +8952,9 @@ BOFOR -223453.800+1202018.000 -223453.700+1201453.800 -223936.600+1201644.700 - -223453.800+1200252.100 -223936.500+1194732.700 - -223453.600+1194359.500 - -223010.700+1194732.800 -223453.700+1195550.500 -223453.600+1194923.600 - -223453.800+1200124.600 -211828.900+1190658.000 -212410.200+1190754.200 -212656.400+1190230.800 @@ -9023,6 +9043,18 @@ BOFOR -374013.700+1451302.300 -113545.600+1032032.900 -360516.600+1465056.600 + -324146.400+1441129.300 + -323757.300+1441633.700 + -324040.700+1442232.500 + -324754.200+1441756.500 + -325551.700+1441902.900 + -324255.700+1441715.100 + -330438.600+1442554.000 + -325831.200+1441925.100 + -330828.000+1442048.300 + -325033.700+1441818.600 + -330329.600+1442006.600 + -330544.500+1441447.700 -375744.100+1442849.300 -200000.000+1032909.600 -283259.500+1515747.800 @@ -9107,20 +9139,6 @@ BOFOR -360856.600+1465947.400 -122756.900+1304620.500 -203226.600+1490434.200 - -324146.400+1441129.300 - -323757.300+1441633.700 - -324040.700+1442232.500 - -324754.200+1441756.500 - -325551.700+1441902.900 - -324255.700+1441715.100 - -325252.600+1441838.000 - -330438.600+1442554.000 - -325831.200+1441925.100 - -330828.000+1442048.300 - -325033.700+1441818.600 - -330329.600+1442006.600 - -330544.500+1441447.700 - -325332.700+1441843.500 -210444.700+1491816.200 -210342.500+1492027.800 -210425.800+1492247.700 @@ -9188,6 +9206,18 @@ BOFOR -204047.500+1414530.100 -203656.400+1413215.400 -203954.300+1414226.700 + -304746.300+1315742.500 + -304213.000+1315924.600 + -304952.000+1320654.000 + -304141.700+1320601.900 + -305558.900+1321254.300 + -304602.500+1320309.100 + -310019.700+1322421.300 + -310553.400+1322240.200 + -310625.400+1321601.300 + -305815.200+1321508.400 + -305208.300+1320907.800 + -310204.300+1321854.200 -181019.100+1222414.300 -312500.000+1515148.000 -230000.000+1100000.000 @@ -9212,20 +9242,6 @@ BOFOR -262636.700+1202241.300 -262524.600+1203344.900 -375602.000+1443422.100 - -304746.300+1315742.500 - -304213.000+1315924.600 - -304952.000+1320654.000 - -304141.700+1320601.900 - -305558.900+1321254.300 - -304602.500+1320309.100 - -305341.300+1321039.100 - -310019.700+1322421.300 - -310553.400+1322240.200 - -310625.400+1321601.300 - -305815.200+1321508.400 - -305208.300+1320907.800 - -310204.300+1321854.200 - -305425.900+1321122.900 -204324.700+1164024.200 -204210.600+1165212.800 -204152.600+1165312.800 @@ -9556,6 +9572,18 @@ BOFOR -355046.300+1372110.100 -385418.000+1502456.000 -192025.900+1464316.300 + -233553.200+1200424.500 + -233138.900+1201034.800 + -234134.600+1200900.400 + -233720.200+1201510.900 + -234919.400+1200746.500 + -233636.800+1200947.600 + -235933.200+1201120.000 + -240208.300+1200544.200 + -235811.300+1200110.900 + -235212.700+1200719.000 + -234426.300+1200833.100 + -235710.500+1200631.600 -153113.600+1415840.100 -153657.800+1415911.900 -153157.500+1415013.000 @@ -9769,6 +9797,18 @@ BOFOR -330638.800+1514011.600 -330450.900+1513106.700 -330359.000+1513832.300 + -275705.600+1213007.700 + -280248.300+1212922.600 + -280407.800+1212304.100 + -275608.200+1212056.500 + -275047.700+1211412.300 + -275928.300+1212509.400 + -274746.300+1210227.400 + -274203.700+1210313.700 + -274844.900+1211137.700 + -274045.100+1210931.200 + -275405.500+1211821.600 + -274524.400+1210725.600 -250204.700+1520638.600 -160124.800+1453628.600 -343900.000+1280000.000 @@ -9998,20 +10038,6 @@ BOFOR -253629.500+1524331.600 -252830.900+1524231.800 -254128.600+1524409.100 - -372259.070+1494023.670 - -372038.420+1494657.610 - -372445.680+1495158.500 - -373028.370+1494435.610 - -373305.180+1494952.730 - -372533.400+1494546.690 - -373523.320+1494324.370 - -374851.860+1494610.640 - -374122.860+1494157.330 - -375112.680+1493934.020 - -373725.430+1494921.810 - -374617.780+1494045.760 - -374705.160+1493432.090 - -373627.930+1494308.750 -205531.800+1164008.800 -205244.400+1164132.300 -372259.100+1494023.700 @@ -10317,18 +10343,6 @@ BOFOR -324548.400+1512708.400 -324616.800+1512040.400 -324257.600+1512759.000 - -271753.200+1204753.800 - -272331.900+1204908.100 - -272629.900+1204336.800 - -271903.100+1203750.700 - -271547.100+1202938.600 - -272129.800+1204400.000 - -271631.700+1201835.800 - -271052.800+1201723.100 - -271523.200+1202838.900 - -270755.700+1202254.300 - -271839.300+1203650.900 - -271255.800+1202230.200 -364206.500+1452007.500 -364358.900+1452652.200 -364943.400+1452659.700 @@ -10437,6 +10451,18 @@ BOFOR -292730.300+1495136.200 -293956.900+1494710.300 -294010.900+1494126.400 + -271753.200+1204753.800 + -272331.900+1204908.100 + -272629.900+1204336.800 + -271903.100+1203750.700 + -271547.100+1202938.600 + -272129.800+1204400.000 + -271631.700+1201835.800 + -271052.800+1201723.100 + -271523.200+1202838.900 + -270755.700+1202254.300 + -271839.300+1203650.900 + -271255.800+1202230.200 -373257.400+1405446.800 -372912.500+1404919.000 -373910.100+1404803.100 @@ -10604,6 +10630,7 @@ BOFOR -190259.000+1465526.500 -154415.100+1244322.900 -220448.000+1740418.000 + -374006.000+1472355.000 -111400.000+1313300.000 -331640.000+1382912.100 -304053.300+1165428.400 @@ -10626,6 +10653,18 @@ BOFOR -183308.800+1380331.600 -273939.700+1530306.900 -374834.600+1441427.400 + -314039.700+1232124.000 + -314309.600+1232727.200 + -314852.800+1232646.700 + -314803.000+1231712.900 + -315226.300+1230759.100 + -314536.400+1232220.200 + -320049.900+1230138.100 + -315818.700+1225534.400 + -315327.100+1230551.000 + -315235.700+1225616.900 + -314903.900+1231505.000 + -315553.000+1230042.800 -334710.700+1514424.400 -345110.200+1382134.600 -132135.200+1063820.900 @@ -10670,20 +10709,6 @@ BOFOR -424210.100+1473040.400 -161153.500+1442011.500 -173946.200+1453217.000 - -314039.700+1232124.000 - -314309.600+1232727.200 - -314852.800+1232646.700 - -314803.000+1231712.900 - -315226.300+1230759.100 - -314536.400+1232220.200 - -315029.400+1231205.300 - -320049.900+1230138.100 - -315818.700+1225534.400 - -315327.100+1230551.000 - -315235.700+1225616.900 - -314903.900+1231505.000 - -315553.000+1230042.800 - -315101.000+1231058.900 -105044.500+1421510.700 -104506.700+1421625.400 -105229.700+1422318.800 @@ -10928,15 +10953,6 @@ BOFOR -280357.600+1402112.500 -281432.800+1402025.300 -280722.800+1401402.400 - -275618.400+1532813.100 - -280620.000+1532805.900 - -281200.700+1533142.600 - -280119.200+1532809.500 - -281815.700+1534148.400 - -282339.400+1533147.800 - -281443.300+1533326.100 - -280220.500+1533103.800 - -281905.200+1533613.200 -085130.000+1380400.000 -263443.000+1182708.200 -290139.400+1532801.300 @@ -11475,13 +11491,6 @@ BOFOR -203211.900+1483907.200 -202852.300+1483121.900 -203416.400+1484358.300 - -202548.000+1481841.000 - -202002.600+1481851.100 - -202601.300+1482724.200 - -201813.300+1482438.500 - -203123.700+1483506.600 - -202302.000+1482307.600 - -202900.500+1483141.000 -311140.200+1525230.600 -311240.200+1530040.800 -312122.700+1525453.700 @@ -11494,6 +11503,13 @@ BOFOR -313055.700+1524831.600 -312358.000+1525310.300 -313516.700+1524537.100 + -202548.000+1481841.000 + -202002.600+1481851.100 + -202601.300+1482724.200 + -201813.300+1482438.500 + -203123.700+1483506.600 + -202302.000+1482307.600 + -202900.500+1483141.000 -335750.700+1512245.700 -342418.500+1401315.300 -220032.000+1495704.300 @@ -11503,6 +11519,7 @@ BOFOR -141833.700+1321739.900 -143247.900+1322358.900 -142257.500+1321510.500 + -143043.900+1322207.900 -143748.900+1323454.600 -144324.500+1323329.400 -144401.200+1322736.300 @@ -11598,18 +11615,18 @@ BOFOR -333853.700+1151756.500 -334006.000+1152714.100 -333620.600+1152623.500 - -263245.400+1442936.700 - -263741.300+1443253.700 - -264209.400+1442851.200 - -263658.400+1442145.900 - -263623.500+1441251.800 - -263719.900+1442719.800 - -264021.000+1440117.300 - -263524.100+1435800.700 - -263608.700+1440908.200 - -263057.000+1440203.200 - -263643.800+1441802.300 - -263546.500+1440334.400 + -263245.400+1442936.700 + -263741.300+1443253.700 + -264209.400+1442851.200 + -263658.400+1442145.900 + -263623.500+1441251.800 + -263719.900+1442719.800 + -264021.000+1440117.300 + -263524.100+1435800.700 + -263608.700+1440908.200 + -263057.000+1440203.200 + -263643.800+1441802.300 + -263546.500+1440334.400 -115245.200+1301534.700 -270636.000+1530406.000 -322136.000+1381106.000 @@ -11714,6 +11731,13 @@ BOFOR -282811.400+1533456.500 -281352.100+1533220.400 -280802.100+1533108.700 + -285545.300+1223649.800 + -285812.000+1224245.100 + -291339.000+1221157.700 + -290755.400+1221234.600 + -290841.300+1222153.600 + -290442.600+1222949.700 + -291110.200+1221655.800 -122432.200+1305946.300 -123214.500+1304451.300 -122020.800+1304718.200 @@ -12098,6 +12122,13 @@ BOFOR -335103.600+1505729.800 -335126.600+1505047.800 -335443.800+1505813.400 + -341235.800+1503057.000 + -341010.400+1502441.000 + -340427.000+1502517.000 + -340509.400+1503506.400 + -341109.700+1503759.500 + -340740.000+1502953.800 + -340238.800+1504018.200 -341340.000+1481443.900 -320948.000+1160300.000 -323918.000+1501518.000 @@ -12114,13 +12145,6 @@ BOFOR -300850.500+1222252.800 -301529.100+1220816.100 -225906.200+1285206.200 - -341235.800+1503057.000 - -341010.400+1502441.000 - -340427.000+1502517.000 - -340509.400+1503506.400 - -341109.700+1503759.500 - -340740.000+1502953.800 - -340238.800+1504018.200 -320838.000+1510704.600 -321420.600+1510618.300 -321540.500+1505943.600 @@ -12340,18 +12364,6 @@ BOFOR -420643.600+1451806.200 -421928.600+1451439.200 -422013.500+1450759.300 - -285545.300+1223649.800 - -285812.000+1224245.100 - -290311.300+1223251.200 - -290355.800+1224209.900 - -290710.200+1222455.400 - -290041.800+1223748.200 - -291606.800+1221753.400 - -291339.000+1221157.700 - -290755.400+1221234.600 - -290841.300+1222153.600 - -290442.600+1222949.700 - -291110.200+1221655.800 -333618.100+1505915.800 -334202.700+1505708.400 -333759.600+1505337.400 @@ -12824,6 +12836,7 @@ BOFOR -314730.800+1161129.500 -331603.400+1513348.700 -291100.000+1164007.100 + -371253.000+1473635.000 -345155.100+1503808.700 -072400.000+1333530.000 -175811.000+1450649.900 @@ -12834,6 +12847,16 @@ BOFOR -122759.200+1304622.000 -423323.300+1472518.900 -171424.000+1453836.000 + -291103.600+1243920.300 + -290612.300+1244822.100 + -291051.300+1245213.300 + -291056.800+1244630.700 + -291537.500+1244833.600 + -291606.000+1241748.000 + -291126.800+1241356.900 + -290640.900+1241736.800 + -291115.200+1422650.100 + -291121.700+1241939.600 -314139.500+1523615.200 -314304.300+1524253.100 -314844.700+1523615.200 @@ -12846,20 +12869,8 @@ BOFOR -315706.600+1522626.200 -315044.300+1523355.100 -320039.000+1522216.500 - -291103.600+1243920.300 - -290612.300+1244822.100 - -291051.300+1245213.300 - -291056.800+1244630.700 - -291537.500+1244833.600 - -291109.000+1243340.200 -154448.400+1454102.200 -125918.700+1303225.900 - -291606.000+1241748.000 - -291126.800+1241356.900 - -290640.900+1241736.800 - -291115.200+1242650.100 - -291121.700+1241939.600 - -291110.200+1243222.800 -265130.000+1363218.000 -320000.000+1100000.000 -345300.000+1442518.000 @@ -12987,6 +12998,7 @@ BOFOR -260812.000+1531518.000 -290000.000+1100000.000 -314944.900+1162414.500 + -372658.000+1473003.000 -181105.100+1253325.300 -330640.800+1485145.800 -423326.300+1471719.700 @@ -13217,20 +13229,18 @@ BOFOR -260515.800+1263510.200 -261816.100+1263407.800 -260815.900+1263455.800 - -311853.500+1432630.400 - -311900.400+1433312.000 - -312426.600+1433522.100 - -312705.900+1432618.700 - -313334.000+1432047.200 - -312303.200+1432945.500 - -313108.500+1432251.600 - -314347.700+1431851.000 - -313535.400+1431903.300 - -314340.200+1431207.600 - -312907.300+1432435.000 - -313937.800+1431535.600 - -313813.600+1430958.300 - -313132.900+1432230.700 + -305422.800+1431848.500 + -310007.600+1431841.900 + -310200.100+1431223.400 + -305414.400+1430917.300 + -304931.300+1430146.500 + -305711.100+1431359.500 + -304013.800+1425616.600 + -304205.200+1424958.900 + -304759.900+1425921.100 + -304750.000+1424950.600 + -305243.100+1430651.800 + -304502.600+1425439.900 -280613.200+1521115.600 -281122.900+1521407.400 -281531.900+1520937.700 @@ -13308,20 +13318,6 @@ BOFOR -210233.300+1184213.600 -210102.900+1182709.100 -335905.600+1513441.500 - -305422.800+1431848.500 - -310007.600+1431841.900 - -310200.100+1431223.400 - -305414.400+1430917.300 - -304931.300+1430146.500 - -305711.100+1431359.500 - -305117.600+1430435.600 - -304013.800+1425616.600 - -304205.200+1424958.900 - -304759.900+1425921.100 - -304750.000+1424950.600 - -305243.100+1430651.800 - -304502.600+1425439.900 - -305057.000+1430402.700 -283636.200+1200000.000 -291020.400+1524516.000 -272053.500+1200000.000 @@ -13499,6 +13495,18 @@ BOFOR -315130.000+1154854.000 -344407.600+1403159.100 -314511.200+1160441.300 + -311853.500+1432630.400 + -311900.400+1433312.000 + -312426.600+1433522.100 + -312705.900+1432618.700 + -313334.000+1432047.200 + -312303.200+1432945.500 + -314347.700+1431851.000 + -313535.400+1431903.300 + -314340.200+1431207.600 + -312907.300+1432435.000 + -313937.800+1431535.600 + -313813.600+1430958.300 -664512.300+1105856.400 -664016.500+1105137.400 -663552.000+1110047.600 @@ -16787,15 +16795,15 @@ BOFOR BN400/BN411/BN421/BN19R + CG2NC KEGAN - OOLNC - OOLNI/OOLNF/CG14T + CG2NI/CG2NF/CG14T + CG2SA + CG2SC FIKUL - OOLSA - OOLSC - OOLSI/OOLSF/CG32T + CG2SI/CG2SF/CG32T KERRI @@ -17362,6 +17370,10 @@ BOFOR + + + + @@ -18290,6 +18302,10 @@ BOFOR + + + + @@ -18485,7 +18501,10 @@ BOFOR - + + + + diff --git a/AlertParameters.xml b/AlertParameters.xml index 5e57950a..6a48de84 100644 --- a/AlertParameters.xml +++ b/AlertParameters.xml @@ -5,7 +5,7 @@ - ADA,ADD,AVCTR,AVCTA,BNA,CBE,CBW,BAG_NORTH,BAG_SOUTH,CSA,DNA,MLA,PHA,SYA,WLMAPP,WLMAPPE,WLMAPPFG + ADA,ADD,AVCTR,AVCTA,BNA,CBA,BAG_NORTH,BAG_SOUTH,CSA,DNA,MLA,PHA,SYA,WLMAPP,WLMAPPE,WLMAPPFG -334244.4699+1510848.9368/ diff --git a/Maps/ALL_AIRPORTS.xml b/Maps/ALL_AIRPORTS.xml index 6a5564f4..91dbc670 100644 --- a/Maps/ALL_AIRPORTS.xml +++ b/Maps/ALL_AIRPORTS.xml @@ -40,6 +40,7 @@ YBOK YBOU YBPN + YBRA YBRK YBRM YBRN @@ -167,6 +168,7 @@ YKOW YKRY YKSC + YKWA YLBD YLCG YLEC @@ -1369,6 +1371,7 @@ YBOK YBOU YBPN + YBRA YBRK YBRM YBRN @@ -1496,6 +1499,7 @@ YKOW YKRY YKSC + YKWA YLBD YLCG YLEC diff --git a/Maps/APP_RNP_ALL.xml b/Maps/APP_RNP_ALL.xml index dc52e6f7..5fe547a4 100644 --- a/Maps/APP_RNP_ALL.xml +++ b/Maps/APP_RNP_ALL.xml @@ -16,10 +16,10 @@ PFTNC PFTNA PFTNF - TRAEG - TRAEH - TRAEJ - TRAEF + TP2EG + TP2EH + TP2EJ + TP2EF MINUR OY2WF ESDIG @@ -64,11 +64,11 @@ GLENN BETSO OSOKO + CG2NC KEGAN - OOLNC + CG2SA + CG2SC FIKUL - OOLSA - OOLSC ATOSU GUNRO PULAX @@ -221,9 +221,9 @@ CBRSD CBRSG MENZI - SCNWA - SCNWB - SCNWC + SC2WA + SC2WB + SC2WC ANKUB SSYNI TONUX @@ -251,8 +251,8 @@ GOGEX OGATU SAKBO - OOLNF - OOLSF + CG2NF + CG2SF CNSNF HTISF HTINF @@ -311,7 +311,7 @@ SBKWF CBREF CBRSF - SCNWF + SC2WF SSYWF SSYNF SYDNF @@ -330,8 +330,8 @@ NOMEV PIKON OKVIS - OOLNI - OOLSI + CG2NI + CG2SI CNSNI HTISI HTINI @@ -388,11 +388,21 @@ SBKWI CBREI CBRSI - SCNWI + SC2WI STWWI STWEI WM2WI WM2EI + AE2EA + AE2EB + AE2EC + AE2EF + AE2EI + AE2WD + AE2WE + AE2WG + AE2WF + AE2WI AG2ND AG2NE AG2NG @@ -948,16 +958,6 @@ DK2SC DK2SF DK2SI - DLOEA - DLOEB - DLOEC - DLOEF - DLOEI - DLOWD - DLOWE - DLOWG - DLOWF - DLOWI DLQEA DLQEB DLQEC @@ -1276,6 +1276,16 @@ GTNWG GTNWF GTNWI + GW2NA + GW2NC + GW2ND + GW2NF + GW2NI + GW2SE + GW2SG + GW2SJ + GW2SF + GW2SI GZBND GZBNE GZBNG @@ -1286,16 +1296,6 @@ GZBSC GZBSF GZBSI - GZLNA - GZLNC - GZLND - GZLNF - GZLNI - GZLSE - GZLSG - GZLSJ - GZLSF - GZLSI HBAEA HBAEB HBAEC @@ -1346,6 +1346,15 @@ HLTSJ HLTSF HLTSI + HO2EA + HO2EB + HO2EC + HO2EF + HO2EI + HO2WE + HO2WG + HO2WF + HO2WI HOZEA HOZEB HOZEC @@ -1385,8 +1394,6 @@ IA2EF IA2EI IA2WB - IA2WC - IA2WD IA2WF IA2WI IB3EA @@ -1413,6 +1420,16 @@ IGMEC IGMEF IGMEI + IH2NA + IH2NC + IH2ND + IH2NF + IH2NI + IH2SE + IH2SG + IH2SJ + IH2SF + IH2SI IMBND IMBNE IMBNG @@ -1428,16 +1445,6 @@ IVLSC IVLSF IVLSI - IVZNA - IVZNC - IVZND - IVZNF - IVZNI - IVZSE - IVZSG - IVZSJ - IVZSF - IVZSI IW2NA IW2NC IW2ND @@ -1467,21 +1474,21 @@ JLCWC JLCWF JLCWI + JN2ND + JN2NE + JN2NG + JN2NF + JN2NI + JN2SA + JN2SB + JN2SC + JN2SF + JN2SI JUNWA JUNWB JUNWC JUNWF JUNWI - JZCND - JZCNE - JZCNG - JZCNF - JZCNI - JZCSA - JZCSB - JZCSC - JZCSF - JZCSI KBYED KBYEE KBYEG @@ -1611,6 +1618,16 @@ KSCSJ KSCSF KSCSI + KW2ND + KW2NE + KW2NG + KW2NF + KW2NI + KW2SA + KW2SB + KW2SC + KW2SF + KW2SI KWMED KWMEE KWMEG @@ -1691,6 +1708,16 @@ LMQWC LMQWF LMQWI + LO2EA + LO2EB + LO2EC + LO2EF + LO2EI + LO2WD + LO2WE + LO2WG + LO2WF + LO2WI LR2EA LR2EB LR2EC @@ -1775,16 +1802,6 @@ MBHSC MBHSF MBHSI - MC2NA - MC2NC - MC2ND - MC2NF - MC2NI - MC2SE - MC2SG - MC2SJ - MC2SF - MC2SI MCONA MCONC MCOND @@ -1917,16 +1934,6 @@ MNDWB MNDWF MNDWI - MNEEA - MNEEB - MNEEC - MNEEF - MNEEI - MNEWD - MNEWE - MNEWG - MNEWF - MNEWI MNGEA MNGEB MNGEC @@ -1987,6 +1994,16 @@ MRZSJ MRZSF MRZSI + MT2EA + MT2EB + MT2EC + MT2EF + MT2EI + MT2WD + MT2WE + MT2WG + MT2WF + MT2WI MTGND MTGNE MTGNG @@ -2052,16 +2069,16 @@ NHLWG NHLWF NHLWI - NOVEA - NOVEB - NOVEC - NOVEF - NOVEI - NOVWD - NOVWE - NOVWG - NOVWF - NOVWI + NO2EA + NO2EB + NO2EC + NO2EF + NO2EI + NO2WD + NO2WE + NO2WG + NO2WF + NO2WI NPEND NPENE NPENG @@ -2330,11 +2347,6 @@ PPPEC PPPEF PPPEI - PPPWD - PPPWE - PPPWG - PPPWF - PPPWI PQQND PQQNE PQQNG @@ -2345,6 +2357,11 @@ PQQSC PQQSF PQQSI + PR2WD + PR2WE + PR2WG + PR2WF + PR2WI PU2NA PU2NC PU2ND @@ -2370,16 +2387,20 @@ QB2SC QB2SF QB2SI - QLPEA - QLPEB - QLPEC - QLPEF - QLPEI - QLPWD - QLPWE - QLPWG - QLPWF - QLPWI + QL2EA + QL2EB + QL2EC + QL2EF + QL2EI + QL2WD + QL2WE + QL2WG + QL2WF + QL2WI + RD2WB + RD2WC + RD2WF + RD2WI RENED RENEE RENEG @@ -2526,16 +2547,6 @@ SR2SJ SR2SF SR2SI - SRDED - SRDEE - SRDEG - SRDEF - SRDEI - SRDWA - SRDWB - SRDWC - SRDWF - SRDWI SRIEA SRIEB SRIEF @@ -2692,6 +2703,7 @@ TOCWG TOCWF TOCWI + TP2EI TR2ND TR2NE TR2NG @@ -2702,12 +2714,6 @@ TR2SC TR2SF TR2SI - TRAEI - TRAWB - TRAWC - TRAWD - TRAWF - TRAWI TSTWD TSTWE TSTWG @@ -2797,16 +2803,16 @@ WBRSC WBRSF WBRSI - WCANA - WCANC - WCAND - WCANF - WCANI - WCASE - WCASG - WCASJ - WCASF - WCASI + WC2EA + WC2EB + WC2EC + WC2EF + WC2EI + WC2WD + WC2WE + WC2WG + WC2WF + WC2WI WCKEA WCKEB WCKEC @@ -2848,16 +2854,6 @@ WGZWC WGZWF WGZWI - WHCEA - WHCEB - WHCEC - WHCEF - WHCEI - WHCWD - WHCWE - WHCWG - WHCWF - WHCWI WHZND WHZNE WHZNG @@ -2925,6 +2921,16 @@ WOLSJ WOLSF WOLSI + WQ2NA + WQ2NC + WQ2ND + WQ2NF + WQ2NI + WQ2SE + WQ2SG + WQ2SJ + WQ2SF + WQ2SI WR2WI WSLWA WSLWB @@ -3121,8 +3127,8 @@ GOGEX OGATU SAKBO - OOLNF - OOLSF + CG2NF + CG2SF CNSNF HTISF HTINF @@ -3181,7 +3187,7 @@ SBKWF CBREF CBRSF - SCNWF + SC2WF SSYWF SSYNF SYDNF @@ -3192,6 +3198,8 @@ STWEF WM2WF WM2EF + AE2EF + AE2WF AG2NF AG2SF ALHWF @@ -3308,8 +3316,6 @@ DG2WF DK2NF DK2SF - DLOEF - DLOWF DLQEF DLQWF DMGEF @@ -3375,10 +3381,10 @@ GTEWF GTNEF GTNWF + GW2NF + GW2SF GZBNF GZBSF - GZLNF - GZLSF HBAEF HBAWF HCQNF @@ -3389,6 +3395,8 @@ HISWF HLTNF HLTSF + HO2EF + HO2WF HOZEF HSMEF HSMWF @@ -3403,20 +3411,20 @@ IE2NF IFLEF IGMEF + IH2NF + IH2SF IMBNF IMBSF IVLSF - IVZNF - IVZSF IW2NF JABEF JABWF JBYNF JLCEF JLCWF + JN2NF + JN2SF JUNWF - JZCNF - JZCSF KBYEF KBYWF KD2EF @@ -3444,6 +3452,8 @@ KRYSF KSCNF KSCSF + KW2NF + KW2SF KWMEF KWMWF LBDEF @@ -3460,6 +3470,8 @@ LLENF LLESF LMQWF + LO2EF + LO2WF LR2EF LR2WF LRZNF @@ -3477,8 +3489,6 @@ MBAWF MBHNF MBHSF - MC2NF - MC2SF MCONF MCOSF MD2EF @@ -3506,8 +3516,6 @@ MMZEF MMZWF MNDWF - MNEEF - MNEWF MNGEF MNGNF MNGSF @@ -3520,6 +3528,8 @@ MRYSF MRZNF MRZSF + MT2EF + MT2WF MTGNF MTGSF MTIEF @@ -3533,8 +3543,8 @@ NGUWF NHLEF NHLWF - NOVEF - NOVWF + NO2EF + NO2WF NPENF NPESF NRCEF @@ -3593,16 +3603,17 @@ PPDNF PPDSF PPPEF - PPPWF PQQNF PQQSF + PR2WF PU2NF PWRSF PZANF QB2NF QB2SF - QLPEF - QLPWF + QL2EF + QL2WF + RD2WF RENEF RENWF RMDEF @@ -3633,8 +3644,6 @@ SQCSF SR2NF SR2SF - SRDEF - SRDWF SRIEF SSYNF STHEF @@ -3668,10 +3677,9 @@ TN2WF TOCEF TOCWF + TP2EF TR2NF TR2SF - TRAEF - TRAWF TSTWF TT2NF TT2SF @@ -3692,8 +3700,8 @@ WBLWF WBRNF WBRSF - WCANF - WCASF + WC2EF + WC2WF WCKEF WDHNF WDHSF @@ -3704,8 +3712,6 @@ WGTNF WGZEF WGZWF - WHCEF - WHCWF WHZNF WHZSF WISWF @@ -3720,6 +3726,8 @@ WLUSF WO2NF WOLSF + WQ2NF + WQ2SF WR2WF WSLWF WTNNF @@ -3771,8 +3779,8 @@ NOMEV PIKON OKVIS - OOLNI - OOLSI + CG2NI + CG2SI CNSNI HTISI HTINI @@ -3829,11 +3837,13 @@ SBKWI CBREI CBRSI - SCNWI + SC2WI STWWI STWEI WM2WI WM2EI + AE2EI + AE2WI AG2NI AG2SI ALHWI @@ -3950,8 +3960,6 @@ DG2WI DK2NI DK2SI - DLOEI - DLOWI DLQEI DLQWI DMGEI @@ -4017,10 +4025,10 @@ GTEWI GTNEI GTNWI + GW2NI + GW2SI GZBNI GZBSI - GZLNI - GZLSI HBAEI HBAWI HCQNI @@ -4031,6 +4039,8 @@ HISWI HLTNI HLTSI + HO2EI + HO2WI HOZEI HSMEI HSMWI @@ -4045,20 +4055,20 @@ IE2NI IFLEI IGMEI + IH2NI + IH2SI IMBNI IMBSI IVLSI - IVZNI - IVZSI IW2NI JABEI JABWI JBYNI JLCEI JLCWI + JN2NI + JN2SI JUNWI - JZCNI - JZCSI KBYEI KBYWI KD2EI @@ -4086,6 +4096,8 @@ KRYSI KSCNI KSCSI + KW2NI + KW2SI KWMEI KWMWI LBDEI @@ -4102,6 +4114,8 @@ LLENI LLESI LMQWI + LO2EI + LO2WI LR2EI LR2WI LRZNI @@ -4119,8 +4133,6 @@ MBAWI MBHNI MBHSI - MC2NI - MC2SI MCONI MCOSI MD2EI @@ -4148,8 +4160,6 @@ MMZEI MMZWI MNDWI - MNEEI - MNEWI MNGEI MNGNI MNGSI @@ -4162,6 +4172,8 @@ MRYSI MRZNI MRZSI + MT2EI + MT2WI MTGNI MTGSI MTIEI @@ -4175,8 +4187,8 @@ NGUWI NHLEI NHLWI - NOVEI - NOVWI + NO2EI + NO2WI NPENI NPESI NRCEI @@ -4235,16 +4247,17 @@ PPDNI PPDSI PPPEI - PPPWI PQQNI PQQSI + PR2WI PU2NI PWRSI PZANI QB2NI QB2SI - QLPEI - QLPWI + QL2EI + QL2WI + RD2WI RENEI RENWI RMDEI @@ -4275,8 +4288,6 @@ SQCSI SR2NI SR2SI - SRDEI - SRDWI SRIEI SSYNI STHEI @@ -4310,10 +4321,9 @@ TN2WI TOCEI TOCWI + TP2EI TR2NI TR2SI - TRAEI - TRAWI TSTWI TT2NI TT2SI @@ -4334,8 +4344,8 @@ WBLWI WBRNI WBRSI - WCANI - WCASI + WC2EI + WC2WI WCKEI WDHNI WDHSI @@ -4346,8 +4356,6 @@ WGTNI WGZEI WGZWI - WHCEI - WHCWI WHZNI WHZSI WISWI @@ -4362,6 +4370,8 @@ WLUSI WO2NI WOLSI + WQ2NI + WQ2SI WR2WI WSLWI WTNNI @@ -4414,9 +4424,9 @@ COMND PFTNC PFTNA - TRAEG - TRAEH - TRAEJ + TP2EG + TP2EH + TP2EJ MINUR ESDIG BLZSC @@ -4453,11 +4463,11 @@ GLENN BETSO OSOKO + CG2NC KEGAN - OOLNC + CG2SA + CG2SC FIKUL - OOLSA - OOLSC ATOSU GUNRO PULAX @@ -4610,9 +4620,9 @@ CBRSD CBRSG MENZI - SCNWA - SCNWB - SCNWC + SC2WA + SC2WB + SC2WC ANKUB TONUX URDEN @@ -4631,6 +4641,12 @@ WM2ED WM2EE WM2EG + AE2EA + AE2EB + AE2EC + AE2WD + AE2WE + AE2WG AG2ND AG2NE AG2NG @@ -4956,12 +4972,6 @@ DK2SA DK2SB DK2SC - DLOEA - DLOEB - DLOEC - DLOWD - DLOWE - DLOWG DLQEA DLQEB DLQEC @@ -5150,18 +5160,18 @@ GTNWD GTNWE GTNWG + GW2NA + GW2NC + GW2ND + GW2SE + GW2SG + GW2SJ GZBND GZBNE GZBNG GZBSA GZBSB GZBSC - GZLNA - GZLNC - GZLND - GZLSE - GZLSG - GZLSJ HBAEA HBAEB HBAEC @@ -5192,6 +5202,11 @@ HLTSE HLTSG HLTSJ + HO2EA + HO2EB + HO2EC + HO2WE + HO2WG HOZEA HOZEB HOZEC @@ -5215,8 +5230,6 @@ IA2EG IA2EJ IA2WB - IA2WC - IA2WD IB3EA IB3EB IB3EC @@ -5231,6 +5244,12 @@ IGMEA IGMEB IGMEC + IH2NA + IH2NC + IH2ND + IH2SE + IH2SG + IH2SJ IMBND IMBNE IMBNG @@ -5240,12 +5259,6 @@ IVLSA IVLSB IVLSC - IVZNA - IVZNC - IVZND - IVZSE - IVZSG - IVZSJ IW2NA IW2NC IW2ND @@ -5263,15 +5276,15 @@ JLCWA JLCWB JLCWC + JN2ND + JN2NE + JN2NG + JN2SA + JN2SB + JN2SC JUNWA JUNWB JUNWC - JZCND - JZCNE - JZCNG - JZCSA - JZCSB - JZCSC KBYED KBYEE KBYEG @@ -5348,6 +5361,12 @@ KSCSE KSCSG KSCSJ + KW2ND + KW2NE + KW2NG + KW2SA + KW2SB + KW2SC KWMED KWMEE KWMEG @@ -5396,6 +5415,12 @@ LMQWA LMQWB LMQWC + LO2EA + LO2EB + LO2EC + LO2WD + LO2WE + LO2WG LR2EA LR2EB LR2EC @@ -5446,12 +5471,6 @@ MBHSA MBHSB MBHSC - MC2NA - MC2NC - MC2ND - MC2SE - MC2SG - MC2SJ MCONA MCONC MCOND @@ -5531,12 +5550,6 @@ MMZWG MNDWA MNDWB - MNEEA - MNEEB - MNEEC - MNEWD - MNEWE - MNEWG MNGEA MNGEB MNGEC @@ -5573,6 +5586,12 @@ MRZSE MRZSG MRZSJ + MT2EA + MT2EB + MT2EC + MT2WD + MT2WE + MT2WG MTGND MTGNE MTGNG @@ -5612,12 +5631,12 @@ NHLWD NHLWE NHLWG - NOVEA - NOVEB - NOVEC - NOVWD - NOVWE - NOVWG + NO2EA + NO2EB + NO2EC + NO2WD + NO2WE + NO2WG NPEND NPENE NPENG @@ -5774,15 +5793,15 @@ PPPEA PPPEB PPPEC - PPPWD - PPPWE - PPPWG PQQND PQQNE PQQNG PQQSA PQQSB PQQSC + PR2WD + PR2WE + PR2WG PU2NA PU2NC PU2ND @@ -5798,12 +5817,14 @@ QB2SA QB2SB QB2SC - QLPEA - QLPEB - QLPEC - QLPWD - QLPWE - QLPWG + QL2EA + QL2EB + QL2EC + QL2WD + QL2WE + QL2WG + RD2WB + RD2WC RENED RENEE RENEG @@ -5890,12 +5911,6 @@ SR2SE SR2SG SR2SJ - SRDED - SRDEE - SRDEG - SRDWA - SRDWB - SRDWC SRIEA SRIEB STHEA @@ -5994,9 +6009,6 @@ TR2SA TR2SB TR2SC - TRAWB - TRAWC - TRAWD TSTWD TSTWE TSTWG @@ -6046,12 +6058,12 @@ WBRSA WBRSB WBRSC - WCANA - WCANC - WCAND - WCASE - WCASG - WCASJ + WC2EA + WC2EB + WC2EC + WC2WD + WC2WE + WC2WG WCKEA WCKEB WCKEC @@ -6075,12 +6087,6 @@ WGZWA WGZWB WGZWC - WHCEA - WHCEB - WHCEC - WHCWD - WHCWE - WHCWG WHZND WHZNE WHZNG @@ -6120,6 +6126,12 @@ WOLSE WOLSG WOLSJ + WQ2NA + WQ2NC + WQ2ND + WQ2SE + WQ2SG + WQ2SJ WSLWA WSLWB WSLWC @@ -6229,6 +6241,16 @@ ZW2WE ZW2WG + AE2EA/AE2EI + AE2EB/AE2EI + AE2EC/AE2EI + AE2EI/AE2EF + -243737.060+1183742.710/AE2EF + AE2WD/AE2WI + AE2WE/AE2WI + AE2WG/AE2WI + AE2WI/AE2WF + -243720.900+1183641.200/AE2WF AG2ND/AG2NI AG2NE/AG2NI AG2NG/AG2NI @@ -6335,10 +6357,11 @@ BG2EC/BG2EI BG2ED/BG2EI BG2EI/BG2EF - BG2EM/BG2EF - EGIDA/BG2WB/BG2WI + -223221.760+1171648.510/BG2EF + EGIDA/BG2WI + BG2WB/BG2WI BG2WI/BG2WF - BG2WM/BG2WF + -223228.420+1171531.780/BG2WF BGOND/BGONI BGONE/BGONI BGONG/BGONI @@ -6703,12 +6726,12 @@ CR2EK/CR2EI CR2EL/CR2EI CR2EI/CR2EF - CR2EM/CR2EF + -222113.920+1193916.830/CR2EF CR2WP/CR2WI CR2WQ/CR2WI CR2WR/CR2WI CR2WI/CR2WF - CR2WM/CR2WF + -222116.990+1193749.560/CR2WF CRGNA/CRGNI CRGNC/CRGNI CRGND/CRGNI @@ -6791,16 +6814,6 @@ DK2SC/DK2SI DK2SI/DK2SF -273638.260+1222008.340/DK2SF - DLOEA/DLOEI - DLOEB/DLOEI - DLOEC/DLOEI - DLOEI/DLOEF - -275247.930+1211643.780/DLOEF - DLOWD/DLOWI - DLOWE/DLOWI - DLOWG/DLOWI - DLOWI/DLOWF - -275205.320+1211550.070/DLOWF DLQEA/DLQEI DLQEB/DLQEI DLQEC/DLQEI @@ -7119,6 +7132,16 @@ GTNWG/GTNWI GTNWI/GTNWF GTNWM/GTNWF + GW2NA/GW2NI + GW2NC/GW2NI + GW2ND/GW2NI + GW2NI/GW2NF + -284715.110+1144235.210/GW2NF + GW2SE/GW2SI + GW2SG/GW2SI + GW2SJ/GW2SI + GW2SI/GW2SF + -284828.730+1144207.440/GW2SF GZBND/GZBNI GZBNE/GZBNI GZBNG/GZBNI @@ -7129,16 +7152,6 @@ GZBSC/GZBSI GZBSI/GZBSF -344847.610+1494318.140/GZBSF - GZLNA/GZLNI - GZLNC/GZLNI - GZLND/GZLNI - GZLNI/GZLNF - -284715.110+1144235.210/GZLNF - GZLSE/GZLSI - GZLSG/GZLSI - GZLSJ/GZLSI - GZLSI/GZLSF - -284828.730+1144207.440/GZLSF HBAEA/HBAEI HBAEB/HBAEI HBAEC/HBAEI @@ -7189,6 +7202,15 @@ HLTSJ/HLTSI HLTSI/HLTSF -373914.420+1420342.810/HLTSF + HO2EA/HO2EI + HO2EB/HO2EI + HO2EC/HO2EI + HO2EI/HO2EF + -320631.500+1194607.000/HO2EF + HO2WE/HO2WI + HO2WG/HO2WI + HO2WI/HO2WF + -320636.250+1194506.260/HO2WF HOZEA/HOZEI HOZEB/HOZEI HOZEC/HOZEI @@ -7226,12 +7248,10 @@ IA2EG/IA2EI IA2EJ/IA2EI IA2EI/IA2EF - IA2EM/IA2EF + -223453.830+1200252.020/IA2EF IA2WB/IA2WI - IA2WC/IA2WI - IA2WD/IA2WI IA2WI/IA2WF - IA2WM/IA2WF + -223453.830+1200124.570/IA2WF IB3EA/IB3EI IB3EB/IB3EI IB3EC/IB3EI @@ -7256,6 +7276,16 @@ IGMEC/IGMEI IGMEI/IGMEF IGMEM/IGMEF + IH2NA/IH2NI + IH2NC/IH2NI + IH2ND/IH2NI + IH2NI/IH2NF + -325252.600+1441837.950/IH2NF + IH2SE/IH2SI + IH2SG/IH2SI + IH2SJ/IH2SI + IH2SI/IH2SF + -325332.730+1441843.530/IH2SF IMBND/IMBNI IMBNE/IMBNI IMBNG/IMBNI @@ -7271,16 +7301,6 @@ IVLSC/IVLSI IVLSI/IVLSF IVLSM/IVLSF - IVZNA/IVZNI - IVZNC/IVZNI - IVZND/IVZNI - IVZNI/IVZNF - IVZNM/IVZNF - IVZSE/IVZSI - IVZSG/IVZSI - IVZSJ/IVZSI - IVZSI/IVZSF - IVZSM/IVZSF IW2NA/IW2NI IW2NC/IW2NI IW2ND/IW2NI @@ -7310,21 +7330,21 @@ JLCWC/JLCWI JLCWI/JLCWF JLCWM/JLCWF + JN2ND/JN2NI + JN2NE/JN2NI + JN2NG/JN2NI + JN2NI/JN2NF + -305341.330+1321039.100/JN2NF + JN2SA/JN2SI + JN2SB/JN2SI + JN2SC/JN2SI + JN2SI/JN2SF + -305425.910+1321122.900/JN2SF JUNWA/JUNWI JUNWB/JUNWI JUNWC/JUNWI JUNWI/JUNWF JUNWM/JUNWF - JZCND/JZCNI - JZCNE/JZCNI - JZCNG/JZCNI - JZCNI/JZCNF - JZCNM/JZCNF - JZCSA/JZCSI - JZCSB/JZCSI - JZCSC/JZCSI - JZCSI/JZCSF - JZCSM/JZCSF KBYED/KBYEI KBYEE/KBYEI KBYEG/KBYEI @@ -7458,6 +7478,16 @@ KSCSJ/KSCSI KSCSI/KSCSF -354325.090+1373118.260/KSCSF + KW2ND/KW2NI + KW2NE/KW2NI + KW2NG/KW2NI + KW2NI/KW2NF + -234620.750+1200814.950/KW2NF + KW2SA/KW2SI + KW2SB/KW2SI + KW2SC/KW2SI + KW2SI/KW2SF + -234725.030+1200804.740/KW2SF KWMED/KWMEI KWMEE/KWMEI KWMEG/KWMEI @@ -7538,6 +7568,16 @@ LMQWC/LMQWI LMQWI/LMQWF LMQWM/LMQWF + LO2EA/LO2EI + LO2EB/LO2EI + LO2EC/LO2EI + LO2EI/LO2EF + -275247.930+1211643.780/LO2EF + LO2WD/LO2WI + LO2WE/LO2WI + LO2WG/LO2WI + LO2WI/LO2WF + -275205.320+1211550.070/LO2WF LR2EA/LR2EI LR2EB/LR2EI LR2EC/LR2EI @@ -7622,16 +7662,6 @@ MBHSC/MBHSI MBHSI/MBHSF -253114.240+1524252.180/MBHSF - MC2NA/MC2NI - MC2NC/MC2NI - MC2ND/MC2NI - MC2NI/MC2NF - MC2NM/MC2NF - MC2SE/MC2SI - MC2SG/MC2SI - MC2SJ/MC2SI - MC2SI/MC2SF - MC2SM/MC2SF MCONA/MCONI MCONC/MCONI MCOND/MCONI @@ -7765,16 +7795,6 @@ MNDWB/MNDWI MNDWI/MNDWF MNDWM/MNDWF - MNEEA/MNEEI - MNEEB/MNEEI - MNEEC/MNEEI - MNEEI/MNEEF - -271725.140+1203344.590/MNEEF - MNEWD/MNEWI - MNEWE/MNEWI - MNEWG/MNEWI - MNEWI/MNEWF - -271701.310+1203244.790/MNEWF MNGEA/MNGEI MNGEB/MNGEI MNGEC/MNGEI @@ -7835,6 +7855,16 @@ MRZSJ/MRZSI MRZSI/MRZSF -293022.620+1495034.950/MRZSF + MT2EA/MT2EI + MT2EB/MT2EI + MT2EC/MT2EI + MT2EI/MT2EF + -271725.140+1203344.590/MT2EF + MT2WD/MT2WI + MT2WE/MT2WI + MT2WG/MT2WI + MT2WI/MT2WF + -271701.310+1203244.790/MT2WF MTGND/MTGNI MTGNE/MTGNI MTGNG/MTGNI @@ -7900,16 +7930,16 @@ NHLWG/NHLWI NHLWI/NHLWF NHLWM/NHLWF - NOVEA/NOVEI - NOVEB/NOVEI - NOVEC/NOVEI - NOVEI/NOVEF - NOVEM/NOVEF - NOVWD/NOVWI - NOVWE/NOVWI - NOVWG/NOVWI - NOVWI/NOVWF - NOVWM/NOVWF + NO2EA/NO2EI + NO2EB/NO2EI + NO2EC/NO2EI + NO2EI/NO2EF + -315029.310+1231205.360/NO2EF + NO2WD/NO2WI + NO2WE/NO2WI + NO2WG/NO2WI + NO2WI/NO2WF + -315100.900+1231058.900/NO2WF NPEND/NPENI NPENE/NPENI NPENG/NPENI @@ -8188,11 +8218,6 @@ PPPEC/PPPEI PPPEI/PPPEF -202953.710+1483345.030/PPPEF - PPPWD/PPPWI - PPPWE/PPPWI - PPPWG/PPPWI - PPPWI/PPPWF - PPPWM/PPPWF PQQND/PQQNI PQQNE/PQQNI PQQNG/PQQNI @@ -8203,6 +8228,11 @@ PQQSC/PQQSI PQQSI/PQQSF -312634.640+1525125.890/PQQSF + PR2WD/PR2WI + PR2WE/PR2WI + PR2WG/PR2WI + PR2WI/PR2WF + PR2WM/PR2WF PU2NA/PU2NI PU2NC/PU2NI PU2ND/PU2NI @@ -8228,16 +8258,20 @@ QB2SC/QB2SI QB2SI/QB2SF -334150.340+1152346.950/QB2SF - QLPEA/QLPEI - QLPEB/QLPEI - QLPEC/QLPEI - QLPEI/QLPEF - -263635.460+1441554.020/QLPEF - QLPWD/QLPWI - QLPWE/QLPWI - QLPWG/QLPWI - QLPWI/QLPWF - -263631.920+1441500.010/QLPWF + QL2EA/QL2EI + QL2EB/QL2EI + QL2EC/QL2EI + QL2EI/QL2EF + -263635.460+1441554.020/QL2EF + QL2WD/QL2WI + QL2WE/QL2WI + QL2WG/QL2WI + QL2WI/QL2WF + -263631.920+1441500.010/QL2WF + RD2WB/RD2WI + RD2WC/RD2WI + RD2WI/RD2WF + -290612.120+1222651.240/RD2WF RENED/RENEI RENEE/RENEI RENEG/RENEI @@ -8384,16 +8418,6 @@ SR2SJ/SR2SI SR2SI/SR2SF -420940.140+1451718.520/SR2SF - SRDED/SRDEI - SRDEE/SRDEI - SRDEG/SRDEI - SRDEI/SRDEF - -290540.730+1222753.880/SRDEF - SRDWA/SRDWI - SRDWB/SRDWI - SRDWC/SRDWI - SRDWI/SRDWF - -290612.120+1222651.240/SRDWF SRIEA/SRIEI SRIEB/SRIEI SRIEI/SRIEF @@ -8552,6 +8576,11 @@ TOCWG/TOCWI TOCWI/TOCWF TOCWM/TOCWF + TP2EG/TP2EI + TP2EH/TP2EI + TP2EJ/TP2EI + TP2EI/TP2EF + -291109.000+1243340.200/TP2EF TR2ND/TR2NI TR2NE/TR2NI TR2NG/TR2NI @@ -8562,16 +8591,6 @@ TR2SC/TR2SI TR2SI/TR2SF -315334.250+1523035.720/TR2SF - TRAEG/TRAEI - TRAEH/TRAEI - TRAEJ/TRAEI - TRAEI/TRAEF - TRAEM/TRAEF - TRAWB/TRAWI - TRAWC/TRAWI - TRAWD/TRAWI - TRAWI/TRAWF - TRAWM/TRAWF TSTWD/TSTWI TSTWE/TSTWI TSTWG/TSTWI @@ -8661,16 +8680,16 @@ WBRSC/WBRSI WBRSI/WBRSF WBRSM/WBRSF - WCANA/WCANI - WCANC/WCANI - WCAND/WCANI - WCANI/WCANF - WCANM/WCANF - WCASE/WCASI - WCASG/WCASI - WCASJ/WCASI - WCASI/WCASF - WCASM/WCASF + WC2EA/WC2EI + WC2EB/WC2EI + WC2EC/WC2EI + WC2EI/WC2EF + -305117.580+1430435.590/WC2EF + WC2WD/WC2WI + WC2WE/WC2WI + WC2WG/WC2WI + WC2WI/WC2WF + -305057.000+1430402.710/WC2WF WCKEA/WCKEI WCKEB/WCKEI WCKEC/WCKEI @@ -8720,16 +8739,6 @@ WGZWC/WGZWI WGZWI/WGZWF -210207.940+1183758.480/WGZWF - WHCEA/WHCEI - WHCEB/WHCEI - WHCEC/WHCEI - WHCEI/WHCEF - WHCEM/WHCEF - WHCWD/WHCWI - WHCWE/WHCWI - WHCWG/WHCWI - WHCWI/WHCWF - WHCWM/WHCWF WHZND/WHZNI WHZNE/WHZNI WHZNG/WHZNI @@ -8797,6 +8806,16 @@ WOLSJ/WOLSI WOLSI/WOLSF WOLSM/WOLSF + WQ2NA/WQ2NI + WQ2NC/WQ2NI + WQ2ND/WQ2NI + WQ2NI/WQ2NF + -313108.480+1432251.580/WQ2NF + WQ2SE/WQ2SI + WQ2SG/WQ2SI + WQ2SJ/WQ2SI + WQ2SI/WQ2SF + -313132.890+1432230.720/WQ2SF WR2WC/WR2WI WR2WB/WR2WI WR2WA/WR2WI @@ -9020,13 +9039,13 @@ BETSO/PIKON OKVIS/SAKBO/BN19R OSOKO/OKVIS - OOLNI/OOLNF/CG14T - KEGAN/OOLNI - OOLNC/OOLNI - OOLSI/OOLSF/CG32T - FIKUL/OOLSI - OOLSA/OOLSI - OOLSC/OOLSI + CG2NI/CG2NF/CG14T + CG2NC/CG2NI + KEGAN/CG2NI + CG2SI/CG2SF/CG32T + CG2SA/CG2SI + CG2SC/CG2SI + FIKUL/CG2SI CNSNI/CNSNF/CNSNZ ATOSU/CNSNI GUNRO/CNSNI @@ -9250,22 +9269,22 @@ CBRSD/CBRSI CBRSG/CBRSI MENZI/CBRSI - SCNWI/SCNWF/SCNWM - SCNWA/SCNWI - SCNWB/SCNWI - SCNWC/SCNWI - SCNWI/SCNWF/SCNWM - SCNWA/SCNWI - SCNWB/SCNWI - SCNWC/SCNWI - SCNWI/SCNWF/SCNWM - SCNWA/SCNWI - SCNWB/SCNWI - SCNWC/SCNWI - SCNWI/SCNWF/SCNWM - SCNWA/SCNWI - SCNWB/SCNWI - SCNWC/SCNWI + SC2WI/SC2WF/SC2WM + SC2WA/SC2WI + SC2WB/SC2WI + SC2WC/SC2WI + SC2WI/SC2WF/SC2WM + SC2WA/SC2WI + SC2WB/SC2WI + SC2WC/SC2WI + SC2WI/SC2WF/SC2WM + SC2WA/SC2WI + SC2WB/SC2WI + SC2WC/SC2WI + SC2WI/SC2WF/SC2WM + SC2WA/SC2WI + SC2WB/SC2WI + SC2WC/SC2WI ANKUB/SSYWF/SSYWM SSYNI/SSYNF/SSYNM TONUX/SSYNI diff --git a/Positions.xml b/Positions.xml index 33cc554b..af552dd1 100644 --- a/Positions.xml +++ b/Positions.xml @@ -126,7 +126,7 @@ - + -25.725+150.343 @@ -163,7 +163,8 @@ - + + -16.000+126.986 @@ -325,8 +326,8 @@ - - + + -18.565+147.837 @@ -1437,7 +1438,7 @@ - + -27.3942+153.1218 @@ -1574,8 +1575,8 @@ - - + + @@ -1664,7 +1665,8 @@ - + + diff --git a/Sectors.xml b/Sectors.xml index 9b2cd7e7..7d854709 100644 --- a/Sectors.xml +++ b/Sectors.xml @@ -351,7 +351,13 @@ CBA - + + MKA + + + RKA + + DNA @@ -367,9 +373,6 @@ LTA - - MKA - MLA MDN,MDS @@ -400,9 +403,6 @@ PHA - - RKA - SYA SAS,SFW,SFE,SDS,SDN diff --git a/Volumes.xml b/Volumes.xml index c82ad630..c4370569 100644 --- a/Volumes.xml +++ b/Volumes.xml @@ -894,37 +894,6 @@ -225859.000+1455231.000/ -220117.000+1454751.000 - - -345224.000+1491138.000/ - -345200.000+1493214.000/ - -345351.842+1493515.690/ - -345732.743+1493947.458/ - -350148.854+1494328.706/ - -350632.474+1494612.642/ - -351135.053+1494754.154/ - -351647.443+1494829.975/ - -352006.000+1494812.000/ - -353327.000+1492531.000/ - -354040.000+1491142.000/ - -345224.000+1491138.000 - - - -354040.000+1491142.000/ - -354549.000+1490148.000/ - -354503.790+1485906.427/ - -354250.444+1485316.554/ - -353949.566+1484800.902/ - -353606.735+1484329.134/ - -353148.811+1483949.504/ - -352703.712+1483708.607/ - -352200.168+1483531.190/ - -351647.443+1483500.025/ - -351135.053+1483535.846/ - -350920.000+1483619.000/ - -345232.000+1490600.000/ - -345224.000+1491138.000/ - -354040.000+1491142.000 - -350920.000+1483619.000/ -345232.000+1490600.000/ @@ -3276,45 +3245,6 @@ -314710.259+1155105.774/ -314722.000+1155043.000 - - -312042.000+1155734.000/ - -312114.605+1160453.212/ - -312251.448+1161159.329/ - -312529.640+1161839.623/ - -312904.457+1162442.097/ - -313329.473+1162955.829/ - -313836.743+1163411.291/ - -314417.035+1163720.638/ - -315020.095+1163917.957/ - -315634.948+1163959.463/ - -320250.226+1163923.641/ - -320854.511+1163731.321/ - -321436.679+1163425.684/ - -321946.251+1163012.198/ - -322413.715+1162458.467/ - -322750.833+1161854.019/ - -323030.902+1161210.014/ - -323208.970+1160458.898/ - -323242.000+1155734.000/ - -323208.970+1155009.102/ - -323030.902+1154257.986/ - -322750.833+1153613.981/ - -322413.715+1153009.533/ - -321946.251+1152455.802/ - -321436.679+1152042.316/ - -320854.511+1151736.679/ - -320250.226+1151544.359/ - -315634.948+1151508.537/ - -315020.095+1151550.043/ - -314417.035+1151747.362/ - -313836.743+1152056.709/ - -313329.473+1152512.171/ - -312904.457+1153025.903/ - -312529.640+1153628.377/ - -312251.448+1154308.671/ - -312114.605+1155014.788/ - -312042.000+1155734.000 - -322416.000+1162456.000/ -322413.715+1162458.467/ From 1c18ae0c06662b26013bbb300b2299fad7fb7ab6 Mon Sep 17 00:00:00 2001 From: zkgell <108783206+zkgell@users.noreply.github.com> Date: Mon, 21 Nov 2022 16:10:54 +0800 Subject: [PATCH 14/22] CB + AD TCU Splits --- Maps/Adelaide/AD_TCU.xml | 3 +++ Maps/Canberra/CB_TCU.xml | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/Maps/Adelaide/AD_TCU.xml b/Maps/Adelaide/AD_TCU.xml index dbfc8366..c7e33c5c 100644 --- a/Maps/Adelaide/AD_TCU.xml +++ b/Maps/Adelaide/AD_TCU.xml @@ -156,6 +156,9 @@ MTG VOR/ NOGIP + + + -34.565000+139.086945/-35.163056+138.215000/-35.182148+138.237082/-35.216200+138.285573/-35.224445+138.301389/-35.445833+138.121111 diff --git a/Maps/Canberra/CB_TCU.xml b/Maps/Canberra/CB_TCU.xml index fc636dea..43008c4a 100644 --- a/Maps/Canberra/CB_TCU.xml +++ b/Maps/Canberra/CB_TCU.xml @@ -89,6 +89,11 @@ LTV NDB/ DADER + + + -345224.0811+1491137.7966/-354040.0223+1491141.6419 + + From 7ffa1e7bde194ffb589161158f9bee91dc33d235 Mon Sep 17 00:00:00 2001 From: Pip <92968130+codepip55@users.noreply.github.com> Date: Mon, 21 Nov 2022 16:15:29 +0100 Subject: [PATCH 15/22] fix DAE frequency; tidy up sectors.xml; add missing fixes --- Airspace.xml | 427 ++++++++++---------- AlertParameters.xml | 2 +- Maps/ALL_AIRPORTS.xml | 4 + Maps/APP_RNP_ALL.xml | 889 +++++++++++++++++++++--------------------- Positions.xml | 18 +- Sectors.xml | 12 +- Volumes.xml | 70 ---- 7 files changed, 698 insertions(+), 724 deletions(-) diff --git a/Airspace.xml b/Airspace.xml index 3dc22403..fd5907bb 100644 --- a/Airspace.xml +++ b/Airspace.xml @@ -6189,6 +6189,18 @@ BOFOR -282037.600+1535209.600 -301922.000+1515442.700 -190102.800+1464748.500 + -243610.900+1185057.000 + -244137.200+1185300.400 + -244514.700+1184806.900 + -243851.700+1184227.100 + -243647.200+1183432.900 + -244014.500+1184743.700 + -243846.400+1182328.800 + -243319.700+1182126.700 + -243606.700+1183159.100 + -242943.000+1182620.500 + -243810.800+1183951.100 + -243443.300+1182642.800 -162409.000+1282728.200 -162248.200+1283316.300 -163208.800+1282927.800 @@ -6343,6 +6355,7 @@ BOFOR -275901.100+1182712.500 -335911.900+1505835.400 -150006.000+1400000.000 + -360704.000+1480633.000 -121932.700+1313447.600 -125044.900+1303759.500 -382609.200+1470942.100 @@ -6646,9 +6659,12 @@ BOFOR -123508.100+1305556.800 -284458.000+1464126.300 -271951.700+1530618.000 + -272902.100+1531613.200 -270819.600+1531608.200 -273833.800+1530429.300 + -270902.100+1530422.700 -272352.000+1530922.800 + -271307.000+1530107.300 -272329.000+1530607.400 -272118.800+1530721.800 -241831.300+1453419.000 @@ -6726,6 +6742,7 @@ BOFOR -163755.300+1455222.400 -274654.000+1531112.000 -345718.200+1440923.800 + -254440.100+1512929.500 -273058.900+1525502.600 -270938.200+1531523.200 -321050.000+1165400.200 @@ -6742,12 +6759,10 @@ BOFOR -223552.300+1173052.900 -223147.200+1172327.000 -223120.400+1172833.800 - -223221.800+1171648.500 -223237.500+1171348.300 -222858.200+1170118.100 -223257.000+1171001.800 -223330.300+1170336.800 - -223228.500+1171531.800 -223156.000+1172145.600 -200135.100+1274721.600 -195614.300+1274937.000 @@ -7366,15 +7381,23 @@ BOFOR -280747.500+1533057.400 -280535.600+1533401.600 -281648.800+1533446.300 + -275618.400+1532813.100 + -280620.000+1532805.900 + -281200.700+1533142.600 + -280119.200+1532809.500 + -281815.700+1534148.400 + -282339.400+1533147.800 + -281443.300+1533326.100 + -275847.400+1532906.800 + -281905.200+1533613.200 + -280709.100+1532837.200 -280712.400+1532839.200 -282109.400+1533732.100 -281540.200+1533402.200 -281524.600+1533649.400 -281337.700+1533317.500 -281229.500+1533200.900 - -280709.100+1532837.200 -280342.400+1532800.200 - -275847.400+1532906.800 -281714.400+1533447.800 -281759.000+1533717.100 -281253.200+1533206.800 @@ -7605,11 +7628,9 @@ BOFOR -221601.200+1195310.100 -222036.400+1195654.700 -222526.700+1195333.400 - -222113.900+1193916.800 -221639.000+1193741.100 -222128.300+1193225.200 -222142.500+1192539.000 - -222117.000+1193749.600 -222629.000+1192359.700 -222153.700+1192015.500 -221703.600+1192337.000 @@ -7831,18 +7852,6 @@ BOFOR -274057.000+1222006.200 -273337.700+1222009.900 -274557.800+1222003.700 - -275705.600+1213007.700 - -280248.300+1212922.600 - -280407.800+1212304.100 - -275608.200+1212056.500 - -275047.700+1211412.300 - -275928.300+1212509.400 - -274746.300+1210227.400 - -274203.700+1210313.700 - -274844.900+1211137.700 - -274045.100+1210931.200 - -275405.500+1211821.600 - -274524.400+1210725.600 -352414.200+1450815.100 -352712.000+1451415.300 -353250.700+1451254.200 @@ -7920,6 +7929,7 @@ BOFOR -371446.000+1442927.000 -184154.000+1445242.000 -404959.400+1450454.000 + -364924.000+1474723.000 -263657.000+1532313.700 -341132.400+1404033.400 -284022.800+1630000.000 @@ -7933,16 +7943,18 @@ BOFOR -410825.700+1460835.900 -410815.000+1462947.100 -411234.900+1461217.400 - -244704.340+1500026.200 + -244704.300+1500026.200 -244346.700+1500536.200 - -245348.600+1500535.510 - -244704.920+1501045.740 - -244847.650+1500535.860 - -251119.990+1501045.100 - -251437.800+1500534.090 - -251119.400+1500023.530 - -250435.930+1500534.780 - -250936.860+1500534.430 + -245348.600+1500535.500 + -244704.900+1501045.700 + -250251.000+1500534.900 + -244847.700+1500535.900 + -251120.000+1501045.100 + -251437.800+1500534.100 + -251119.400+1500023.500 + -250435.900+1500534.800 + -245533.400+1500535.400 + -250936.900+1500534.400 -123951.600+1305201.200 -270954.500+1530503.700 -172028.300+1235244.800 @@ -8136,6 +8148,7 @@ BOFOR -324519.600+1494845.600 -373839.300+1445727.700 -270629.500+1531128.600 + -220032.000+1495704.300 -302038.800+1501832.800 -112812.000+1002942.000 -205617.100+1151835.200 @@ -8659,6 +8672,18 @@ BOFOR -230200.100+1184124.800 -100930.000+1522142.000 -233808.600+1593048.100 + -283422.200+1144148.900 + -283243.400+1144803.300 + -283720.100+1145156.700 + -284214.300+1144428.600 + -284950.900+1144136.400 + -283728.900+1144616.100 + -290109.200+1144258.600 + -285317.000+1144018.500 + -290247.700+1143642.400 + -284540.300+1144311.000 + -285802.400+1143830.500 + -285810.500+1143248.600 -343656.400+1495033.900 -343811.100+1495721.000 -344456.900+1494824.300 @@ -8671,18 +8696,6 @@ BOFOR -345210.100+1493848.800 -344646.100+1494559.600 -345532.500+1493419.100 - -283422.200+1144148.900 - -283243.400+1144803.300 - -283720.100+1145156.700 - -284214.300+1144428.600 - -284950.900+1144136.400 - -283728.900+1144616.100 - -290109.200+1144258.600 - -285317.000+1144018.500 - -290247.700+1143642.400 - -284540.300+1144311.000 - -285802.400+1143830.500 - -285810.500+1143248.600 -345445.000+1382012.500 -251926.700+1525259.000 -314759.900+1160021.000 @@ -8836,6 +8849,17 @@ BOFOR -201720.900+1485348.700 -201331.700+1485656.000 -201624.600+1485830.400 + -320044.800+1195922.300 + -320507.500+1200344.700 + -321007.300+1200024.500 + -320603.600+1195201.500 + -320648.000+1194236.000 + -320535.700+1195753.100 + -320757.400+1192731.600 + -320703.500+1193915.200 + -320258.400+1193053.500 + -320619.700+1194837.300 + -320730.600+1193323.400 -203948.359-1761932.948 -120000.000+1530932.700 -334818.500+1394209.200 @@ -8928,13 +8952,9 @@ BOFOR -223453.800+1202018.000 -223453.700+1201453.800 -223936.600+1201644.700 - -223453.800+1200252.100 -223936.500+1194732.700 - -223453.600+1194359.500 - -223010.700+1194732.800 -223453.700+1195550.500 -223453.600+1194923.600 - -223453.800+1200124.600 -211828.900+1190658.000 -212410.200+1190754.200 -212656.400+1190230.800 @@ -9023,6 +9043,18 @@ BOFOR -374013.700+1451302.300 -113545.600+1032032.900 -360516.600+1465056.600 + -324146.400+1441129.300 + -323757.300+1441633.700 + -324040.700+1442232.500 + -324754.200+1441756.500 + -325551.700+1441902.900 + -324255.700+1441715.100 + -330438.600+1442554.000 + -325831.200+1441925.100 + -330828.000+1442048.300 + -325033.700+1441818.600 + -330329.600+1442006.600 + -330544.500+1441447.700 -375744.100+1442849.300 -200000.000+1032909.600 -283259.500+1515747.800 @@ -9107,20 +9139,6 @@ BOFOR -360856.600+1465947.400 -122756.900+1304620.500 -203226.600+1490434.200 - -324146.400+1441129.300 - -323757.300+1441633.700 - -324040.700+1442232.500 - -324754.200+1441756.500 - -325551.700+1441902.900 - -324255.700+1441715.100 - -325252.600+1441838.000 - -330438.600+1442554.000 - -325831.200+1441925.100 - -330828.000+1442048.300 - -325033.700+1441818.600 - -330329.600+1442006.600 - -330544.500+1441447.700 - -325332.700+1441843.500 -210444.700+1491816.200 -210342.500+1492027.800 -210425.800+1492247.700 @@ -9188,6 +9206,18 @@ BOFOR -204047.500+1414530.100 -203656.400+1413215.400 -203954.300+1414226.700 + -304746.300+1315742.500 + -304213.000+1315924.600 + -304952.000+1320654.000 + -304141.700+1320601.900 + -305558.900+1321254.300 + -304602.500+1320309.100 + -310019.700+1322421.300 + -310553.400+1322240.200 + -310625.400+1321601.300 + -305815.200+1321508.400 + -305208.300+1320907.800 + -310204.300+1321854.200 -181019.100+1222414.300 -312500.000+1515148.000 -230000.000+1100000.000 @@ -9212,20 +9242,6 @@ BOFOR -262636.700+1202241.300 -262524.600+1203344.900 -375602.000+1443422.100 - -304746.300+1315742.500 - -304213.000+1315924.600 - -304952.000+1320654.000 - -304141.700+1320601.900 - -305558.900+1321254.300 - -304602.500+1320309.100 - -305341.300+1321039.100 - -310019.700+1322421.300 - -310553.400+1322240.200 - -310625.400+1321601.300 - -305815.200+1321508.400 - -305208.300+1320907.800 - -310204.300+1321854.200 - -305425.900+1321122.900 -204324.700+1164024.200 -204210.600+1165212.800 -204152.600+1165312.800 @@ -9556,6 +9572,18 @@ BOFOR -355046.300+1372110.100 -385418.000+1502456.000 -192025.900+1464316.300 + -233553.200+1200424.500 + -233138.900+1201034.800 + -234134.600+1200900.400 + -233720.200+1201510.900 + -234919.400+1200746.500 + -233636.800+1200947.600 + -235933.200+1201120.000 + -240208.300+1200544.200 + -235811.300+1200110.900 + -235212.700+1200719.000 + -234426.300+1200833.100 + -235710.500+1200631.600 -153113.600+1415840.100 -153657.800+1415911.900 -153157.500+1415013.000 @@ -9769,6 +9797,18 @@ BOFOR -330638.800+1514011.600 -330450.900+1513106.700 -330359.000+1513832.300 + -275705.600+1213007.700 + -280248.300+1212922.600 + -280407.800+1212304.100 + -275608.200+1212056.500 + -275047.700+1211412.300 + -275928.300+1212509.400 + -274746.300+1210227.400 + -274203.700+1210313.700 + -274844.900+1211137.700 + -274045.100+1210931.200 + -275405.500+1211821.600 + -274524.400+1210725.600 -250204.700+1520638.600 -160124.800+1453628.600 -343900.000+1280000.000 @@ -9998,20 +10038,6 @@ BOFOR -253629.500+1524331.600 -252830.900+1524231.800 -254128.600+1524409.100 - -372259.070+1494023.670 - -372038.420+1494657.610 - -372445.680+1495158.500 - -373028.370+1494435.610 - -373305.180+1494952.730 - -372533.400+1494546.690 - -373523.320+1494324.370 - -374851.860+1494610.640 - -374122.860+1494157.330 - -375112.680+1493934.020 - -373725.430+1494921.810 - -374617.780+1494045.760 - -374705.160+1493432.090 - -373627.930+1494308.750 -205531.800+1164008.800 -205244.400+1164132.300 -372259.100+1494023.700 @@ -10317,18 +10343,6 @@ BOFOR -324548.400+1512708.400 -324616.800+1512040.400 -324257.600+1512759.000 - -271753.200+1204753.800 - -272331.900+1204908.100 - -272629.900+1204336.800 - -271903.100+1203750.700 - -271547.100+1202938.600 - -272129.800+1204400.000 - -271631.700+1201835.800 - -271052.800+1201723.100 - -271523.200+1202838.900 - -270755.700+1202254.300 - -271839.300+1203650.900 - -271255.800+1202230.200 -364206.500+1452007.500 -364358.900+1452652.200 -364943.400+1452659.700 @@ -10437,6 +10451,18 @@ BOFOR -292730.300+1495136.200 -293956.900+1494710.300 -294010.900+1494126.400 + -271753.200+1204753.800 + -272331.900+1204908.100 + -272629.900+1204336.800 + -271903.100+1203750.700 + -271547.100+1202938.600 + -272129.800+1204400.000 + -271631.700+1201835.800 + -271052.800+1201723.100 + -271523.200+1202838.900 + -270755.700+1202254.300 + -271839.300+1203650.900 + -271255.800+1202230.200 -373257.400+1405446.800 -372912.500+1404919.000 -373910.100+1404803.100 @@ -10604,6 +10630,7 @@ BOFOR -190259.000+1465526.500 -154415.100+1244322.900 -220448.000+1740418.000 + -374006.000+1472355.000 -111400.000+1313300.000 -331640.000+1382912.100 -304053.300+1165428.400 @@ -10626,6 +10653,18 @@ BOFOR -183308.800+1380331.600 -273939.700+1530306.900 -374834.600+1441427.400 + -314039.700+1232124.000 + -314309.600+1232727.200 + -314852.800+1232646.700 + -314803.000+1231712.900 + -315226.300+1230759.100 + -314536.400+1232220.200 + -320049.900+1230138.100 + -315818.700+1225534.400 + -315327.100+1230551.000 + -315235.700+1225616.900 + -314903.900+1231505.000 + -315553.000+1230042.800 -334710.700+1514424.400 -345110.200+1382134.600 -132135.200+1063820.900 @@ -10670,20 +10709,6 @@ BOFOR -424210.100+1473040.400 -161153.500+1442011.500 -173946.200+1453217.000 - -314039.700+1232124.000 - -314309.600+1232727.200 - -314852.800+1232646.700 - -314803.000+1231712.900 - -315226.300+1230759.100 - -314536.400+1232220.200 - -315029.400+1231205.300 - -320049.900+1230138.100 - -315818.700+1225534.400 - -315327.100+1230551.000 - -315235.700+1225616.900 - -314903.900+1231505.000 - -315553.000+1230042.800 - -315101.000+1231058.900 -105044.500+1421510.700 -104506.700+1421625.400 -105229.700+1422318.800 @@ -10928,15 +10953,6 @@ BOFOR -280357.600+1402112.500 -281432.800+1402025.300 -280722.800+1401402.400 - -275618.400+1532813.100 - -280620.000+1532805.900 - -281200.700+1533142.600 - -280119.200+1532809.500 - -281815.700+1534148.400 - -282339.400+1533147.800 - -281443.300+1533326.100 - -280220.500+1533103.800 - -281905.200+1533613.200 -085130.000+1380400.000 -263443.000+1182708.200 -290139.400+1532801.300 @@ -11475,13 +11491,6 @@ BOFOR -203211.900+1483907.200 -202852.300+1483121.900 -203416.400+1484358.300 - -202548.000+1481841.000 - -202002.600+1481851.100 - -202601.300+1482724.200 - -201813.300+1482438.500 - -203123.700+1483506.600 - -202302.000+1482307.600 - -202900.500+1483141.000 -311140.200+1525230.600 -311240.200+1530040.800 -312122.700+1525453.700 @@ -11494,6 +11503,13 @@ BOFOR -313055.700+1524831.600 -312358.000+1525310.300 -313516.700+1524537.100 + -202548.000+1481841.000 + -202002.600+1481851.100 + -202601.300+1482724.200 + -201813.300+1482438.500 + -203123.700+1483506.600 + -202302.000+1482307.600 + -202900.500+1483141.000 -335750.700+1512245.700 -342418.500+1401315.300 -220032.000+1495704.300 @@ -11503,6 +11519,7 @@ BOFOR -141833.700+1321739.900 -143247.900+1322358.900 -142257.500+1321510.500 + -143043.900+1322207.900 -143748.900+1323454.600 -144324.500+1323329.400 -144401.200+1322736.300 @@ -11598,18 +11615,18 @@ BOFOR -333853.700+1151756.500 -334006.000+1152714.100 -333620.600+1152623.500 - -263245.400+1442936.700 - -263741.300+1443253.700 - -264209.400+1442851.200 - -263658.400+1442145.900 - -263623.500+1441251.800 - -263719.900+1442719.800 - -264021.000+1440117.300 - -263524.100+1435800.700 - -263608.700+1440908.200 - -263057.000+1440203.200 - -263643.800+1441802.300 - -263546.500+1440334.400 + -263245.400+1442936.700 + -263741.300+1443253.700 + -264209.400+1442851.200 + -263658.400+1442145.900 + -263623.500+1441251.800 + -263719.900+1442719.800 + -264021.000+1440117.300 + -263524.100+1435800.700 + -263608.700+1440908.200 + -263057.000+1440203.200 + -263643.800+1441802.300 + -263546.500+1440334.400 -115245.200+1301534.700 -270636.000+1530406.000 -322136.000+1381106.000 @@ -11714,6 +11731,13 @@ BOFOR -282811.400+1533456.500 -281352.100+1533220.400 -280802.100+1533108.700 + -285545.300+1223649.800 + -285812.000+1224245.100 + -291339.000+1221157.700 + -290755.400+1221234.600 + -290841.300+1222153.600 + -290442.600+1222949.700 + -291110.200+1221655.800 -122432.200+1305946.300 -123214.500+1304451.300 -122020.800+1304718.200 @@ -12098,6 +12122,13 @@ BOFOR -335103.600+1505729.800 -335126.600+1505047.800 -335443.800+1505813.400 + -341235.800+1503057.000 + -341010.400+1502441.000 + -340427.000+1502517.000 + -340509.400+1503506.400 + -341109.700+1503759.500 + -340740.000+1502953.800 + -340238.800+1504018.200 -341340.000+1481443.900 -320948.000+1160300.000 -323918.000+1501518.000 @@ -12114,13 +12145,6 @@ BOFOR -300850.500+1222252.800 -301529.100+1220816.100 -225906.200+1285206.200 - -341235.800+1503057.000 - -341010.400+1502441.000 - -340427.000+1502517.000 - -340509.400+1503506.400 - -341109.700+1503759.500 - -340740.000+1502953.800 - -340238.800+1504018.200 -320838.000+1510704.600 -321420.600+1510618.300 -321540.500+1505943.600 @@ -12340,18 +12364,6 @@ BOFOR -420643.600+1451806.200 -421928.600+1451439.200 -422013.500+1450759.300 - -285545.300+1223649.800 - -285812.000+1224245.100 - -290311.300+1223251.200 - -290355.800+1224209.900 - -290710.200+1222455.400 - -290041.800+1223748.200 - -291606.800+1221753.400 - -291339.000+1221157.700 - -290755.400+1221234.600 - -290841.300+1222153.600 - -290442.600+1222949.700 - -291110.200+1221655.800 -333618.100+1505915.800 -334202.700+1505708.400 -333759.600+1505337.400 @@ -12824,6 +12836,7 @@ BOFOR -314730.800+1161129.500 -331603.400+1513348.700 -291100.000+1164007.100 + -371253.000+1473635.000 -345155.100+1503808.700 -072400.000+1333530.000 -175811.000+1450649.900 @@ -12834,6 +12847,16 @@ BOFOR -122759.200+1304622.000 -423323.300+1472518.900 -171424.000+1453836.000 + -291103.600+1243920.300 + -290612.300+1244822.100 + -291051.300+1245213.300 + -291056.800+1244630.700 + -291537.500+1244833.600 + -291606.000+1241748.000 + -291126.800+1241356.900 + -290640.900+1241736.800 + -291115.200+1422650.100 + -291121.700+1241939.600 -314139.500+1523615.200 -314304.300+1524253.100 -314844.700+1523615.200 @@ -12846,20 +12869,8 @@ BOFOR -315706.600+1522626.200 -315044.300+1523355.100 -320039.000+1522216.500 - -291103.600+1243920.300 - -290612.300+1244822.100 - -291051.300+1245213.300 - -291056.800+1244630.700 - -291537.500+1244833.600 - -291109.000+1243340.200 -154448.400+1454102.200 -125918.700+1303225.900 - -291606.000+1241748.000 - -291126.800+1241356.900 - -290640.900+1241736.800 - -291115.200+1242650.100 - -291121.700+1241939.600 - -291110.200+1243222.800 -265130.000+1363218.000 -320000.000+1100000.000 -345300.000+1442518.000 @@ -12987,6 +12998,7 @@ BOFOR -260812.000+1531518.000 -290000.000+1100000.000 -314944.900+1162414.500 + -372658.000+1473003.000 -181105.100+1253325.300 -330640.800+1485145.800 -423326.300+1471719.700 @@ -13217,20 +13229,18 @@ BOFOR -260515.800+1263510.200 -261816.100+1263407.800 -260815.900+1263455.800 - -311853.500+1432630.400 - -311900.400+1433312.000 - -312426.600+1433522.100 - -312705.900+1432618.700 - -313334.000+1432047.200 - -312303.200+1432945.500 - -313108.500+1432251.600 - -314347.700+1431851.000 - -313535.400+1431903.300 - -314340.200+1431207.600 - -312907.300+1432435.000 - -313937.800+1431535.600 - -313813.600+1430958.300 - -313132.900+1432230.700 + -305422.800+1431848.500 + -310007.600+1431841.900 + -310200.100+1431223.400 + -305414.400+1430917.300 + -304931.300+1430146.500 + -305711.100+1431359.500 + -304013.800+1425616.600 + -304205.200+1424958.900 + -304759.900+1425921.100 + -304750.000+1424950.600 + -305243.100+1430651.800 + -304502.600+1425439.900 -280613.200+1521115.600 -281122.900+1521407.400 -281531.900+1520937.700 @@ -13308,20 +13318,6 @@ BOFOR -210233.300+1184213.600 -210102.900+1182709.100 -335905.600+1513441.500 - -305422.800+1431848.500 - -310007.600+1431841.900 - -310200.100+1431223.400 - -305414.400+1430917.300 - -304931.300+1430146.500 - -305711.100+1431359.500 - -305117.600+1430435.600 - -304013.800+1425616.600 - -304205.200+1424958.900 - -304759.900+1425921.100 - -304750.000+1424950.600 - -305243.100+1430651.800 - -304502.600+1425439.900 - -305057.000+1430402.700 -283636.200+1200000.000 -291020.400+1524516.000 -272053.500+1200000.000 @@ -13499,6 +13495,18 @@ BOFOR -315130.000+1154854.000 -344407.600+1403159.100 -314511.200+1160441.300 + -311853.500+1432630.400 + -311900.400+1433312.000 + -312426.600+1433522.100 + -312705.900+1432618.700 + -313334.000+1432047.200 + -312303.200+1432945.500 + -314347.700+1431851.000 + -313535.400+1431903.300 + -314340.200+1431207.600 + -312907.300+1432435.000 + -313937.800+1431535.600 + -313813.600+1430958.300 -664512.300+1105856.400 -664016.500+1105137.400 -663552.000+1110047.600 @@ -16787,15 +16795,15 @@ BOFOR BN400/BN411/BN421/BN19R + CG2NC KEGAN - OOLNC - OOLNI/OOLNF/CG14T + CG2NI/CG2NF/CG14T + CG2SA + CG2SC FIKUL - OOLSA - OOLSC - OOLSI/OOLSF/CG32T + CG2SI/CG2SF/CG32T KERRI @@ -17362,6 +17370,10 @@ BOFOR + + + + @@ -18290,6 +18302,10 @@ BOFOR + + + + @@ -18485,7 +18501,10 @@ BOFOR - + + + + diff --git a/AlertParameters.xml b/AlertParameters.xml index 5e57950a..6a48de84 100644 --- a/AlertParameters.xml +++ b/AlertParameters.xml @@ -5,7 +5,7 @@ - ADA,ADD,AVCTR,AVCTA,BNA,CBE,CBW,BAG_NORTH,BAG_SOUTH,CSA,DNA,MLA,PHA,SYA,WLMAPP,WLMAPPE,WLMAPPFG + ADA,ADD,AVCTR,AVCTA,BNA,CBA,BAG_NORTH,BAG_SOUTH,CSA,DNA,MLA,PHA,SYA,WLMAPP,WLMAPPE,WLMAPPFG -334244.4699+1510848.9368/ diff --git a/Maps/ALL_AIRPORTS.xml b/Maps/ALL_AIRPORTS.xml index 6a5564f4..91dbc670 100644 --- a/Maps/ALL_AIRPORTS.xml +++ b/Maps/ALL_AIRPORTS.xml @@ -40,6 +40,7 @@ YBOK YBOU YBPN + YBRA YBRK YBRM YBRN @@ -167,6 +168,7 @@ YKOW YKRY YKSC + YKWA YLBD YLCG YLEC @@ -1369,6 +1371,7 @@ YBOK YBOU YBPN + YBRA YBRK YBRM YBRN @@ -1496,6 +1499,7 @@ YKOW YKRY YKSC + YKWA YLBD YLCG YLEC diff --git a/Maps/APP_RNP_ALL.xml b/Maps/APP_RNP_ALL.xml index dc52e6f7..5fe547a4 100644 --- a/Maps/APP_RNP_ALL.xml +++ b/Maps/APP_RNP_ALL.xml @@ -16,10 +16,10 @@ PFTNC PFTNA PFTNF - TRAEG - TRAEH - TRAEJ - TRAEF + TP2EG + TP2EH + TP2EJ + TP2EF MINUR OY2WF ESDIG @@ -64,11 +64,11 @@ GLENN BETSO OSOKO + CG2NC KEGAN - OOLNC + CG2SA + CG2SC FIKUL - OOLSA - OOLSC ATOSU GUNRO PULAX @@ -221,9 +221,9 @@ CBRSD CBRSG MENZI - SCNWA - SCNWB - SCNWC + SC2WA + SC2WB + SC2WC ANKUB SSYNI TONUX @@ -251,8 +251,8 @@ GOGEX OGATU SAKBO - OOLNF - OOLSF + CG2NF + CG2SF CNSNF HTISF HTINF @@ -311,7 +311,7 @@ SBKWF CBREF CBRSF - SCNWF + SC2WF SSYWF SSYNF SYDNF @@ -330,8 +330,8 @@ NOMEV PIKON OKVIS - OOLNI - OOLSI + CG2NI + CG2SI CNSNI HTISI HTINI @@ -388,11 +388,21 @@ SBKWI CBREI CBRSI - SCNWI + SC2WI STWWI STWEI WM2WI WM2EI + AE2EA + AE2EB + AE2EC + AE2EF + AE2EI + AE2WD + AE2WE + AE2WG + AE2WF + AE2WI AG2ND AG2NE AG2NG @@ -948,16 +958,6 @@ DK2SC DK2SF DK2SI - DLOEA - DLOEB - DLOEC - DLOEF - DLOEI - DLOWD - DLOWE - DLOWG - DLOWF - DLOWI DLQEA DLQEB DLQEC @@ -1276,6 +1276,16 @@ GTNWG GTNWF GTNWI + GW2NA + GW2NC + GW2ND + GW2NF + GW2NI + GW2SE + GW2SG + GW2SJ + GW2SF + GW2SI GZBND GZBNE GZBNG @@ -1286,16 +1296,6 @@ GZBSC GZBSF GZBSI - GZLNA - GZLNC - GZLND - GZLNF - GZLNI - GZLSE - GZLSG - GZLSJ - GZLSF - GZLSI HBAEA HBAEB HBAEC @@ -1346,6 +1346,15 @@ HLTSJ HLTSF HLTSI + HO2EA + HO2EB + HO2EC + HO2EF + HO2EI + HO2WE + HO2WG + HO2WF + HO2WI HOZEA HOZEB HOZEC @@ -1385,8 +1394,6 @@ IA2EF IA2EI IA2WB - IA2WC - IA2WD IA2WF IA2WI IB3EA @@ -1413,6 +1420,16 @@ IGMEC IGMEF IGMEI + IH2NA + IH2NC + IH2ND + IH2NF + IH2NI + IH2SE + IH2SG + IH2SJ + IH2SF + IH2SI IMBND IMBNE IMBNG @@ -1428,16 +1445,6 @@ IVLSC IVLSF IVLSI - IVZNA - IVZNC - IVZND - IVZNF - IVZNI - IVZSE - IVZSG - IVZSJ - IVZSF - IVZSI IW2NA IW2NC IW2ND @@ -1467,21 +1474,21 @@ JLCWC JLCWF JLCWI + JN2ND + JN2NE + JN2NG + JN2NF + JN2NI + JN2SA + JN2SB + JN2SC + JN2SF + JN2SI JUNWA JUNWB JUNWC JUNWF JUNWI - JZCND - JZCNE - JZCNG - JZCNF - JZCNI - JZCSA - JZCSB - JZCSC - JZCSF - JZCSI KBYED KBYEE KBYEG @@ -1611,6 +1618,16 @@ KSCSJ KSCSF KSCSI + KW2ND + KW2NE + KW2NG + KW2NF + KW2NI + KW2SA + KW2SB + KW2SC + KW2SF + KW2SI KWMED KWMEE KWMEG @@ -1691,6 +1708,16 @@ LMQWC LMQWF LMQWI + LO2EA + LO2EB + LO2EC + LO2EF + LO2EI + LO2WD + LO2WE + LO2WG + LO2WF + LO2WI LR2EA LR2EB LR2EC @@ -1775,16 +1802,6 @@ MBHSC MBHSF MBHSI - MC2NA - MC2NC - MC2ND - MC2NF - MC2NI - MC2SE - MC2SG - MC2SJ - MC2SF - MC2SI MCONA MCONC MCOND @@ -1917,16 +1934,6 @@ MNDWB MNDWF MNDWI - MNEEA - MNEEB - MNEEC - MNEEF - MNEEI - MNEWD - MNEWE - MNEWG - MNEWF - MNEWI MNGEA MNGEB MNGEC @@ -1987,6 +1994,16 @@ MRZSJ MRZSF MRZSI + MT2EA + MT2EB + MT2EC + MT2EF + MT2EI + MT2WD + MT2WE + MT2WG + MT2WF + MT2WI MTGND MTGNE MTGNG @@ -2052,16 +2069,16 @@ NHLWG NHLWF NHLWI - NOVEA - NOVEB - NOVEC - NOVEF - NOVEI - NOVWD - NOVWE - NOVWG - NOVWF - NOVWI + NO2EA + NO2EB + NO2EC + NO2EF + NO2EI + NO2WD + NO2WE + NO2WG + NO2WF + NO2WI NPEND NPENE NPENG @@ -2330,11 +2347,6 @@ PPPEC PPPEF PPPEI - PPPWD - PPPWE - PPPWG - PPPWF - PPPWI PQQND PQQNE PQQNG @@ -2345,6 +2357,11 @@ PQQSC PQQSF PQQSI + PR2WD + PR2WE + PR2WG + PR2WF + PR2WI PU2NA PU2NC PU2ND @@ -2370,16 +2387,20 @@ QB2SC QB2SF QB2SI - QLPEA - QLPEB - QLPEC - QLPEF - QLPEI - QLPWD - QLPWE - QLPWG - QLPWF - QLPWI + QL2EA + QL2EB + QL2EC + QL2EF + QL2EI + QL2WD + QL2WE + QL2WG + QL2WF + QL2WI + RD2WB + RD2WC + RD2WF + RD2WI RENED RENEE RENEG @@ -2526,16 +2547,6 @@ SR2SJ SR2SF SR2SI - SRDED - SRDEE - SRDEG - SRDEF - SRDEI - SRDWA - SRDWB - SRDWC - SRDWF - SRDWI SRIEA SRIEB SRIEF @@ -2692,6 +2703,7 @@ TOCWG TOCWF TOCWI + TP2EI TR2ND TR2NE TR2NG @@ -2702,12 +2714,6 @@ TR2SC TR2SF TR2SI - TRAEI - TRAWB - TRAWC - TRAWD - TRAWF - TRAWI TSTWD TSTWE TSTWG @@ -2797,16 +2803,16 @@ WBRSC WBRSF WBRSI - WCANA - WCANC - WCAND - WCANF - WCANI - WCASE - WCASG - WCASJ - WCASF - WCASI + WC2EA + WC2EB + WC2EC + WC2EF + WC2EI + WC2WD + WC2WE + WC2WG + WC2WF + WC2WI WCKEA WCKEB WCKEC @@ -2848,16 +2854,6 @@ WGZWC WGZWF WGZWI - WHCEA - WHCEB - WHCEC - WHCEF - WHCEI - WHCWD - WHCWE - WHCWG - WHCWF - WHCWI WHZND WHZNE WHZNG @@ -2925,6 +2921,16 @@ WOLSJ WOLSF WOLSI + WQ2NA + WQ2NC + WQ2ND + WQ2NF + WQ2NI + WQ2SE + WQ2SG + WQ2SJ + WQ2SF + WQ2SI WR2WI WSLWA WSLWB @@ -3121,8 +3127,8 @@ GOGEX OGATU SAKBO - OOLNF - OOLSF + CG2NF + CG2SF CNSNF HTISF HTINF @@ -3181,7 +3187,7 @@ SBKWF CBREF CBRSF - SCNWF + SC2WF SSYWF SSYNF SYDNF @@ -3192,6 +3198,8 @@ STWEF WM2WF WM2EF + AE2EF + AE2WF AG2NF AG2SF ALHWF @@ -3308,8 +3316,6 @@ DG2WF DK2NF DK2SF - DLOEF - DLOWF DLQEF DLQWF DMGEF @@ -3375,10 +3381,10 @@ GTEWF GTNEF GTNWF + GW2NF + GW2SF GZBNF GZBSF - GZLNF - GZLSF HBAEF HBAWF HCQNF @@ -3389,6 +3395,8 @@ HISWF HLTNF HLTSF + HO2EF + HO2WF HOZEF HSMEF HSMWF @@ -3403,20 +3411,20 @@ IE2NF IFLEF IGMEF + IH2NF + IH2SF IMBNF IMBSF IVLSF - IVZNF - IVZSF IW2NF JABEF JABWF JBYNF JLCEF JLCWF + JN2NF + JN2SF JUNWF - JZCNF - JZCSF KBYEF KBYWF KD2EF @@ -3444,6 +3452,8 @@ KRYSF KSCNF KSCSF + KW2NF + KW2SF KWMEF KWMWF LBDEF @@ -3460,6 +3470,8 @@ LLENF LLESF LMQWF + LO2EF + LO2WF LR2EF LR2WF LRZNF @@ -3477,8 +3489,6 @@ MBAWF MBHNF MBHSF - MC2NF - MC2SF MCONF MCOSF MD2EF @@ -3506,8 +3516,6 @@ MMZEF MMZWF MNDWF - MNEEF - MNEWF MNGEF MNGNF MNGSF @@ -3520,6 +3528,8 @@ MRYSF MRZNF MRZSF + MT2EF + MT2WF MTGNF MTGSF MTIEF @@ -3533,8 +3543,8 @@ NGUWF NHLEF NHLWF - NOVEF - NOVWF + NO2EF + NO2WF NPENF NPESF NRCEF @@ -3593,16 +3603,17 @@ PPDNF PPDSF PPPEF - PPPWF PQQNF PQQSF + PR2WF PU2NF PWRSF PZANF QB2NF QB2SF - QLPEF - QLPWF + QL2EF + QL2WF + RD2WF RENEF RENWF RMDEF @@ -3633,8 +3644,6 @@ SQCSF SR2NF SR2SF - SRDEF - SRDWF SRIEF SSYNF STHEF @@ -3668,10 +3677,9 @@ TN2WF TOCEF TOCWF + TP2EF TR2NF TR2SF - TRAEF - TRAWF TSTWF TT2NF TT2SF @@ -3692,8 +3700,8 @@ WBLWF WBRNF WBRSF - WCANF - WCASF + WC2EF + WC2WF WCKEF WDHNF WDHSF @@ -3704,8 +3712,6 @@ WGTNF WGZEF WGZWF - WHCEF - WHCWF WHZNF WHZSF WISWF @@ -3720,6 +3726,8 @@ WLUSF WO2NF WOLSF + WQ2NF + WQ2SF WR2WF WSLWF WTNNF @@ -3771,8 +3779,8 @@ NOMEV PIKON OKVIS - OOLNI - OOLSI + CG2NI + CG2SI CNSNI HTISI HTINI @@ -3829,11 +3837,13 @@ SBKWI CBREI CBRSI - SCNWI + SC2WI STWWI STWEI WM2WI WM2EI + AE2EI + AE2WI AG2NI AG2SI ALHWI @@ -3950,8 +3960,6 @@ DG2WI DK2NI DK2SI - DLOEI - DLOWI DLQEI DLQWI DMGEI @@ -4017,10 +4025,10 @@ GTEWI GTNEI GTNWI + GW2NI + GW2SI GZBNI GZBSI - GZLNI - GZLSI HBAEI HBAWI HCQNI @@ -4031,6 +4039,8 @@ HISWI HLTNI HLTSI + HO2EI + HO2WI HOZEI HSMEI HSMWI @@ -4045,20 +4055,20 @@ IE2NI IFLEI IGMEI + IH2NI + IH2SI IMBNI IMBSI IVLSI - IVZNI - IVZSI IW2NI JABEI JABWI JBYNI JLCEI JLCWI + JN2NI + JN2SI JUNWI - JZCNI - JZCSI KBYEI KBYWI KD2EI @@ -4086,6 +4096,8 @@ KRYSI KSCNI KSCSI + KW2NI + KW2SI KWMEI KWMWI LBDEI @@ -4102,6 +4114,8 @@ LLENI LLESI LMQWI + LO2EI + LO2WI LR2EI LR2WI LRZNI @@ -4119,8 +4133,6 @@ MBAWI MBHNI MBHSI - MC2NI - MC2SI MCONI MCOSI MD2EI @@ -4148,8 +4160,6 @@ MMZEI MMZWI MNDWI - MNEEI - MNEWI MNGEI MNGNI MNGSI @@ -4162,6 +4172,8 @@ MRYSI MRZNI MRZSI + MT2EI + MT2WI MTGNI MTGSI MTIEI @@ -4175,8 +4187,8 @@ NGUWI NHLEI NHLWI - NOVEI - NOVWI + NO2EI + NO2WI NPENI NPESI NRCEI @@ -4235,16 +4247,17 @@ PPDNI PPDSI PPPEI - PPPWI PQQNI PQQSI + PR2WI PU2NI PWRSI PZANI QB2NI QB2SI - QLPEI - QLPWI + QL2EI + QL2WI + RD2WI RENEI RENWI RMDEI @@ -4275,8 +4288,6 @@ SQCSI SR2NI SR2SI - SRDEI - SRDWI SRIEI SSYNI STHEI @@ -4310,10 +4321,9 @@ TN2WI TOCEI TOCWI + TP2EI TR2NI TR2SI - TRAEI - TRAWI TSTWI TT2NI TT2SI @@ -4334,8 +4344,8 @@ WBLWI WBRNI WBRSI - WCANI - WCASI + WC2EI + WC2WI WCKEI WDHNI WDHSI @@ -4346,8 +4356,6 @@ WGTNI WGZEI WGZWI - WHCEI - WHCWI WHZNI WHZSI WISWI @@ -4362,6 +4370,8 @@ WLUSI WO2NI WOLSI + WQ2NI + WQ2SI WR2WI WSLWI WTNNI @@ -4414,9 +4424,9 @@ COMND PFTNC PFTNA - TRAEG - TRAEH - TRAEJ + TP2EG + TP2EH + TP2EJ MINUR ESDIG BLZSC @@ -4453,11 +4463,11 @@ GLENN BETSO OSOKO + CG2NC KEGAN - OOLNC + CG2SA + CG2SC FIKUL - OOLSA - OOLSC ATOSU GUNRO PULAX @@ -4610,9 +4620,9 @@ CBRSD CBRSG MENZI - SCNWA - SCNWB - SCNWC + SC2WA + SC2WB + SC2WC ANKUB TONUX URDEN @@ -4631,6 +4641,12 @@ WM2ED WM2EE WM2EG + AE2EA + AE2EB + AE2EC + AE2WD + AE2WE + AE2WG AG2ND AG2NE AG2NG @@ -4956,12 +4972,6 @@ DK2SA DK2SB DK2SC - DLOEA - DLOEB - DLOEC - DLOWD - DLOWE - DLOWG DLQEA DLQEB DLQEC @@ -5150,18 +5160,18 @@ GTNWD GTNWE GTNWG + GW2NA + GW2NC + GW2ND + GW2SE + GW2SG + GW2SJ GZBND GZBNE GZBNG GZBSA GZBSB GZBSC - GZLNA - GZLNC - GZLND - GZLSE - GZLSG - GZLSJ HBAEA HBAEB HBAEC @@ -5192,6 +5202,11 @@ HLTSE HLTSG HLTSJ + HO2EA + HO2EB + HO2EC + HO2WE + HO2WG HOZEA HOZEB HOZEC @@ -5215,8 +5230,6 @@ IA2EG IA2EJ IA2WB - IA2WC - IA2WD IB3EA IB3EB IB3EC @@ -5231,6 +5244,12 @@ IGMEA IGMEB IGMEC + IH2NA + IH2NC + IH2ND + IH2SE + IH2SG + IH2SJ IMBND IMBNE IMBNG @@ -5240,12 +5259,6 @@ IVLSA IVLSB IVLSC - IVZNA - IVZNC - IVZND - IVZSE - IVZSG - IVZSJ IW2NA IW2NC IW2ND @@ -5263,15 +5276,15 @@ JLCWA JLCWB JLCWC + JN2ND + JN2NE + JN2NG + JN2SA + JN2SB + JN2SC JUNWA JUNWB JUNWC - JZCND - JZCNE - JZCNG - JZCSA - JZCSB - JZCSC KBYED KBYEE KBYEG @@ -5348,6 +5361,12 @@ KSCSE KSCSG KSCSJ + KW2ND + KW2NE + KW2NG + KW2SA + KW2SB + KW2SC KWMED KWMEE KWMEG @@ -5396,6 +5415,12 @@ LMQWA LMQWB LMQWC + LO2EA + LO2EB + LO2EC + LO2WD + LO2WE + LO2WG LR2EA LR2EB LR2EC @@ -5446,12 +5471,6 @@ MBHSA MBHSB MBHSC - MC2NA - MC2NC - MC2ND - MC2SE - MC2SG - MC2SJ MCONA MCONC MCOND @@ -5531,12 +5550,6 @@ MMZWG MNDWA MNDWB - MNEEA - MNEEB - MNEEC - MNEWD - MNEWE - MNEWG MNGEA MNGEB MNGEC @@ -5573,6 +5586,12 @@ MRZSE MRZSG MRZSJ + MT2EA + MT2EB + MT2EC + MT2WD + MT2WE + MT2WG MTGND MTGNE MTGNG @@ -5612,12 +5631,12 @@ NHLWD NHLWE NHLWG - NOVEA - NOVEB - NOVEC - NOVWD - NOVWE - NOVWG + NO2EA + NO2EB + NO2EC + NO2WD + NO2WE + NO2WG NPEND NPENE NPENG @@ -5774,15 +5793,15 @@ PPPEA PPPEB PPPEC - PPPWD - PPPWE - PPPWG PQQND PQQNE PQQNG PQQSA PQQSB PQQSC + PR2WD + PR2WE + PR2WG PU2NA PU2NC PU2ND @@ -5798,12 +5817,14 @@ QB2SA QB2SB QB2SC - QLPEA - QLPEB - QLPEC - QLPWD - QLPWE - QLPWG + QL2EA + QL2EB + QL2EC + QL2WD + QL2WE + QL2WG + RD2WB + RD2WC RENED RENEE RENEG @@ -5890,12 +5911,6 @@ SR2SE SR2SG SR2SJ - SRDED - SRDEE - SRDEG - SRDWA - SRDWB - SRDWC SRIEA SRIEB STHEA @@ -5994,9 +6009,6 @@ TR2SA TR2SB TR2SC - TRAWB - TRAWC - TRAWD TSTWD TSTWE TSTWG @@ -6046,12 +6058,12 @@ WBRSA WBRSB WBRSC - WCANA - WCANC - WCAND - WCASE - WCASG - WCASJ + WC2EA + WC2EB + WC2EC + WC2WD + WC2WE + WC2WG WCKEA WCKEB WCKEC @@ -6075,12 +6087,6 @@ WGZWA WGZWB WGZWC - WHCEA - WHCEB - WHCEC - WHCWD - WHCWE - WHCWG WHZND WHZNE WHZNG @@ -6120,6 +6126,12 @@ WOLSE WOLSG WOLSJ + WQ2NA + WQ2NC + WQ2ND + WQ2SE + WQ2SG + WQ2SJ WSLWA WSLWB WSLWC @@ -6229,6 +6241,16 @@ ZW2WE ZW2WG + AE2EA/AE2EI + AE2EB/AE2EI + AE2EC/AE2EI + AE2EI/AE2EF + -243737.060+1183742.710/AE2EF + AE2WD/AE2WI + AE2WE/AE2WI + AE2WG/AE2WI + AE2WI/AE2WF + -243720.900+1183641.200/AE2WF AG2ND/AG2NI AG2NE/AG2NI AG2NG/AG2NI @@ -6335,10 +6357,11 @@ BG2EC/BG2EI BG2ED/BG2EI BG2EI/BG2EF - BG2EM/BG2EF - EGIDA/BG2WB/BG2WI + -223221.760+1171648.510/BG2EF + EGIDA/BG2WI + BG2WB/BG2WI BG2WI/BG2WF - BG2WM/BG2WF + -223228.420+1171531.780/BG2WF BGOND/BGONI BGONE/BGONI BGONG/BGONI @@ -6703,12 +6726,12 @@ CR2EK/CR2EI CR2EL/CR2EI CR2EI/CR2EF - CR2EM/CR2EF + -222113.920+1193916.830/CR2EF CR2WP/CR2WI CR2WQ/CR2WI CR2WR/CR2WI CR2WI/CR2WF - CR2WM/CR2WF + -222116.990+1193749.560/CR2WF CRGNA/CRGNI CRGNC/CRGNI CRGND/CRGNI @@ -6791,16 +6814,6 @@ DK2SC/DK2SI DK2SI/DK2SF -273638.260+1222008.340/DK2SF - DLOEA/DLOEI - DLOEB/DLOEI - DLOEC/DLOEI - DLOEI/DLOEF - -275247.930+1211643.780/DLOEF - DLOWD/DLOWI - DLOWE/DLOWI - DLOWG/DLOWI - DLOWI/DLOWF - -275205.320+1211550.070/DLOWF DLQEA/DLQEI DLQEB/DLQEI DLQEC/DLQEI @@ -7119,6 +7132,16 @@ GTNWG/GTNWI GTNWI/GTNWF GTNWM/GTNWF + GW2NA/GW2NI + GW2NC/GW2NI + GW2ND/GW2NI + GW2NI/GW2NF + -284715.110+1144235.210/GW2NF + GW2SE/GW2SI + GW2SG/GW2SI + GW2SJ/GW2SI + GW2SI/GW2SF + -284828.730+1144207.440/GW2SF GZBND/GZBNI GZBNE/GZBNI GZBNG/GZBNI @@ -7129,16 +7152,6 @@ GZBSC/GZBSI GZBSI/GZBSF -344847.610+1494318.140/GZBSF - GZLNA/GZLNI - GZLNC/GZLNI - GZLND/GZLNI - GZLNI/GZLNF - -284715.110+1144235.210/GZLNF - GZLSE/GZLSI - GZLSG/GZLSI - GZLSJ/GZLSI - GZLSI/GZLSF - -284828.730+1144207.440/GZLSF HBAEA/HBAEI HBAEB/HBAEI HBAEC/HBAEI @@ -7189,6 +7202,15 @@ HLTSJ/HLTSI HLTSI/HLTSF -373914.420+1420342.810/HLTSF + HO2EA/HO2EI + HO2EB/HO2EI + HO2EC/HO2EI + HO2EI/HO2EF + -320631.500+1194607.000/HO2EF + HO2WE/HO2WI + HO2WG/HO2WI + HO2WI/HO2WF + -320636.250+1194506.260/HO2WF HOZEA/HOZEI HOZEB/HOZEI HOZEC/HOZEI @@ -7226,12 +7248,10 @@ IA2EG/IA2EI IA2EJ/IA2EI IA2EI/IA2EF - IA2EM/IA2EF + -223453.830+1200252.020/IA2EF IA2WB/IA2WI - IA2WC/IA2WI - IA2WD/IA2WI IA2WI/IA2WF - IA2WM/IA2WF + -223453.830+1200124.570/IA2WF IB3EA/IB3EI IB3EB/IB3EI IB3EC/IB3EI @@ -7256,6 +7276,16 @@ IGMEC/IGMEI IGMEI/IGMEF IGMEM/IGMEF + IH2NA/IH2NI + IH2NC/IH2NI + IH2ND/IH2NI + IH2NI/IH2NF + -325252.600+1441837.950/IH2NF + IH2SE/IH2SI + IH2SG/IH2SI + IH2SJ/IH2SI + IH2SI/IH2SF + -325332.730+1441843.530/IH2SF IMBND/IMBNI IMBNE/IMBNI IMBNG/IMBNI @@ -7271,16 +7301,6 @@ IVLSC/IVLSI IVLSI/IVLSF IVLSM/IVLSF - IVZNA/IVZNI - IVZNC/IVZNI - IVZND/IVZNI - IVZNI/IVZNF - IVZNM/IVZNF - IVZSE/IVZSI - IVZSG/IVZSI - IVZSJ/IVZSI - IVZSI/IVZSF - IVZSM/IVZSF IW2NA/IW2NI IW2NC/IW2NI IW2ND/IW2NI @@ -7310,21 +7330,21 @@ JLCWC/JLCWI JLCWI/JLCWF JLCWM/JLCWF + JN2ND/JN2NI + JN2NE/JN2NI + JN2NG/JN2NI + JN2NI/JN2NF + -305341.330+1321039.100/JN2NF + JN2SA/JN2SI + JN2SB/JN2SI + JN2SC/JN2SI + JN2SI/JN2SF + -305425.910+1321122.900/JN2SF JUNWA/JUNWI JUNWB/JUNWI JUNWC/JUNWI JUNWI/JUNWF JUNWM/JUNWF - JZCND/JZCNI - JZCNE/JZCNI - JZCNG/JZCNI - JZCNI/JZCNF - JZCNM/JZCNF - JZCSA/JZCSI - JZCSB/JZCSI - JZCSC/JZCSI - JZCSI/JZCSF - JZCSM/JZCSF KBYED/KBYEI KBYEE/KBYEI KBYEG/KBYEI @@ -7458,6 +7478,16 @@ KSCSJ/KSCSI KSCSI/KSCSF -354325.090+1373118.260/KSCSF + KW2ND/KW2NI + KW2NE/KW2NI + KW2NG/KW2NI + KW2NI/KW2NF + -234620.750+1200814.950/KW2NF + KW2SA/KW2SI + KW2SB/KW2SI + KW2SC/KW2SI + KW2SI/KW2SF + -234725.030+1200804.740/KW2SF KWMED/KWMEI KWMEE/KWMEI KWMEG/KWMEI @@ -7538,6 +7568,16 @@ LMQWC/LMQWI LMQWI/LMQWF LMQWM/LMQWF + LO2EA/LO2EI + LO2EB/LO2EI + LO2EC/LO2EI + LO2EI/LO2EF + -275247.930+1211643.780/LO2EF + LO2WD/LO2WI + LO2WE/LO2WI + LO2WG/LO2WI + LO2WI/LO2WF + -275205.320+1211550.070/LO2WF LR2EA/LR2EI LR2EB/LR2EI LR2EC/LR2EI @@ -7622,16 +7662,6 @@ MBHSC/MBHSI MBHSI/MBHSF -253114.240+1524252.180/MBHSF - MC2NA/MC2NI - MC2NC/MC2NI - MC2ND/MC2NI - MC2NI/MC2NF - MC2NM/MC2NF - MC2SE/MC2SI - MC2SG/MC2SI - MC2SJ/MC2SI - MC2SI/MC2SF - MC2SM/MC2SF MCONA/MCONI MCONC/MCONI MCOND/MCONI @@ -7765,16 +7795,6 @@ MNDWB/MNDWI MNDWI/MNDWF MNDWM/MNDWF - MNEEA/MNEEI - MNEEB/MNEEI - MNEEC/MNEEI - MNEEI/MNEEF - -271725.140+1203344.590/MNEEF - MNEWD/MNEWI - MNEWE/MNEWI - MNEWG/MNEWI - MNEWI/MNEWF - -271701.310+1203244.790/MNEWF MNGEA/MNGEI MNGEB/MNGEI MNGEC/MNGEI @@ -7835,6 +7855,16 @@ MRZSJ/MRZSI MRZSI/MRZSF -293022.620+1495034.950/MRZSF + MT2EA/MT2EI + MT2EB/MT2EI + MT2EC/MT2EI + MT2EI/MT2EF + -271725.140+1203344.590/MT2EF + MT2WD/MT2WI + MT2WE/MT2WI + MT2WG/MT2WI + MT2WI/MT2WF + -271701.310+1203244.790/MT2WF MTGND/MTGNI MTGNE/MTGNI MTGNG/MTGNI @@ -7900,16 +7930,16 @@ NHLWG/NHLWI NHLWI/NHLWF NHLWM/NHLWF - NOVEA/NOVEI - NOVEB/NOVEI - NOVEC/NOVEI - NOVEI/NOVEF - NOVEM/NOVEF - NOVWD/NOVWI - NOVWE/NOVWI - NOVWG/NOVWI - NOVWI/NOVWF - NOVWM/NOVWF + NO2EA/NO2EI + NO2EB/NO2EI + NO2EC/NO2EI + NO2EI/NO2EF + -315029.310+1231205.360/NO2EF + NO2WD/NO2WI + NO2WE/NO2WI + NO2WG/NO2WI + NO2WI/NO2WF + -315100.900+1231058.900/NO2WF NPEND/NPENI NPENE/NPENI NPENG/NPENI @@ -8188,11 +8218,6 @@ PPPEC/PPPEI PPPEI/PPPEF -202953.710+1483345.030/PPPEF - PPPWD/PPPWI - PPPWE/PPPWI - PPPWG/PPPWI - PPPWI/PPPWF - PPPWM/PPPWF PQQND/PQQNI PQQNE/PQQNI PQQNG/PQQNI @@ -8203,6 +8228,11 @@ PQQSC/PQQSI PQQSI/PQQSF -312634.640+1525125.890/PQQSF + PR2WD/PR2WI + PR2WE/PR2WI + PR2WG/PR2WI + PR2WI/PR2WF + PR2WM/PR2WF PU2NA/PU2NI PU2NC/PU2NI PU2ND/PU2NI @@ -8228,16 +8258,20 @@ QB2SC/QB2SI QB2SI/QB2SF -334150.340+1152346.950/QB2SF - QLPEA/QLPEI - QLPEB/QLPEI - QLPEC/QLPEI - QLPEI/QLPEF - -263635.460+1441554.020/QLPEF - QLPWD/QLPWI - QLPWE/QLPWI - QLPWG/QLPWI - QLPWI/QLPWF - -263631.920+1441500.010/QLPWF + QL2EA/QL2EI + QL2EB/QL2EI + QL2EC/QL2EI + QL2EI/QL2EF + -263635.460+1441554.020/QL2EF + QL2WD/QL2WI + QL2WE/QL2WI + QL2WG/QL2WI + QL2WI/QL2WF + -263631.920+1441500.010/QL2WF + RD2WB/RD2WI + RD2WC/RD2WI + RD2WI/RD2WF + -290612.120+1222651.240/RD2WF RENED/RENEI RENEE/RENEI RENEG/RENEI @@ -8384,16 +8418,6 @@ SR2SJ/SR2SI SR2SI/SR2SF -420940.140+1451718.520/SR2SF - SRDED/SRDEI - SRDEE/SRDEI - SRDEG/SRDEI - SRDEI/SRDEF - -290540.730+1222753.880/SRDEF - SRDWA/SRDWI - SRDWB/SRDWI - SRDWC/SRDWI - SRDWI/SRDWF - -290612.120+1222651.240/SRDWF SRIEA/SRIEI SRIEB/SRIEI SRIEI/SRIEF @@ -8552,6 +8576,11 @@ TOCWG/TOCWI TOCWI/TOCWF TOCWM/TOCWF + TP2EG/TP2EI + TP2EH/TP2EI + TP2EJ/TP2EI + TP2EI/TP2EF + -291109.000+1243340.200/TP2EF TR2ND/TR2NI TR2NE/TR2NI TR2NG/TR2NI @@ -8562,16 +8591,6 @@ TR2SC/TR2SI TR2SI/TR2SF -315334.250+1523035.720/TR2SF - TRAEG/TRAEI - TRAEH/TRAEI - TRAEJ/TRAEI - TRAEI/TRAEF - TRAEM/TRAEF - TRAWB/TRAWI - TRAWC/TRAWI - TRAWD/TRAWI - TRAWI/TRAWF - TRAWM/TRAWF TSTWD/TSTWI TSTWE/TSTWI TSTWG/TSTWI @@ -8661,16 +8680,16 @@ WBRSC/WBRSI WBRSI/WBRSF WBRSM/WBRSF - WCANA/WCANI - WCANC/WCANI - WCAND/WCANI - WCANI/WCANF - WCANM/WCANF - WCASE/WCASI - WCASG/WCASI - WCASJ/WCASI - WCASI/WCASF - WCASM/WCASF + WC2EA/WC2EI + WC2EB/WC2EI + WC2EC/WC2EI + WC2EI/WC2EF + -305117.580+1430435.590/WC2EF + WC2WD/WC2WI + WC2WE/WC2WI + WC2WG/WC2WI + WC2WI/WC2WF + -305057.000+1430402.710/WC2WF WCKEA/WCKEI WCKEB/WCKEI WCKEC/WCKEI @@ -8720,16 +8739,6 @@ WGZWC/WGZWI WGZWI/WGZWF -210207.940+1183758.480/WGZWF - WHCEA/WHCEI - WHCEB/WHCEI - WHCEC/WHCEI - WHCEI/WHCEF - WHCEM/WHCEF - WHCWD/WHCWI - WHCWE/WHCWI - WHCWG/WHCWI - WHCWI/WHCWF - WHCWM/WHCWF WHZND/WHZNI WHZNE/WHZNI WHZNG/WHZNI @@ -8797,6 +8806,16 @@ WOLSJ/WOLSI WOLSI/WOLSF WOLSM/WOLSF + WQ2NA/WQ2NI + WQ2NC/WQ2NI + WQ2ND/WQ2NI + WQ2NI/WQ2NF + -313108.480+1432251.580/WQ2NF + WQ2SE/WQ2SI + WQ2SG/WQ2SI + WQ2SJ/WQ2SI + WQ2SI/WQ2SF + -313132.890+1432230.720/WQ2SF WR2WC/WR2WI WR2WB/WR2WI WR2WA/WR2WI @@ -9020,13 +9039,13 @@ BETSO/PIKON OKVIS/SAKBO/BN19R OSOKO/OKVIS - OOLNI/OOLNF/CG14T - KEGAN/OOLNI - OOLNC/OOLNI - OOLSI/OOLSF/CG32T - FIKUL/OOLSI - OOLSA/OOLSI - OOLSC/OOLSI + CG2NI/CG2NF/CG14T + CG2NC/CG2NI + KEGAN/CG2NI + CG2SI/CG2SF/CG32T + CG2SA/CG2SI + CG2SC/CG2SI + FIKUL/CG2SI CNSNI/CNSNF/CNSNZ ATOSU/CNSNI GUNRO/CNSNI @@ -9250,22 +9269,22 @@ CBRSD/CBRSI CBRSG/CBRSI MENZI/CBRSI - SCNWI/SCNWF/SCNWM - SCNWA/SCNWI - SCNWB/SCNWI - SCNWC/SCNWI - SCNWI/SCNWF/SCNWM - SCNWA/SCNWI - SCNWB/SCNWI - SCNWC/SCNWI - SCNWI/SCNWF/SCNWM - SCNWA/SCNWI - SCNWB/SCNWI - SCNWC/SCNWI - SCNWI/SCNWF/SCNWM - SCNWA/SCNWI - SCNWB/SCNWI - SCNWC/SCNWI + SC2WI/SC2WF/SC2WM + SC2WA/SC2WI + SC2WB/SC2WI + SC2WC/SC2WI + SC2WI/SC2WF/SC2WM + SC2WA/SC2WI + SC2WB/SC2WI + SC2WC/SC2WI + SC2WI/SC2WF/SC2WM + SC2WA/SC2WI + SC2WB/SC2WI + SC2WC/SC2WI + SC2WI/SC2WF/SC2WM + SC2WA/SC2WI + SC2WB/SC2WI + SC2WC/SC2WI ANKUB/SSYWF/SSYWM SSYNI/SSYNF/SSYNM TONUX/SSYNI diff --git a/Positions.xml b/Positions.xml index 33cc554b..af552dd1 100644 --- a/Positions.xml +++ b/Positions.xml @@ -126,7 +126,7 @@ - + -25.725+150.343 @@ -163,7 +163,8 @@ - + + -16.000+126.986 @@ -325,8 +326,8 @@ - - + + -18.565+147.837 @@ -1437,7 +1438,7 @@ - + -27.3942+153.1218 @@ -1574,8 +1575,8 @@ - - + + @@ -1664,7 +1665,8 @@ - + + diff --git a/Sectors.xml b/Sectors.xml index 9b2cd7e7..84a64a89 100644 --- a/Sectors.xml +++ b/Sectors.xml @@ -351,6 +351,12 @@ CBA + + MKA + + + RKA + DNA @@ -367,9 +373,6 @@ LTA - - MKA - MLA MDN,MDS @@ -400,9 +403,6 @@ PHA - - RKA - SYA SAS,SFW,SFE,SDS,SDN diff --git a/Volumes.xml b/Volumes.xml index c82ad630..c4370569 100644 --- a/Volumes.xml +++ b/Volumes.xml @@ -894,37 +894,6 @@ -225859.000+1455231.000/ -220117.000+1454751.000 - - -345224.000+1491138.000/ - -345200.000+1493214.000/ - -345351.842+1493515.690/ - -345732.743+1493947.458/ - -350148.854+1494328.706/ - -350632.474+1494612.642/ - -351135.053+1494754.154/ - -351647.443+1494829.975/ - -352006.000+1494812.000/ - -353327.000+1492531.000/ - -354040.000+1491142.000/ - -345224.000+1491138.000 - - - -354040.000+1491142.000/ - -354549.000+1490148.000/ - -354503.790+1485906.427/ - -354250.444+1485316.554/ - -353949.566+1484800.902/ - -353606.735+1484329.134/ - -353148.811+1483949.504/ - -352703.712+1483708.607/ - -352200.168+1483531.190/ - -351647.443+1483500.025/ - -351135.053+1483535.846/ - -350920.000+1483619.000/ - -345232.000+1490600.000/ - -345224.000+1491138.000/ - -354040.000+1491142.000 - -350920.000+1483619.000/ -345232.000+1490600.000/ @@ -3276,45 +3245,6 @@ -314710.259+1155105.774/ -314722.000+1155043.000 - - -312042.000+1155734.000/ - -312114.605+1160453.212/ - -312251.448+1161159.329/ - -312529.640+1161839.623/ - -312904.457+1162442.097/ - -313329.473+1162955.829/ - -313836.743+1163411.291/ - -314417.035+1163720.638/ - -315020.095+1163917.957/ - -315634.948+1163959.463/ - -320250.226+1163923.641/ - -320854.511+1163731.321/ - -321436.679+1163425.684/ - -321946.251+1163012.198/ - -322413.715+1162458.467/ - -322750.833+1161854.019/ - -323030.902+1161210.014/ - -323208.970+1160458.898/ - -323242.000+1155734.000/ - -323208.970+1155009.102/ - -323030.902+1154257.986/ - -322750.833+1153613.981/ - -322413.715+1153009.533/ - -321946.251+1152455.802/ - -321436.679+1152042.316/ - -320854.511+1151736.679/ - -320250.226+1151544.359/ - -315634.948+1151508.537/ - -315020.095+1151550.043/ - -314417.035+1151747.362/ - -313836.743+1152056.709/ - -313329.473+1152512.171/ - -312904.457+1153025.903/ - -312529.640+1153628.377/ - -312251.448+1154308.671/ - -312114.605+1155014.788/ - -312042.000+1155734.000 - -322416.000+1162456.000/ -322413.715+1162458.467/ From 0fa0097ef3c777d7eaa812734353afa6622c9d93 Mon Sep 17 00:00:00 2001 From: Zach Date: Tue, 22 Nov 2022 21:43:20 +1100 Subject: [PATCH 16/22] more bug fixes --- AlertParameters.xml | 2 +- DefaultJurisdiction.xml | 6 +++--- Sectors.xml | 2 +- Volumes.xml | 3 --- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/AlertParameters.xml b/AlertParameters.xml index 6a48de84..a46e4e1d 100644 --- a/AlertParameters.xml +++ b/AlertParameters.xml @@ -5,7 +5,7 @@ - ADA,ADD,AVCTR,AVCTA,BNA,CBA,BAG_NORTH,BAG_SOUTH,CSA,DNA,MLA,PHA,SYA,WLMAPP,WLMAPPE,WLMAPPFG + ADA,BNA,CBA,BAG_NORTH,BAG_SOUTH,CSA,DNA,MLA,PHA,SYA,WLMAPP,WLMAPPE,WLMAPPFG -334244.4699+1510848.9368/ diff --git a/DefaultJurisdiction.xml b/DefaultJurisdiction.xml index 0c709e42..7b574a31 100644 --- a/DefaultJurisdiction.xml +++ b/DefaultJurisdiction.xml @@ -78,7 +78,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -330,7 +330,7 @@ - + diff --git a/Sectors.xml b/Sectors.xml index 84a64a89..67201e79 100644 --- a/Sectors.xml +++ b/Sectors.xml @@ -314,7 +314,7 @@ AAE - ADD + ADA AMBAPP diff --git a/Volumes.xml b/Volumes.xml index c4370569..13473247 100644 --- a/Volumes.xml +++ b/Volumes.xml @@ -4900,9 +4900,6 @@ AD_TMA_FULL - - AD_TMA_FULL - ADELAIDE_CONTROL_ZONE_(C) From ea2a222b87e38ea6535959d6cd3ff25f17aa9d2c Mon Sep 17 00:00:00 2001 From: Zach Date: Tue, 22 Nov 2022 21:44:50 +1100 Subject: [PATCH 17/22] bug fix --- Sectors.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Sectors.xml b/Sectors.xml index 67201e79..b37648ae 100644 --- a/Sectors.xml +++ b/Sectors.xml @@ -339,7 +339,7 @@ CSA - CSD + CS2 CSA @@ -358,6 +358,7 @@ RKA + DAW DNA From d0fbdd4c3c3f250b619206af82e2645ef081a721 Mon Sep 17 00:00:00 2001 From: Zach Date: Wed, 23 Nov 2022 13:47:36 +1100 Subject: [PATCH 18/22] remove atc assist link --- MET.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/MET.xml b/MET.xml index bddbe005..e2f5dfe6 100644 --- a/MET.xml +++ b/MET.xml @@ -8,7 +8,6 @@ - From 1c14d4f7028d2ae7d65e0e7faf52c609a0b8134c Mon Sep 17 00:00:00 2001 From: chrisg06 <64582286+chrisg06@users.noreply.github.com> Date: Sat, 26 Nov 2022 19:40:56 +0800 Subject: [PATCH 19/22] fix low sector freq maps --- Maps/SECTOR_FREQS.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Maps/SECTOR_FREQS.xml b/Maps/SECTOR_FREQS.xml index da4d6a25..7e75eed3 100644 --- a/Maps/SECTOR_FREQS.xml +++ b/Maps/SECTOR_FREQS.xml @@ -44,7 +44,7 @@ -272024.000+1372305.000 -354427.000+1215735.000 -303453.000+1142531.000 - -245100.000+1483800.000 + -245100.000+1483800.000 -305600.000+1185800.000 -323100.000+1185300.000 -341200.000+1163000.000 @@ -69,7 +69,7 @@ -174400.000+1251900.000 -183000.000+1342600.000 -300718.000+1484202.000 - -290800.000+1173200.000 + -290800.000+1173200.000 -323353.316+1505441.400 -315422.644+1520919.296 -313900.000+1522700.000 From d44799af486102833a15a99758f4c0833e6edcff Mon Sep 17 00:00:00 2001 From: Zach Date: Tue, 29 Nov 2022 15:56:58 +1100 Subject: [PATCH 20/22] add shared ads-b stations from png and indo --- Radars.xml | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/Radars.xml b/Radars.xml index 5da07fa2..cd5130ed 100644 --- a/Radars.xml +++ b/Radars.xml @@ -572,4 +572,78 @@ -32.795 151.834444444444 + + + -8.51769 + 140.41450 + + + -4.53391 + 136.88863 + + + -7.98819 + 131.30682 + + + -10.16723 + 123.67067 + + + -9.66969 + 120.30008 + + + -8.25056 + 115.33301 + + + -8.13483 + 124.59743 + + + -6.97799 + 110.37279 + + + + -9.44388055555556 + 147.226391666667 + + + -9.44388055555556 + 147.226391666667 + + + -6.52627777777778 + 146.093055555556 + + + -4.5 + 142.5 + + + -4.41666666666667 + 152.833333333333 + + + -6.5 + 142.833333333333 + + + -2.05 + 145.283333333333 + + + -4.9 + 141.15 + + + -9.45532222222222 + 147.164572222222 + \ No newline at end of file From c8973a5d58067b95db5fe57e3d4ca0910022223e Mon Sep 17 00:00:00 2001 From: Zach Date: Wed, 30 Nov 2022 11:41:30 +1100 Subject: [PATCH 21/22] add sepcalc --- MET.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/MET.xml b/MET.xml index e2f5dfe6..685a0da6 100644 --- a/MET.xml +++ b/MET.xml @@ -10,6 +10,7 @@ + From 21759ed9ef85db08dde19a67fcc84edf6b08a7ef Mon Sep 17 00:00:00 2001 From: Pip <92968130+codepip55@users.noreply.github.com> Date: Wed, 30 Nov 2022 17:04:35 +0100 Subject: [PATCH 22/22] update TRT volume --- Volumes.xml | 64 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 10 deletions(-) diff --git a/Volumes.xml b/Volumes.xml index c4370569..83078fed 100644 --- a/Volumes.xml +++ b/Volumes.xml @@ -4050,7 +4050,7 @@ -434348.000+1455148.000/ -424756.000+1422850.000 - + -123955.000+1280111.000/ -122603.000+1261925.000/ -120000.000+1232000.000/ @@ -4058,6 +4058,36 @@ -092000.000+1265000.000/ -081924.000+1302716.000/ -094839.000+1313025.000/ + -100127.000+1313932.000/ + -114524.000+1305423.000/ + -114600.370+1304717.308/ + -114748.385+1304024.457/ + -115044.783+1303356.909/ + -115444.242+1302806.377/ + -115939.528+1302303.476/ + -120521.716+1301857.408/ + -121140.454+1301555.679/ + -121824.272+1301403.870/ + -122520.924+1301325.461/ + -123217.762+1301401.716/ + -123902.114+1301551.630/ + -124521.670+1301851.953/ + -125104.862+1302257.272/ + -125601.216+1302800.173/ + -130001.679+1303351.453/ + -130258.896+1304020.408/ + -130258.896+1304020.408/ + -150544.000+1295421.000/ + -150501.832+1295411.197/ + -145222.520+1292627.790/ + -143513.169+1290129.733/ + -141406.015+1284003.065/ + -134940.535+1282246.646/ + -132242.109+1281011.048/ + -125400.537+1280237.779/ + -123955.000+1280111.000 + + -100127.000+1313932.000/ -100422.061+1314628.498/ -101519.656+1321034.984/ @@ -4093,14 +4123,28 @@ -152148.238+1295629.486/ -151520.000+1295433.000/ -150544.000+1295421.000/ - -150501.832+1295411.197/ - -145222.520+1292627.790/ - -143513.169+1290129.733/ - -141406.015+1284003.065/ - -134940.535+1282246.646/ - -132242.109+1281011.048/ - -125400.537+1280237.779/ - -123955.000+1280111.000 + -130258.896+1304020.408/ + -130447.444+1304715.153/ + -130524.000+1305423.000/ + -130447.444+1310130.847/ + -130258.896+1310825.592/ + -130001.679+1311454.547/ + -125601.216+1312045.827/ + -125104.862+1312548.728/ + -124521.670+1312954.047/ + -123902.114+1313254.370/ + -123217.762+1313444.284/ + -122520.924+1313520.539/ + -121824.272+1313442.130/ + -121140.454+1313250.321/ + -120521.716+1312948.592/ + -115939.528+1312542.524/ + -115444.242+1312039.623/ + -115044.783+1311449.091/ + -114748.385+1310821.543/ + -114600.370+1310128.692/ + -114524.000+1305423.000/ + -100127.000+1313932.000 -183839.000+1464530.000/ @@ -5348,7 +5392,7 @@ TINDAL_A_CONTROL_ZONE_(C) - TERRITORY + TRT_A,TRT_B DARWIN_CTA_C4