From 6a04f83280a0fd85aac9865393845781f27bb9e6 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 19 Aug 2020 23:04:38 +0200 Subject: [PATCH] Syria MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ATIS - Added runway magnetic to true conversion. Channel map -10°, Syria +5°. - ICAOP phraseology The Channel and Syria true. UTILS - Added DCSMAP.Syria="Syria" - Magnetic declination for Syria set to 5° - GMT to local time for Syria is GMT+3. AIRBASE - Added AIRBASE.Syria enums. --- Moose Development/Moose/Ops/ATIS.lua | 12 +++- Moose Development/Moose/Utilities/Utils.lua | 8 ++- Moose Development/Moose/Wrapper/Airbase.lua | 74 +++++++++++++++++++++ 3 files changed, 91 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua index 04bf3cbc0..15e37ed47 100644 --- a/Moose Development/Moose/Ops/ATIS.lua +++ b/Moose Development/Moose/Ops/ATIS.lua @@ -366,11 +366,15 @@ ATIS.Alphabet = { -- @field #number Nevada +12° (East). -- @field #number Normandy -10° (West). -- @field #number PersianGulf +2° (East). +-- @field #number TheChannel -10° (West). +-- @field #number Syria +5° (East). ATIS.RunwayM2T={ Caucasus=0, Nevada=12, Normandy=-10, PersianGulf=2, + TheChannel=-10, + Syria=5, } --- Whether ICAO phraseology is used for ATIS broadcasts. @@ -379,11 +383,15 @@ ATIS.RunwayM2T={ -- @field #boolean Nevada false. -- @field #boolean Normandy true. -- @field #boolean PersianGulf true. +-- @field #boolean TheChannel true. +-- @field #boolean Syria true. ATIS.ICAOPhraseology={ Caucasus=true, Nevada=false, Normandy=true, - PersianGulf=true + PersianGulf=true, + TheChannel=true, + Syria=true, } --- Nav point data. @@ -554,7 +562,7 @@ _ATIS={} --- ATIS class version. -- @field #string version -ATIS.version="0.8.0" +ATIS.version="0.9.0" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- TODO list diff --git a/Moose Development/Moose/Utilities/Utils.lua b/Moose Development/Moose/Utilities/Utils.lua index 291994188..354a89221 100644 --- a/Moose Development/Moose/Utilities/Utils.lua +++ b/Moose Development/Moose/Utilities/Utils.lua @@ -49,12 +49,14 @@ BIGSMOKEPRESET = { -- @field #string NTTR Nevada Test and Training Range map. -- @field #string PersianGulf Persian Gulf map. -- @field #string TheChannel The Channel map. +-- @field #string Syria Syria map. DCSMAP = { Caucasus="Caucasus", NTTR="Nevada", Normandy="Normandy", PersianGulf="PersianGulf", TheChannel="TheChannel", + Syria="Syria", } @@ -1121,7 +1123,9 @@ function UTILS.GetMagneticDeclination(map) elseif map==DCSMAP.PersianGulf then declination=2 elseif map==DCSMAP.TheChannel then - declination=-10 + declination=-10 + elseif map==DCSMAP.Syria then + declination=5 else declination=0 end @@ -1248,6 +1252,8 @@ function UTILS.GMTToLocalTimeDifference() return 0 -- Calais UTC+1 hour elseif theatre==DCSMAP.TheChannel then return 2 -- This map currently needs +2 + elseif theatre==DCSMAP.Syria then + return 3 -- Damascus is UTC+3 hours else BASE:E(string.format("ERROR: Unknown Map %s in UTILS.GMTToLocal function. Returning 0", tostring(theatre))) return 0 diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 55c78a30c..0bd6321b6 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -314,6 +314,80 @@ AIRBASE.TheChannel = { ["Detling"] = "Detling", ["High_Halden"] = "High Halden", } + +--- Airbases of Syria +-- +-- * AIRBASE.Syria.Kuweires +-- * AIRBASE.Syria.Marj_Ruhayyil +-- * AIRBASE.Syria.Kiryat_Shmona +-- * AIRBASE.Syria.Marj_as_Sultan_North +-- * AIRBASE.Syria.Eyn_Shemer +-- * AIRBASE.Syria.Incirlik +-- * AIRBASE.Syria.Damascus +-- * AIRBASE.Syria.Bassel_Al_Assad +-- * AIRBASE.Syria.Aleppo +-- * AIRBASE.Syria.Qabr_as_Sitt +-- * AIRBASE.Syria.Wujah_Al_Hajar +-- * AIRBASE.Syria.Al_Dumayr +-- * AIRBASE.Syria.Hatay +-- * AIRBASE.Syria.Haifa +-- * AIRBASE.Syria.Khalkhalah +-- * AIRBASE.Syria.Megiddo +-- * AIRBASE.Syria.Rayak +-- * AIRBASE.Syria.Mezzeh +-- * AIRBASE.Syria.King_Hussein_Air_College +-- * AIRBASE.Syria.Jirah +-- * AIRBASE.Syria.Taftanaz +-- * AIRBASE.Syria.Rene_Mouawad +-- * AIRBASE.Syria.Ramat_David +-- * AIRBASE.Syria.Minakh +-- * AIRBASE.Syria.Adana_Sakirpasa +-- * AIRBASE.Syria.Marj_as_Sultan_South +-- * AIRBASE.Syria.Hama +-- * AIRBASE.Syria.Al_Qusayr +-- * AIRBASE.Syria.Palmyra +-- * AIRBASE.Syria.Tabqa +-- * AIRBASE.Syria.Beirut_Rafic_Hariri +-- * AIRBASE.Syria.An_Nasiriyah +-- * AIRBASE.Syria.Abu_al_Duhur +-- +-- @field Syria +AIRBASE.Syria={ + ["Kuweires"]="Kuweires", + ["Marj_Ruhayyil"]="Marj Ruhayyil", + ["Kiryat_Shmona"]="Kiryat Shmona", + ["Marj_as_Sultan_North"]="Marj as Sultan North", + ["Eyn_Shemer"]="Eyn Shemer", + ["Incirlik"]="Incirlik", + ["Damascus"]="Damascus", + ["Bassel_Al_Assad"]="Bassel Al-Assad", + ["Aleppo"]="Aleppo", + ["Qabr_as_Sitt"]="Qabr as Sitt", + ["Wujah_Al_Hajar"]="Wujah Al Hajar", + ["Al_Dumayr"]="Al-Dumayr", + ["Hatay"]="Hatay", + ["Haifa"]="Haifa", + ["Khalkhalah"]="Khalkhalah", + ["Megiddo"]="Megiddo", + ["Rayak"]="Rayak", + ["Mezzeh"]="Mezzeh", + ["King_Hussein_Air_College"]="King Hussein Air College", + ["Jirah"]="Jirah", + ["Taftanaz"]="Taftanaz", + ["Rene_Mouawad"]="Rene Mouawad", + ["Ramat_David"]="Ramat David", + ["Minakh"]="Minakh", + ["Adana_Sakirpasa"]="Adana Sakirpasa", + ["Marj_as_Sultan_South"]="Marj as Sultan South", + ["Hama"]="Hama", + ["Al_Qusayr"]="Al Qusayr", + ["Palmyra"]="Palmyra", + ["Tabqa"]="Tabqa", + ["Beirut_Rafic_Hariri"]="Beirut-Rafic Hariri", + ["An_Nasiriyah"]="An Nasiriyah", + ["Abu_al_Duhur"]="Abu al-Duhur", +} + --- AIRBASE.ParkingSpot ".Coordinate, ".TerminalID", ".TerminalType", ".TOAC", ".Free", ".TerminalID0", ".DistToRwy". -- @type AIRBASE.ParkingSpot