Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
@grumpypixel
grumpypixel committed Dec 9, 2021
2 parents 109a466 + 3182c38 commit cae28f0
Show file tree
Hide file tree
Showing 11 changed files with 4,922 additions and 2,954 deletions.
10 changes: 8 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,13 @@ Run GoPilot:
$ gopilot.exe
```

Or run GoPilot with your own configuration file:
Or explicitly specify the config file:

```console
$ gopilot.exe --cfg configs/config.yml
```

Or run with your own configuration file:

```console
$ gopilot.exe --cfg configs/my-config-file.yml
Expand All @@ -60,7 +66,7 @@ Airport Finder:\
## Web Server API

The following routes are available:
* `/` or `/vfrmap` opens the VFR map
* `/vfrmap` or `/` opens the VFR map
* `/airports` opens the Airport Finder
* `/teleport` opens the Teleport Service. Be advised not to teleport yourself into the ground mistakenly.
* `/mehmap` opens a plain & simple map without distractions. (No HUD. No nothing. Meh.)
Expand Down
9 changes: 7 additions & 2 deletions cmd/gopilot/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"msfs2020-gopilot/internal/filepacker"
"os"
"path"
"runtime/debug"
"time"

"github.com/common-nighthawk/go-figure"
Expand Down Expand Up @@ -46,6 +47,12 @@ func init() {
func main() {
welcome()

defer func() {
if r := recover(); r != nil {
log.Warnf("stacktrace from panic: %s", string(debug.Stack()))
}
}()

var configFilePath string
flag.StringVar(&configFilePath, "cfg", defaultConfigFilePath, "Config file location")
flag.Parse()
Expand All @@ -60,8 +67,6 @@ func main() {

log.SetLevel(getLogLevel(cfg.LogLevel))

log.Trace("TRACE!!!!")

if err := checkInstallation(cfg.SimConnectDLLPath); err != nil {
log.Fatal(err)
}
Expand Down
94 changes: 52 additions & 42 deletions data/ourairports/airport-frequencies.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,6 @@
71831,4614,"BKPR","RMP","RAMP OPR",136.8
71832,4614,"BKPR","TWR","TWR",120.125
302091,41087,"CA-0088","UNIC","Traffic",123.2
318124,45216,"CA-0120","MF","Voisey's Bay",123.2
75491,41098,"CA-0159","ATF","Pontiac Traffic, 5nm below 3300 ASL",123.2
75492,41098,"CA-0159","VFR Advisory","Ottawa Terminal",127.7
301854,39950,"CA-0304","MF",,123.2
Expand All @@ -334,7 +333,6 @@
299261,40039,"CA-0393","CTAF","Upper Kent Traffic",122.8
75409,46495,"CA-0430","CTAF",,123.2
75472,46580,"CA-0444","ATF",,122.8
75496,46599,"CA-0445","CTAF",,122.8
311013,46642,"CA-0454","CTAF",,122.8
75565,46648,"CA-0456","CTAF",,123.4
298582,298348,"CA-0457","RDO","MADELEINE RDO",123.15
Expand All @@ -347,9 +345,9 @@
316871,308539,"CA-0523","CPR1",,123.4
309842,309767,"CA-0524","CTAF",,123
309277,309272,"CA-0526","UNICOM",,122.9
309276,309273,"CA-0527","UNICOM",,122.9
311165,311164,"CA-0534","CTAF","Lac William",123.2
311166,311164,"CA-0534","Ground","Sol Lac William",122.9
300442,46513,"CA-0772","ATF","Shuswap Traffic, 5nm below 4200ASL",123.2
58952,16551,"CA20","CTAF","CTAF",122.9
59673,16573,"CA42","CTAF","CTAF",122.9
69894,16591,"CA60","CTAF","CTAF",122.9
Expand All @@ -374,6 +372,7 @@
50879,629,"CAL3","ATF","ATF",123.2
300222,631,"CAM3","ATF",,122.8
75495,46598,"CAM4","CTAF",,122.8
75496,46598,"CAM4","CTAF",,122.8
50919,632,"CAM5","ATF","ATF",123.2
50554,637,"CAQ5","ATF","ATF",123.2
75516,46600,"CAR5","CTAF",,123.4
Expand Down Expand Up @@ -588,6 +587,10 @@
75410,46498,"CMW3","CTAF",,123.2
311602,311601,"CMZ2","ATF","Arthur Traffic, 3NM below 4600ASL",123.4
321592,44158,"CN-0080","TOWER",,130
51273,27224,"CN-0164","APP","QINGDAO",119.4
51274,27224,"CN-0164","ATIS","ATIS",127.2
51275,27224,"CN-0164","GND","QINGDAO GND",121.65
51276,27224,"CN-0164","TWR","QINGDAO TWR",118.7
49915,1286,"CNA3","APP","TORONTO CNTR",124.025
49916,1286,"CNA3","UNIC","ATF/UNICOM",123
75170,1289,"CNA8","ATF","Winchester Traffic",122.8
Expand Down Expand Up @@ -673,6 +676,8 @@
75177,1407,"CPG5","ATF",,123.2
75517,1409,"CPG7","CTAF",,123.4
75216,1412,"CPH2","ATF",,122.8
350130,1425,"CPK7","RCO","Quebec Radio",123.15
350131,1425,"CPK7","TWR","Ottawa Tower",118.8
75506,46601,"CPK9","CTAF",,123.4
75169,1427,"CPL3","ATF",,123.4
50002,1429,"CPL5","ATF","ATF",123.2
Expand All @@ -699,6 +704,7 @@
50891,1480,"CPZ3","OPS","TRENTON MIL ADVSY",122.35
50892,1480,"CPZ3","TWR","TRENTON TWR",128.7
75527,1481,"CRB2","CTAF",,122.9
309276,1483,"CRB5","UNICOM",,122.9
75530,44372,"CRJ2","CTAF",,122.9
75531,1494,"CRML","CTAF",,122.9
300232,300230,"crt2","UNICOM ltd hrs O",,122.8
Expand Down Expand Up @@ -732,7 +738,6 @@
50405,1538,"CSM3","ARR","MONTREAL CNTR",132.35
50406,1538,"CSM3","UNIC","ATF/UNICOM",122.8
298853,1550,"CSP6","CTAF",,123.2
300442,46513,"CSQ2","ATF","Shuswap Traffic, 5nm below 4200ASL",123.2
50087,1551,"CSQ3","UNIC","ATF/UNICOM",122.8
50972,1552,"CSR3","A/D","MONTREAL CNTR",132.35
50973,1552,"CSR3","UNIC","ATF/UNICOM",123
Expand All @@ -759,6 +764,7 @@
332257,313805,"CTN7","CTAF","Canton Traffic",123.2
49877,1617,"CTT5","ATF","ATF",123.5
75559,44471,"cvb2","MF","Voisey's Bay",123.2
318124,44471,"cvb2","MF","Voisey's Bay",123.2
75519,46627,"CVF2","CTAF",,123.2
299278,299277,"cwf2","CTAF",,123.2
75494,46596,"CYAB","MF",,122.1
Expand Down Expand Up @@ -1852,9 +1858,10 @@
59866,19598,"D38","UNIC","CTAF/UNICOM",122.8
48293,2048,"DAAD","TWR","TWR",118.1
48258,2049,"DAAE","TWR","BEJAIA TWR",118.9
48275,2050,"DAAG","APP","ALGER APP",121.4
48276,2050,"DAAG","GND","ALGER GND",121.8
48277,2050,"DAAG","TWR","ALGER TWR",118.7
48275,2050,"DAAG","APP","ALGIERS APP",121.4
348255,2050,"DAAG","CCR","ALGIERS CCR",127.3
48276,2050,"DAAG","GND","ALGIERS GND",121.8
48277,2050,"DAAG","TWR","ALGIERS TWR",118.7
48262,2051,"DAAJ","RDO","DJANET RDO",889.4
48263,2051,"DAAJ","TWR","DJANET TWR",118.1
48266,2054,"DAAP","TWR","TWR",118.7
Expand Down Expand Up @@ -1932,6 +1939,13 @@
53100,2209,"DE-0440","GND","GND",121.6
53101,2209,"DE-0440","INFO","INFO",122.7
53102,2209,"DE-0440","TWR","TWR",120.025
52776,2215,"DE-0456","AFIS","BERLIN INFO",132.65
52777,2215,"DE-0456","APP","BERLIN ARR",119.625
52778,2215,"DE-0456","ATIS","ATIS",126.025
52779,2215,"DE-0456","DEP","BERLIN DEP",120.625
52780,2215,"DE-0456","DIR","BERLIN DIR",136.1
52781,2215,"DE-0456","GND","GND",121.95
52782,2215,"DE-0456","TWR","TWR",119.575
69167,17150,"DE49","UNIC","UNICOM",123
71597,2088,"DFFD","A/G","AG VOICE OUAGA RDO",120.3
71598,2088,"DFFD","APP","OUAGA APP",118.1
Expand Down Expand Up @@ -2045,7 +2059,7 @@
312322,30962,"EBAR","Info",,123.425
322464,30963,"EBAV","Info","Avernas Radio",129.975
49362,2152,"EBAW","APP","BRUSSELS APP",118.255
311681,2152,"EBAW","ATIS",,122.405
311681,2152,"EBAW","ATIS",,124.205
49363,2152,"EBAW","GND","ANTWERPEN GND",121.905
49364,2152,"EBAW","TWR","ANTWERPEN TWR",135.205
298605,2153,"EBBE","APP","Combined MIL Approach",122.5
Expand Down Expand Up @@ -2118,7 +2132,7 @@
49318,2167,"EBUL","AFIS","RDO",135.125
49321,2168,"EBWE","AFIS","RDO",120.225
311683,29056,"EBZH","INFO","Hasselt Radio",118.33
49319,2169,"EBZR","INFO","INFO",123.8
49319,2169,"EBZR","INFO","Zoersel RADIO",123.805
316565,29058,"EBZU","Info",,123.425
316057,29059,"EBZW","CTAF","Genk radio",120.4
52828,2183,"EDAB","AFIS","MUNCHEN RADAR",125.625
Expand Down Expand Up @@ -2231,13 +2245,6 @@
53115,2214,"EDDH","RDR","BREMEN RADAR",134.25
53116,2214,"EDDH","RMP","APRON",121.7
53117,2214,"EDDH","TWR","TWR",126.85
52776,2215,"EDDI","AFIS","BERLIN INFO",132.65
52777,2215,"EDDI","APP","BERLIN ARR",119.625
52778,2215,"EDDI","ATIS","ATIS",126.025
52779,2215,"EDDI","DEP","BERLIN DEP",120.625
52780,2215,"EDDI","DIR","BERLIN DIR",136.1
52781,2215,"EDDI","GND","GND",121.95
52782,2215,"EDDI","TWR","TWR",119.575
52897,2216,"EDDK","ATIS","ATIS",112.15
334376,2216,"EDDK","ATIS",,132.13
52898,2216,"EDDK","CLD","CLNC DEL",121.85
Expand Down Expand Up @@ -2439,6 +2446,7 @@
307319,28571,"EDNG","TOWER","Giengen Info",122.35
52927,2255,"EDNL","AFIS","MUNCHEN INFO",126.95
52928,2255,"EDNL","INFO","INFO",122.875
349406,28738,"EDNU","Thannhausen Info",,118.18
298334,29078,"EDNX","AFIS","Muenchen Information",126.95
298333,29078,"EDNX","INFO","Schleissheim Info",131.13
53131,2256,"EDNY","APP","ZURICH ARR",119.925
Expand Down Expand Up @@ -2693,6 +2701,7 @@
52055,2331,"EFME","CTAF","RDO",123.5
52070,2332,"EFMI","AFIS","AFIS",123
52071,2332,"EFMI","ATIS","ATIS",118.25
349446,310896,"EFML","Info",,120.65
310796,27263,"EFMN","ACC","Tampere radar",132.325
310795,27263,"EFMN","RDO","Mäntsälä traffic",123.5
310817,27270,"EFNS","ACC","Tampere radar",127.1
Expand Down Expand Up @@ -3163,6 +3172,7 @@
58130,2468,"EGPO","TWR","TWR",119.48
71905,29173,"EGPR","AFIS","Barra AFIS",118.075
332962,29174,"EGPS","A/G","Longside Radio",118.28
317946,29174,"EGPS","Info","Lomgside radio",130.575
71972,29175,"EGPT","A/G","Perth Scone A/G",121.08
58370,2469,"EGPU","INFO","AFIS",122.705
71994,29176,"EGPW","A/G","Unst A/G",130.35
Expand Down Expand Up @@ -3831,8 +3841,8 @@
56211,2615,"EPLK","AFIS","INFO",128.5
56220,2616,"EPLL","INFO","INFO",122.7
56221,2616,"EPLL","TWR","TWR",124.225
56237,2617,"EPLU","AAS","AERO",122.4
56238,2617,"EPLU","INFO","INFO",122.7
349578,2617,"EPLU","FIS POZNAŃ INFO","POZNAŃ INFORMATION",127.25
56237,2617,"EPLU","RADIO","LUBIN RADIO",122.405
56198,2618,"EPMB","INFO","INFO",124.5
56199,2619,"EPMI","AFIS","INFO",128.5
56226,2620,"EPML","AFIS","TEST",119.1
Expand Down Expand Up @@ -4390,6 +4400,8 @@
57039,2856,"FAWK","GND","GND",121.85
57040,2856,"FAWK","TWR","TWR",124.1
57144,2857,"FAWM","RDO","RDO",118
299606,299605,"FAWT","CTAF","Winterveldt Traffic",124.8
299607,299605,"FAWT","Lowvelt Military","Lowvelt information",119
57095,2858,"FAYP","APP","CAPE TOWN APP",119.7
57096,2858,"FAYP","GND","GND",121.85
57097,2858,"FAYP","TWR","TWR",125.6
Expand Down Expand Up @@ -4736,7 +4748,6 @@
327816,316634,"GB-0240","A/G",,130.43
316820,316818,"GB-0248","SafetyCom",,135.475
317886,317885,"GB-0279","A/G","Stoke Golding Base",129.825
317946,317945,"GB-0286","Info","Lomgside radio",130.575
319034,319032,"GB-0316","Info","Napps Traffic",135.475
319138,319137,"GB-0341","A/G","Garton Radio",122.075
319350,319348,"GB-0357","SafetyCom","Bute Traffic",135.475
Expand Down Expand Up @@ -5028,6 +5039,8 @@
70379,17623,"HI01","CTAF","CTAF",122.9
70380,17623,"HI01","RCO","NORTH KAUI RDO",122.3
70381,17623,"HI01","UNIC","UNICOM",122.8
312873,3247,"HJJJ","HF",,11.3
57373,3247,"HJJJ","TWR","APP/TWR",118.4
54845,3205,"HKEL","APP","APP",119.4
54846,3205,"HKEL","RDR","RADAR",121.1
54847,3205,"HKEL","TWR","TWR",118.4
Expand Down Expand Up @@ -5088,14 +5101,12 @@
57385,3244,"HSNN","TWR","TWR/APP",118.1
57380,3245,"HSOB","TWR","TWR/APP",118.5
57375,3246,"HSPN","TWR/APP","Port Sudan Tower",128.1
312873,3247,"HSSJ","HF",,11.3
57373,3247,"HSSJ","TWR","APP/TWR",118.4
57377,3249,"HSSK","APP","Khartoum Approach",124.7
57378,3249,"HSSK","EMR","FIRE",121.9
300665,3249,"HSSK","North Area","North Sector",125.4
300666,3249,"HSSK","South Area","South Sector",127.3
57379,3249,"HSSK","TWR","Khartoum Tower",119.2
57381,3248,"HSSM","INFO","INFO",118.2
57377,3249,"HSSS","APP","Khartoum Approach",124.7
57378,3249,"HSSS","EMR","FIRE",121.9
300665,3249,"HSSS","North Area","North Sector",125.4
300666,3249,"HSSS","South Area","South Sector",127.3
57379,3249,"HSSS","TWR","Khartoum Tower",119.2
323049,30553,"HSWW","INFO",,119.2
58070,3250,"HTAR","TWR","TWR",118.4
58079,3251,"HTDA","ACC","CON",119.3
Expand Down Expand Up @@ -5132,10 +5143,6 @@
316840,17665,"I32","CTAF","CTAF",122.7
329617,310904,"ID-0121","ATS",,122.4
329613,325374,"ID-0176","ATS",,122.2
314718,41380,"ID-KWB","NDB","KJ",0.336
314719,41380,"ID-KWB","SSB","Karimunjawa Radio",7.4
314717,41380,"ID-KWB","VHF","Dewadaru Info",121.3
314720,41380,"ID-KWB","VOR","KRJ",117.3
53616,3266,"ID-WA19","RDO","RDO",122.1
53607,3271,"ID-WA98","INFO","INFO",131.3
64882,17868,"ID92","CTAF","CTAF",122.9
Expand Down Expand Up @@ -19267,6 +19274,7 @@
57823,4567,"LTFE","ATIS","ATIS",128.5
57824,4567,"LTFE","GND","GND",121.95
57825,4567,"LTFE","TWR","TWR",120.5
346229,44487,"LTFG","TOWER",,119.25
57833,4568,"LTFH","APP","APP",118.175
57834,4568,"LTFH","ATIS","ATIS",129.35
57835,4568,"LTFH","GND","GND",121.7
Expand All @@ -19278,7 +19286,6 @@
333707,317457,"LTFM","Clearance","Istanbul Clearance Delivery",121.7
333706,317457,"LTFM","GROUND","Istanbul Ground",121.75
333705,317457,"LTFM","TOWER","Istanbul Tower",131.1
346229,44487,"LTGP","TOWER",,119.25
311698,43764,"LU-0002","AFIS","NOT OFFICIAL",119.5
55272,4570,"LUBL","TWR","TWR",122.3
55273,4571,"LUKK","APP","APP",125.9
Expand Down Expand Up @@ -19907,7 +19914,6 @@
52207,5008,"NTTP","AFIS","INFO",118.3
52193,5009,"NTTR","APP","TAHITI CON",134.7
52194,5009,"NTTR","TWR","TWR",118.5
342307,342305,"NULL","IVKR",,999.9
59790,23322,"NV11","APP","DREAMLAND APP",118.7
69315,23337,"NV27","CTAF","CTAF",122.9
70680,23340,"NV30","CTAF","CTAF",122.9
Expand Down Expand Up @@ -20403,7 +20409,7 @@
54005,5175,"OIKM","AFIS","INFO",124.15
54006,5175,"OIKM","GND","GND",121.9
54024,5176,"OIKP","TWR","TWR",123.15
53998,5177,"OIKQ","AFIS","INFO",118.05
53998,35276,"OIKQ","AFIS","INFO",118.05
54098,5178,"OIKR","AFIS","INFO",118.7
53999,5179,"OIKY","AFIS","INFO",123.25
54038,5180,"OIMB","AFIS","INFO",127.1
Expand Down Expand Up @@ -21389,6 +21395,8 @@
52168,5503,"PTYA","RDO","RDO",123.6
71807,5506,"PWAK","A/G","OPS AAS",128
71808,5506,"PWAK","RDO","OAKLAND OCEANIC",884.3
55001,5650,"QJP","ACP","BRICKWALL",120.5
55002,5650,"QJP","TWR","PO CHEON",36.1
58039,5509,"RCAY","APP","KAOHSIUNG APP",119.5
58040,5509,"RCAY","TWR","TWR",126.18
58004,5510,"RCBS","APP","TAICHUNG APP",124.6
Expand Down Expand Up @@ -21926,8 +21934,6 @@
55014,5649,"RKRN","GCA","GCA",144
55015,5649,"RKRN","GND","GND",51.15
55016,5649,"RKRN","TWR","TWR",123.5
55001,5650,"RKRO","ACP","BRICKWALL",120.5
55002,5650,"RKRO","TWR","PO CHEON",36.1
55085,5651,"RKRP","FCC","FCC EVENREACH",36.9
55086,5651,"RKRP","TWR","PA JU TWR",38
54931,5652,"RKSG","A/D","OSAN APP/DEP",127.9
Expand Down Expand Up @@ -23247,6 +23253,7 @@
53286,6364,"TFFG","AFIS","AFIS",119.2
53287,6364,"TFFG","APP","JULIANA APP",128.95
53288,6364,"TFFG","CTAF","CTAF",123.5
347963,32249,"TFFJ","AFIS","St. Barths Information",118.45
53284,6365,"TFFM","AFIS","AFIS",119.3
53285,6365,"TFFM","APP","RAIZET APP",121.3
53280,6366,"TFFR","APP","RAIZET APP",121.3
Expand Down Expand Up @@ -23846,6 +23853,11 @@
56621,26405,"UWKE","APP","APP",127.9
56622,26405,"UWKE","TWR","TWR",121.2
56848,26406,"UWKS","TWR","TWR",119.3
349966,35104,"UWLL","ATIS",,128.85
349970,35104,"UWLL","CTR","Ulyanovsk RADAR",120.8
349967,35104,"UWLL","GND",,121.8
349968,35104,"UWLL","START",,120.4
349969,35104,"UWLL","TWR",,131.3
56606,26407,"UWLW","APP","ULYANOVSK APP",127.3
56607,26407,"UWLW","RDR","KRUG",126.1
56608,26407,"UWLW","TWR","TWR",124.2
Expand Down Expand Up @@ -24479,6 +24491,10 @@
53697,26752,"WADS","A/G","INFO",118.1
53656,26753,"WADT","RDO","RDO",122.5
53686,26754,"WADW","AFIS","INFO",122.2
314718,42250,"WAHU","NDB","KJ",0.336
314719,42250,"WAHU","SSB","Karimunjawa Radio",7.4
314717,42250,"WAHU","VHF","Dewadaru Info",121.3
314720,42250,"WAHU","VOR","KRJ",117.3
53680,26755,"WAJJ","APP","JAYAPURA APP",119.1
53681,26755,"WAJJ","ATIS","ATIS",128.8
53682,26755,"WAJJ","INFO","JAYAPURA INFO",295.6
Expand Down Expand Up @@ -24647,7 +24663,7 @@
53724,26832,"WIHH","ARR","JAKARTA ARR",125.45
53725,26832,"WIHH","ATIS","ATIS",128.8
53726,26832,"WIHH","DIR","JAKARTA DIRECTOR",119.7
53727,26832,"WIHH","TWR","TWR",122.25
53727,26832,"WIHH","TWR","TWR",122.05
309331,26832,"WIHH","TWR","Tower Secondary",122.7
53600,26833,"WIHL","A/G","RDO",122.8
53716,26834,"WIHP","INFO","INFO",122.1
Expand Down Expand Up @@ -28753,8 +28769,6 @@
299602,299598,"ZA-0038","Under TMA","Hoedspruit",126.4
299611,41222,"ZA-0047","CTAF","Dundi Traffic",124.8
308976,41844,"ZA-0100","Radio","Bapsfontein Radio",120.35
299606,299605,"ZA-0104","CTAF","Winterveldt Traffic",124.8
299607,299605,"ZA-0104","Lowvelt Military","Lowvelt information",119
299615,299614,"ZA-0105","CTAF","Aviators Traffic",124.8
310577,310576,"ZA-0111","TIBA",,124.8
310579,310578,"ZA-0112","APP","Waterkloof Approach",124.1
Expand Down Expand Up @@ -28906,10 +28920,6 @@
51184,27223,"ZSPD","TWR","TWR02 EAST",118.4
51185,27223,"ZSPD","TWR","TWR01 17L/35R",118.8
314963,27223,"ZSPD","TWR","TWR03 RWY 17R/35L",124.35
51273,27224,"ZSQD","APP","QINGDAO",119.4
51274,27224,"ZSQD","ATIS","ATIS",127.2
51275,27224,"ZSQD","GND","QINGDAO GND",121.65
51276,27224,"ZSQD","TWR","QINGDAO TWR",118.7
51228,27225,"ZSSS","APP","SHANGHAI APP SCTR 2",119.75
51229,27225,"ZSSS","APP","SHANGHAI APP SCTR 1",120.3
51230,27225,"ZSSS","APP","SHANGHAI APP SCTR 3",121.3
Expand Down
Loading

0 comments on commit cae28f0

Please sign in to comment.