diff --git a/Moose Development/Moose/Core/Settings.lua b/Moose Development/Moose/Core/Settings.lua index eeaa3db81..671b4cfb0 100644 --- a/Moose Development/Moose/Core/Settings.lua +++ b/Moose Development/Moose/Core/Settings.lua @@ -335,7 +335,7 @@ do -- SETTINGS --- Sets the SETTINGS MGRS accuracy. -- @param #SETTINGS self - -- @param #number MGRS_Accuracy + -- @param #number MGRS_Accuracy 0 to 5 -- @return #SETTINGS function SETTINGS:SetMGRS_Accuracy( MGRS_Accuracy ) self.MGRS_Accuracy = MGRS_Accuracy diff --git a/Moose Development/Moose/Ops/PlayerTask.lua b/Moose Development/Moose/Ops/PlayerTask.lua index 897f40f71..13dde2c8f 100644 --- a/Moose Development/Moose/Ops/PlayerTask.lua +++ b/Moose Development/Moose/Ops/PlayerTask.lua @@ -3320,7 +3320,7 @@ end -- @param #PLAYERTASKCONTROLLER self -- @param Core.Set#SET_ZONE RejectZoneSet Add a zone to the reject zone set. -- @return #PLAYERTASKCONTROLLER self -function PLAYERTASKCONTROLLER:AddRejectZone(RejectZoneSet) +function PLAYERTASKCONTROLLER:AddRejectZoneSet(RejectZoneSet) self:T(self.lid.."AddRejectZoneSet") if self.Intel then self.Intel.rejectzoneset:AddSet(RejectZoneSet) @@ -3348,7 +3348,7 @@ end -- @param #PLAYERTASKCONTROLLER self -- @param Core.Zone#ZONE RejectZone Add a zone to the reject zone set. -- @return #PLAYERTASKCONTROLLER self -function PLAYERTASKCONTROLLER:RemoveRejectZone(RejectZone) +function PLAYERTASKCONTROLLER:RemoveRejectZoneSet(RejectZone) self:T(self.lid.."RemoveRejectZone") if self.Intel then self.Intel:RemoveRejectZone(RejectZone) diff --git a/Moose Development/Moose/Utilities/Utils.lua b/Moose Development/Moose/Utilities/Utils.lua index de5c63933..df656431b 100644 --- a/Moose Development/Moose/Utilities/Utils.lua +++ b/Moose Development/Moose/Utilities/Utils.lua @@ -606,10 +606,12 @@ end -- acc- the accuracy of each easting/northing. 0, 1, 2, 3, 4, or 5. UTILS.tostringMGRS = function(MGRS, acc) --R2.1 - if acc == 0 then + if acc <= 0 then return MGRS.UTMZone .. ' ' .. MGRS.MGRSDigraph else - + + if acc > 5 then acc = 5 end + -- Test if Easting/Northing have less than 4 digits. --MGRS.Easting=123 -- should be 00123 --MGRS.Northing=5432 -- should be 05432