From 1ec1e00bde37e24cb78f1da5d637a9d26d905260 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 17 Apr 2025 21:19:01 +0200 Subject: [PATCH 1/2] Germany CW map - ATIS Germany map - UTILS magnetic declination --- Moose Development/Moose/Ops/ATIS.lua | 6 +++++- Moose Development/Moose/Utilities/Utils.lua | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua index 70f4f0848..f53f953d0 100644 --- a/Moose Development/Moose/Ops/ATIS.lua +++ b/Moose Development/Moose/Ops/ATIS.lua @@ -501,6 +501,7 @@ ATIS.Alphabet = { -- @field #number Kola +15° (East). -- @field #number Afghanistan +3° (East). -- @field #number Iraq +4.4° (East). +-- @field #number GermanyCW +0.1° (East). ATIS.RunwayM2T = { Caucasus = 0, Nevada = 12, @@ -513,7 +514,8 @@ ATIS.RunwayM2T = { SinaiMap = 5, Kola = 15, Afghanistan = 3, - Iraq=4.4 + Iraq=4.4, + GermanyCW=0.1, } --- Whether ICAO phraseology is used for ATIS broadcasts. @@ -530,6 +532,7 @@ ATIS.RunwayM2T = { -- @field #boolean Kola true. -- @field #boolean Afghanistan true. -- @field #boolean Iraq true. +-- @field #boolean GermanyCW true. ATIS.ICAOPhraseology = { Caucasus = true, Nevada = false, @@ -543,6 +546,7 @@ ATIS.ICAOPhraseology = { Kola = true, Afghanistan = true, Iraq = true, + GermanyCW = true, } --- Nav point data. diff --git a/Moose Development/Moose/Utilities/Utils.lua b/Moose Development/Moose/Utilities/Utils.lua index 9e0e60514..361e786d5 100644 --- a/Moose Development/Moose/Utilities/Utils.lua +++ b/Moose Development/Moose/Utilities/Utils.lua @@ -58,6 +58,7 @@ BIGSMOKEPRESET = { -- @field #string Kola Kola map. -- @field #string Afghanistan Afghanistan map -- @field #string Iraq Iraq map +-- @field #string GermanyCW Germany Cold War map DCSMAP = { Caucasus="Caucasus", NTTR="Nevada", @@ -70,7 +71,8 @@ DCSMAP = { Sinai="SinaiMap", Kola="Kola", Afghanistan="Afghanistan", - Iraq="Iraq" + Iraq="Iraq", + GermanyCW="GermanyCW", } @@ -1759,7 +1761,9 @@ end -- * Sinai +4.8 (East) -- * Kola +15 (East) - note there is a lot of deviation across the map (-1° to +24°), as we are close to the North pole -- * Afghanistan +3 (East) - actually +3.6 (NW) to +2.3 (SE) --- @param #string map (Optional) Map for which the declination is returned. Default is from env.mission.theatre +-- * Iraq +4.4 (East) +-- * Germany Cold War +0.1 (East) - near Fulda +-- @param #string map (Optional) Map for which the declination is returned. Default is from `env.mission.theatre`. -- @return #number Declination in degrees. function UTILS.GetMagneticDeclination(map) @@ -1791,6 +1795,8 @@ function UTILS.GetMagneticDeclination(map) declination=3 elseif map==DCSMAP.Iraq then declination=4.4 + elseif map==DCSMAP.GermanyCW then + declination=0.1 else declination=0 end @@ -2024,6 +2030,10 @@ function UTILS.GMTToLocalTimeDifference() return 3 -- Currently map is +2 but should be +3 (DCS bug?) elseif theatre==DCSMAP.Afghanistan then return 4.5 -- UTC +4:30 + elseif theatre==DCSMAP.Iraq then + return 3.0 -- UTC +3 + elseif theatre==DCSMAP.GermanyCW then + return 1.0 -- UTC +1 Central European Time (not summer time) else BASE:E(string.format("ERROR: Unknown Map %s in UTILS.GMTToLocal function. Returning 0", tostring(theatre))) return 0 From be4beea9d0b23ba01686495dc54be26e257dc8c6 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 17 Apr 2025 21:34:01 +0200 Subject: [PATCH 2/2] Update Airbase.lua MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Removed umlauts and ß in airbase names --- Moose Development/Moose/Wrapper/Airbase.lua | 38 ++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 301c79a4f..206b4a5b6 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -1115,11 +1115,11 @@ AIRBASE.Iraq = { AIRBASE.GermanyCW = { ["Airracing_Frankfurt"] = "Airracing Frankfurt", ["Airracing_Koblenz"] = "Airracing Koblenz", - ["Airracing_Luebeck"] = "Airracing Lübeck", + ["Airracing_Luebeck"] = "Airracing Lubeck", ["Allstedt"] = "Allstedt", ["Alt_Daber"] = "Alt Daber", ["Altes_Lager"] = "Altes Lager", - ["Bad_Duerkheim"] = "Bad Dürkheim", + ["Bad_Duerkheim"] = "Bad Durkheim", ["Barth"] = "Barth", ["Bienenfarm"] = "Bienenfarm", ["Bindersleben"] = "Bindersleben", @@ -1127,8 +1127,8 @@ AIRBASE.GermanyCW = { ["Braunschweig"] = "Braunschweig", ["Bremen"] = "Bremen", ["Briest"] = "Briest", - ["Buechel"] = "Büchel", - ["Bueckeburg"] = "Bückeburg", + ["Buechel"] = "Buchel", + ["Bueckeburg"] = "Buckeburg", ["Celle"] = "Celle", ["Cochstedt"] = "Cochstedt", ["Damgarten"] = "Damgarten", @@ -1144,11 +1144,11 @@ AIRBASE.GermanyCW = { ["Gelnhausen"] = "Gelnhausen", ["Giebelstadt"] = "Giebelstadt", ["Glindbruchkippe_"] = "Glindbruchkippe ", - ["Gross_Doelln"] = "Groß Dölln", - ["Gross_Mohrdorf"] = "Groß Mohrdorf", - ["Grosse_Wiese"] = "Große Wiese", - ["Gaerz"] = "Gärz", - ["Guetersloh"] = "Gütersloh", + ["Gross_Doelln"] = "Gross Dolln", + ["Gross_Mohrdorf"] = "Gross Mohrdorf", + ["Grosse_Wiese"] = "Grosse Wiese", + ["Gaerz"] = "Garz", + ["Guetersloh"] = "Gutersloh", ["H_FRG_01"] = "H FRG 01", ["H_FRG_02"] = "H FRG 02", ["H_FRG_03"] = "H FRG 03", @@ -1267,31 +1267,31 @@ AIRBASE.GermanyCW = { ["Hockenheim"] = "Hockenheim", ["Holzdorf"] = "Holzdorf", ["Kammermark"] = "Kammermark", - ["Koethen"] = "Köthen", + ["Koethen"] = "Kothen", ["Laage"] = "Laage", ["Langenselbold"] = "Langenselbold", ["Leipzig_Halle"] = "Leipzig Halle", ["Leipzig_Mockau"] = "Leipzig Mockau", - ["Laerz"] = "Lärz", - ["Luebeck"] = "Lübeck", - ["Lueneburg"] = "Lüneburg", + ["Laerz"] = "Larz", + ["Luebeck"] = "Lubeck", + ["Lueneburg"] = "Luneburg", ["Mahlwinkel"] = "Mahlwinkel", ["Mendig"] = "Mendig", ["Merseburg"] = "Merseburg", ["Neubrandenburg"] = "Neubrandenburg", ["Neuruppin"] = "Neuruppin", ["Northeim"] = "Northeim", - ["Ober_Moerlen"] = "Ober-Mörlen", + ["Ober_Moerlen"] = "Ober-Morlen", ["Obermehler_Schlotheim"] = "Obermehler Schlotheim", ["Parchim"] = "Parchim", - ["Peenemuende"] = "Peenemünde", + ["Peenemuende"] = "Peenemunde", ["Pferdsfeld"] = "Pferdsfeld", ["Pinnow"] = "Pinnow", - ["Pottschutthoehe"] = "Pottschutthöhe", + ["Pottschutthoehe"] = "Pottschutthohe", ["Ramstein"] = "Ramstein", ["Rinteln"] = "Rinteln", ["Schweinfurt"] = "Schweinfurt", - ["Schoenefeld"] = "Schönefeld", + ["Schoenefeld"] = "Schonefeld", ["Sembach"] = "Sembach", ["Spangdahlem"] = "Spangdahlem", ["Sperenberg"] = "Sperenberg", @@ -1306,13 +1306,13 @@ AIRBASE.GermanyCW = { ["Walldorf"] = "Walldorf", ["Waren_Vielist"] = "Waren Vielist", ["Werneuchen"] = "Werneuchen", - ["Weser_Wuemme"] = "Weser Wümme", + ["Weser_Wuemme"] = "Weser Wumme", ["Wiesbaden"] = "Wiesbaden", ["Wismar"] = "Wismar", ["Worms"] = "Worms", ["Wunstorf"] = "Wunstorf", ["Zerbst"] = "Zerbst", - ["Zweibruecken"] = "Zweibrücken", + ["Zweibruecken"] = "Zweibrucken", }