Skip to content

Commit

Permalink
Fixes #5524 - Update S18->PN agreements (#5544)
Browse files Browse the repository at this point in the history 
* Updated S18->PN agreements, adjusted guest ownershops in Paris

* Changed my approach to this issue - made this agreement more in line with internal procedures

* Following review, improvements and removed elements without functional benefit

* LFFF Low fix in TC SE Paris agreements

---------

Co-authored-by: Peter Mooney <61326713+PLM1995@users.noreply.github.com>
Co-authored-by: Harry <12017284+hazzas-99@users.noreply.github.com>
  • Loading branch information
@cpawley @PLM1995 @hazzas-99
3 people authored Dec 23, 2024
1 parent 0486f23 commit e289460
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 101 deletions.
1 change: 1 addition & 0 deletions .github/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
12. AIRAC (2413) - Added Cranwell (EGYD) MID Fixes - thanks to @aidenbok203 (Aiden Bok)
13. AIRAC (2413) - Changed Waddington (EGXW) Frequencies - thanks to @aidenbok203 (Aiden Bok)
14. Bug - Corrected TC NE -> TC East Standing Agreements - thanks to @quassbutreally
15. Bug - Reformatted London S18->Paris North agreements for LFOP/LFOB inbounds - thanks to @cpawley (Chris Pawley)

# Changes from release 2024/11 to 2024/12
1. AIRAC (2412) - Corrected Luton (EGGW) Tug Release Point V orientation - thanks to @AdriTheDev (Callum Hicks)
Expand Down
69 changes: 33 additions & 36 deletions Agreements/External/18_PN.txt
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,38 @@
FIR_COPX:*:*:XIDIL:LFPG:*:London S18:LFFF Low (245-295):*:26000:XIDIL
FIR_COPX:*:*:XIDIL:LFPB:*:London S18:LFFF Low (245-295):*:26000:XIDIL
FIR_COPX:*:*:XIDIL:LFPT:*:London S18:LFFF Low (245-295):*:26000:XIDIL
FIR_COPX:*:*:XIDIL:LFPG:*:London S18:LFFF Low:*:26000:XIDIL
FIR_COPX:*:*:XIDIL:LFPB:*:London S18:LFFF Low:*:26000:XIDIL
FIR_COPX:*:*:XIDIL:LFPT:*:London S18:LFFF Low:*:26000:XIDIL

FIR_COPX:*:*:XIDIL:*:*:London S18:LFFF Low (245-295):*:*:XIDIL
FIR_COPX:*:*:XIDIL:LFOB:*:London S18:LFFF Low:*:19000:XIDIL
FIR_COPX:*:*:XIDIL:LFOP:*:London S18:LFFF Low:*:19000:XIDIL

FIR_COPX:*:*:XIDIL:LFOB:*:London S18:LFFF Low (DB-245):*:19000:XIDIL
FIR_COPX:*:*:XIDIL:LFOP:*:London S18:LFFF Low (DB-245):*:19000:XIDIL
FIR_COPX:*:*:SITET:LFBH:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFBI:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFBL:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFBU:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFBX:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFLA:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFLX:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFPO:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFPV:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFPN:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFPM:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFJR:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFRM:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFOD:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFOF:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFOQ:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFOR:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFOT:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFOU:*:London S18:LFFF Low:*:27000:SITET
FIR_COPX:*:*:SITET:LFOZ:*:London S18:LFFF Low:*:27000:SITET

FIR_COPX:*:*:XIDIL:*:*:London S18:LFFF Low (DB-245):*:*:XIDIL
FIR_COPX:*:*:SITET:LFRG:*:London S18:LFFF Low:*:13000:COORD
FIR_COPX:*:*:SITET:LFRK:*:London S18:LFFF Low:*:13000:COORD
FIR_COPX:*:*:SITET:LFOH:*:London S18:LFFF Low:*:13000:COORD
FIR_COPX:*:*:SITET:LFOE:*:London S18:LFFF Low:*:13000:COORD

FIR_COPX:*:*:SITET:LFBH:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFBI:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFBL:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFBU:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFBX:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFLA:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFLX:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFPO:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFPV:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFPN:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFPM:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFJR:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFRM:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFOD:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFOF:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFOQ:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFOR:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFOT:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFOU:*:London S18:LFFF Low (245-295):*:27000:SITET
FIR_COPX:*:*:SITET:LFOZ:*:London S18:LFFF Low (245-295):*:27000:SITET

FIR_COPX:*:*:SITET:LFRG:*:London S18:LFFF Low (DB-245):*:13000:COORD
FIR_COPX:*:*:SITET:LFRK:*:London S18:LFFF Low (DB-245):*:13000:COORD
FIR_COPX:*:*:SITET:LFOH:*:London S18:LFFF Low (DB-245):*:13000:COORD
FIR_COPX:*:*:SITET:LFOE:*:London S18:LFFF Low (DB-245):*:13000:COORD

;These 'catch-all' COPX are affecting LTMA dep COPX display

;FIR_COPX:*:*:SITET:*:*:London S18:LFFF Low (245-295):*:*:SITET
;FIR_COPX:*:*:SITET:*:*:London S18:LFFF Low (DB-245):*:*:SITET
;These 'catch-all' COPX are affecting LTMA dep COPX display - turned on again following 2413 changes to check for issues
;FIR_COPX:*:*:XIDIL:*:*:London S18:LFFF Low:*:*:XIDIL
;FIR_COPX:*:*:SITET:*:*:London S18:LFFF Low:*:*:SITET
;You can find them at the end of 18_RR-E.txt to failsafe after all S18 agreements with France.
50 changes: 26 additions & 24 deletions Agreements/External/18_RR-E.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,34 @@ FIR_COPX:EGHH:*:*:ETRAT:*:London S18:LFRR E:29000:*:^SITET

;Additional lines if EuroScope predicts 290 by SITET/XAMAB will not be achieved

FIR_COPX:EGLL:*:*:XAMAB:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGWU:*:*:XAMAB:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGGW:*:*:XAMAB:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGKK:*:*:XAMAB:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGLC:*:*:XAMAB:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGKB:*:*:XAMAB:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGMC:*:*:XAMAB:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGTO:*:*:XAMAB:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGLF:*:*:XAMAB:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGHI:*:*:XAMAB:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGHH:*:*:XAMAB:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGLL:*:*:XAMAB:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGWU:*:*:XAMAB:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGGW:*:*:XAMAB:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGKK:*:*:XAMAB:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGLC:*:*:XAMAB:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGKB:*:*:XAMAB:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGMC:*:*:XAMAB:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGTO:*:*:XAMAB:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGLF:*:*:XAMAB:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGHI:*:*:XAMAB:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGHH:*:*:XAMAB:*:London S18:LFFF Low:29000:*:COORD

FIR_COPX:EGLL:*:*:ETRAT:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGWU:*:*:ETRAT:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGGW:*:*:ETRAT:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGKK:*:*:ETRAT:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGLC:*:*:ETRAT:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGKB:*:*:ETRAT:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGMC:*:*:ETRAT:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGTO:*:*:ETRAT:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGLF:*:*:ETRAT:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGHI:*:*:ETRAT:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGHH:*:*:ETRAT:*:London S18:LFFF Low (245-295):29000:*:COORD
FIR_COPX:EGLL:*:*:ETRAT:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGWU:*:*:ETRAT:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGGW:*:*:ETRAT:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGKK:*:*:ETRAT:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGLC:*:*:ETRAT:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGKB:*:*:ETRAT:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGMC:*:*:ETRAT:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGTO:*:*:ETRAT:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGLF:*:*:ETRAT:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGHI:*:*:ETRAT:*:London S18:LFFF Low:29000:*:COORD
FIR_COPX:EGHH:*:*:ETRAT:*:London S18:LFFF Low:29000:*:COORD

;'Catch-all' COPX
;'Catch-all' COPX for to LFFF Low
FIR_COPX:*:*:XIDIL:*:*:London S18:LFFF Low:*:*:XIDIL
FIR_COPX:*:*:SITET:*:*:London S18:LFFF Low:*:*:SITET

;'Catch-all' COPX
FIR_COPX:*:*:*:XAMAB:*:London S18:LFRR E:*:*:XAMAB

FIR_COPX:*:*:*:ETRAT:*:London S18:LFRR E:*:*:SITET
48 changes: 24 additions & 24 deletions Agreements/External/PN_17.txt
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
FIR_COPX:*:*:SOSUN:EGGW:*:LFFF Low (245-295):London S17:*:28000:SOSUN
FIR_COPX:*:*:SOSUN:EGHI:*:LFFF Low (245-295):London S17:*:28000:SOSUN
FIR_COPX:*:*:SOSUN:EGHH:*:LFFF Low (245-295):London S17:*:28000:SOSUN
FIR_COPX:*:*:SOSUN:EGLF:*:LFFF Low (245-295):London S17:*:28000:SOSUN
FIR_COPX:*:*:SOSUN:EGSC:*:LFFF Low (245-295):London S17:*:28000:SOSUN
FIR_COPX:*:*:SOSUN:EGSS:*:LFFF Low (245-295):London S17:*:28000:SOSUN
FIR_COPX:*:*:SOSUN:EGGW:*:LFFF Low:London S17:*:28000:SOSUN
FIR_COPX:*:*:SOSUN:EGHI:*:LFFF Low:London S17:*:28000:SOSUN
FIR_COPX:*:*:SOSUN:EGHH:*:LFFF Low:London S17:*:28000:SOSUN
FIR_COPX:*:*:SOSUN:EGLF:*:LFFF Low:London S17:*:28000:SOSUN
FIR_COPX:*:*:SOSUN:EGSC:*:LFFF Low:London S17:*:28000:SOSUN
FIR_COPX:*:*:SOSUN:EGSS:*:LFFF Low:London S17:*:28000:SOSUN

FIR_COPX:*:*:KESAX:EGKK:*:LFFF Low (245-295):London S17:*:28000:KESAX
FIR_COPX:*:*:KESAX:EGKK:*:LFFF Low:London S17:*:28000:KESAX

FIR_COPX:*:*:KESAX:EGHL:*:LFFF Low (245-295):London S17:*:28000:KESAX
FIR_COPX:*:*:KESAX:EGLF:*:LFFF Low (245-295):London S17:*:28000:KESAX
FIR_COPX:*:*:KESAX:EGLK:*:LFFF Low (245-295):London S17:*:28000:KESAX
FIR_COPX:*:*:KESAX:EGHI:*:LFFF Low (245-295):London S17:*:28000:KESAX
FIR_COPX:*:*:KESAX:EGHH:*:LFFF Low (245-295):London S17:*:28000:KESAX
FIR_COPX:*:*:KESAX:EGTF:*:LFFF Low (245-295):London S17:*:28000:KESAX
FIR_COPX:*:*:KESAX:EGVO:*:LFFF Low (245-295):London S17:*:28000:KESAX
FIR_COPX:*:*:KESAX:EGHL:*:LFFF Low:London S17:*:28000:KESAX
FIR_COPX:*:*:KESAX:EGLF:*:LFFF Low:London S17:*:28000:KESAX
FIR_COPX:*:*:KESAX:EGLK:*:LFFF Low:London S17:*:28000:KESAX
FIR_COPX:*:*:KESAX:EGHI:*:LFFF Low:London S17:*:28000:KESAX
FIR_COPX:*:*:KESAX:EGHH:*:LFFF Low:London S17:*:28000:KESAX
FIR_COPX:*:*:KESAX:EGTF:*:LFFF Low:London S17:*:28000:KESAX
FIR_COPX:*:*:KESAX:EGVO:*:LFFF Low:London S17:*:28000:KESAX

FIR_COPX:*:*:KESAX:EGKA:*:LFFF Low (DB-245):London S17:*:20000:KESAX
FIR_COPX:*:*:KESAX:EGKA:*:LFFF Low:London S17:*:20000:KESAX

FIR_COPX:*:*:KESAX:EGGW:*:LFFF Low (245-295):London S17:*:26000:KESAX
FIR_COPX:*:*:KESAX:EGSS:*:LFFF Low (245-295):London S17:*:26000:KESAX
FIR_COPX:*:*:KESAX:EGSC:*:LFFF Low (245-295):London S17:*:26000:KESAX
FIR_COPX:*:*:KESAX:EGGW:*:LFFF Low:London S17:*:26000:KESAX
FIR_COPX:*:*:KESAX:EGSS:*:LFFF Low:London S17:*:26000:KESAX
FIR_COPX:*:*:KESAX:EGSC:*:LFFF Low:London S17:*:26000:KESAX

FIR_COPX:*:*:ABNUR:EGLL:*:LFFF Low (245-295):London S17:*:28000:ABNUR
FIR_COPX:*:*:ABNUR:EGWU:*:LFFF Low (245-295):London S17:*:28000:ABNUR
FIR_COPX:*:*:ABNUR:EGLL:*:LFFF Low:London S17:*:28000:ABNUR
FIR_COPX:*:*:ABNUR:EGWU:*:LFFF Low:London S17:*:28000:ABNUR

FIR_COPX:*:*:RINTI:*:*:LFFF Low (DB-245):London S17:*:*:RINTI
FIR_COPX:*:*:MOTOX:*:*:LFFF Low (DB-245):London S17:*:*:MOTOX
FIR_COPX:*:*:BNE:*:*:LFFF Low (DB-245):London S17:*:*:BNE
FIR_COPX:*:*:ABB:*:*:LFFF Low (DB-245):London S17:*:*:ABB
FIR_COPX:*:*:RINTI:*:*:LFFF Low:London S17:*:*:RINTI
FIR_COPX:*:*:MOTOX:*:*:LFFF Low:London S17:*:*:MOTOX
FIR_COPX:*:*:BNE:*:*:LFFF Low:London S17:*:*:BNE
FIR_COPX:*:*:ABB:*:*:LFFF Low:London S17:*:*:ABB
18 changes: 9 additions & 9 deletions Agreements/External/PN_TCSE.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FIR_COPX:*:*:RATUK:EGLC:*:LFFF Low (DB-245):London TC SE:*:19000:RATUK
FIR_COPX:*:*:RATUK:EGKB:*:LFFF Low (DB-245):London TC SE:*:19000:RATUK
FIR_COPX:*:*:RATUK:EGTO:*:LFFF Low (DB-245):London TC SE:*:19000:RATUK
FIR_COPX:*:*:RATUK:EGMC:*:LFFF Low (DB-245):London TC SE:*:19000:RATUK
FIR_COPX:*:*:RATUK:EGMD:*:LFFF Low (DB-245):London TC SE:*:19000:RATUK
FIR_COPX:*:*:RATUK:EGLC:*:LFFF Low:London TC SE:*:19000:RATUK
FIR_COPX:*:*:RATUK:EGKB:*:LFFF Low:London TC SE:*:19000:RATUK
FIR_COPX:*:*:RATUK:EGTO:*:LFFF Low:London TC SE:*:19000:RATUK
FIR_COPX:*:*:RATUK:EGMC:*:LFFF Low:London TC SE:*:19000:RATUK
FIR_COPX:*:*:RATUK:EGMD:*:LFFF Low:London TC SE:*:19000:RATUK

FIR_COPX:*:*:RATUK:*:*:LFFF Low (DB-245):London TC SE:*:*:RATUK
FIR_COPX:*:*:SOVAT:*:*:LFFF Low (DB-245):London TC SE:*:*:SOVAT
FIR_COPX:*:*:DEVAL:*:*:LFFF Low (DB-245):London TC SE:*:*:DEVAL
FIR_COPX:*:*:IRKUN:*:*:LFFF Low (DB-245):London TC SE:*:*:IRKUN
FIR_COPX:*:*:RATUK:*:*:LFFF Low:London TC SE:*:*:RATUK
FIR_COPX:*:*:SOVAT:*:*:LFFF Low:London TC SE:*:*:SOVAT
FIR_COPX:*:*:DEVAL:*:*:LFFF Low:London TC SE:*:*:DEVAL
FIR_COPX:*:*:IRKUN:*:*:LFFF Low:London TC SE:*:*:IRKUN
9 changes: 1 addition & 8 deletions Sector Ownership/Non-UK/Paris.txt
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
SECTOR:LFFF Low:0:0
OWNER:PN:P
BORDER:LSFF:LFRR_LFFF:LFFF-N:LFFF_EBBU:LDFF01:LDFF02:LDM03:LDM05:LDM07:LDM08:LDM09a:LDM09b:LDM10

SECTOR:LFFF Low (DB-245):0:24500
OWNER:PN:P
BORDER:LSFF:LFRR_LFFF:LFFF-N:LFFF_EBBU:LDFF01:LDFF02:LDM03:LDM05:LDM07:LDM08:LDM09a:LDM09b:LDM10

SECTOR:LFFF Low (245-295):24500:29500
SECTOR:LFFF Low (DB-295):0:29500
OWNER:PN:P
BORDER:LSFF:LFRR_LFFF:LFFF-N:LFFF_EBBU:LDFF01:LDFF02:LDM03:LDM05:LDM07:LDM08:LDM09a:LDM09b:LDM10
GUEST:EEN:EGKK:*
GUEST:EEN:EGGW:*
GUEST:EE:EGKK:*
GUEST:EE:EGGW:*
GUEST:P:EGKK:*
GUEST:P:EGGW:*

SECTOR:La Manche East (High) (265-285):26500:28500
OWNER:PN:P
Expand Down

0 comments on commit e289460

Please sign in to comment.