FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

xxx

Browse Source
This commit is contained in:
Applevangelist 2023-12-14 11:10:12 +01:00
parent 38e1ef95a3
commit f948a07d44
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Moose Development/Moose/Core/Point.lua
View File

@ -24,7 +24,8 @@
do -- COORDINATE do -- COORDINATE
---
-- @type COORDINATE -- @type COORDINATE
-- @field #string ClassName Name of the class -- @field #string ClassName Name of the class
-- @field #number x Component of the 3D vector. -- @field #number x Component of the 3D vector.
@ -3107,13 +3108,16 @@ do -- COORDINATE
-- @return #COORDINATE self -- @return #COORDINATE self
function COORDINATE:NewFromMGRSString( MGRSString ) function COORDINATE:NewFromMGRSString( MGRSString )
local myparts = UTILS.Split(MGRSString," ") local myparts = UTILS.Split(MGRSString," ")
UTILS.PrintTableToLog(myparts,1) local northing = tostring(myparts[5]) or ""
local easting = tostring(myparts[4]) or ""
if string.len(easting) < 5 then easting = easting..string.rep("0",5-string.len(easting)) end
if string.len(northing) < 5 then northing = northing..string.rep("0",5-string.len(northing)) end
local MGRS = { local MGRS = {
UTMZone = myparts[2], UTMZone = myparts[2],
MGRSDigraph = myparts[3], MGRSDigraph = myparts[3],
Easting = tonumber(myparts[4]), Easting = easting,
Northing = tonumber(myparts[5]), Northing = northing,
} }
local lat, lon = coord.MGRStoLL(MGRS) local lat, lon = coord.MGRStoLL(MGRS)
local point = coord.LLtoLO(lat, lon, 0) local point = coord.LLtoLO(lat, lon, 0)
local coord = COORDINATE:NewFromVec2({x=point.x,y=point.z}) local coord = COORDINATE:NewFromVec2({x=point.x,y=point.z})
@ -3124,10 +3128,12 @@ do -- COORDINATE
-- @param #COORDINATE self -- @param #COORDINATE self
-- @param #string UTMZone UTM Zone, e.g. "37T" -- @param #string UTMZone UTM Zone, e.g. "37T"
-- @param #string MGRSDigraph Digraph, e.g. "DK" -- @param #string MGRSDigraph Digraph, e.g. "DK"
-- @param #number Easting Meters easting -- @param #string Easting Meters easting - string in order to allow for leading zeros, e.g. "01234". Should be 5 digits.
-- @param #number Northing Meters northing -- @param #string Northing Meters northing - string in order to allow for leading zeros, e.g. "12340". Should be 5 digits.
-- @return #COORDINATE self -- @return #COORDINATE self
function COORDINATE:NewFromMGRS( UTMZone, MGRSDigraph, Easting, Northing ) function COORDINATE:NewFromMGRS( UTMZone, MGRSDigraph, Easting, Northing )
if string.len(Easting) < 5 then Easting = Easting..string.rep("0",5-string.len(Easting) )end
if string.len(Northing) < 5 then Northing = Northing..string.rep("0",5-string.len(Northing) )end
local MGRS = { local MGRS = {
UTMZone = UTMZone, UTMZone = UTMZone,
MGRSDigraph = MGRSDigraph, MGRSDigraph = MGRSDigraph,

6
Moose Development/Moose/Ops/OpsZone.lua
View File

@ -97,7 +97,7 @@ OPSZONE.ZoneType={
--- OPSZONE class version. --- OPSZONE class version.
-- @field #string version -- @field #string version
OPSZONE.version="0.6.0" OPSZONE.version="0.6.1"
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- ToDo list -- ToDo list
@ -1277,7 +1277,7 @@ function OPSZONE:EvaluateZone()
if Nblu>0 then if Nblu>0 then
if not self:IsAttacked() then if not self:IsAttacked() and self.Tnut>=self.threatlevelCapture then
self:Attacked(coalition.side.BLUE) self:Attacked(coalition.side.BLUE)
end end
@ -1329,7 +1329,7 @@ function OPSZONE:EvaluateZone()
if Nred>0 then if Nred>0 then
if not self:IsAttacked() then if not self:IsAttacked() and self.Tnut>=self.threatlevelCapture then
-- Red is attacking blue zone. -- Red is attacking blue zone.
self:Attacked(coalition.side.RED) self:Attacked(coalition.side.RED)
end end