From 1ec1e00bde37e24cb78f1da5d637a9d26d905260 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 17 Apr 2025 21:19:01 +0200 Subject: [PATCH] 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