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

xx

Browse Source
This commit is contained in:
Applevangelist 2024-08-13 09:49:48 +02:00
parent a1605f9a2d
commit 093a60050b
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2669,9 +2669,9 @@ do -- COORDINATE
local date=UTILS.GetDCSMissionDate() local date=UTILS.GetDCSMissionDate()
-- Debug output. -- Debug output.
--self:I(string.format("Sun rise at lat=%.3f long=%.3f on %s (DayOfYear=%d): %s (%d sec of the day) (GMT %d)", Latitude, Longitude, date, DayOfYear, tostring(UTILS.SecondsToClock(sunrise)), sunrise, Tdiff)) self:I(string.format("Sun rise at lat=%.3f long=%.3f on %s (DayOfYear=%d): %s (%d sec of the day) (GMT %d)", Latitude, Longitude, date, DayOfYear, tostring(UTILS.SecondsToClock(sunrise)), sunrise, Tdiff))
if InSeconds then if InSeconds or type(sunrise) == "string" then
return sunrise return sunrise
else else
return UTILS.SecondsToClock(sunrise, true) return UTILS.SecondsToClock(sunrise, true)
@ -2837,9 +2837,9 @@ do -- COORDINATE
local date=UTILS.GetDCSMissionDate() local date=UTILS.GetDCSMissionDate()
-- Debug output. -- Debug output.
--self:I(string.format("Sun set at lat=%.3f long=%.3f on %s (DayOfYear=%d): %s (%d sec of the day) (GMT %d)", Latitude, Longitude, date, DayOfYear, tostring(UTILS.SecondsToClock(sunrise)), sunrise, Tdiff)) self:I(string.format("Sun set at lat=%.3f long=%.3f on %s (DayOfYear=%d): %s (%d sec of the day) (GMT %d)", Latitude, Longitude, date, DayOfYear, tostring(UTILS.SecondsToClock(sunrise)), sunrise, Tdiff))
if InSeconds then if InSeconds or type(sunrise) == "string" then
return sunrise return sunrise
else else
return UTILS.SecondsToClock(sunrise, true) return UTILS.SecondsToClock(sunrise, true)

24
Moose Development/Moose/Ops/ATIS.lua
View File

@ -1975,17 +1975,23 @@ function ATIS:onafterBroadcast( From, Event, To )
local hours = self.gettext:GetEntry("HOURS",self.locale) local hours = self.gettext:GetEntry("HOURS",self.locale)
local sunrise = coord:GetSunrise() local sunrise = coord:GetSunrise()
sunrise = UTILS.Split( sunrise, ":" ) local SUNRISE = "no time"
local SUNRISE = string.format( "%s%s", sunrise[1], sunrise[2] ) if tostring(sunrise) ~= "N/R" then
if self.useSRS then sunrise = UTILS.Split( sunrise, ":" )
SUNRISE = string.format( "%s %s %s", sunrise[1], sunrise[2], hours ) SUNRISE = string.format( "%s%s", sunrise[1], sunrise[2] )
if self.useSRS then
SUNRISE = string.format( "%s %s %s", sunrise[1], sunrise[2], hours )
end
end end
local sunset = coord:GetSunset() local sunset = coord:GetSunset()
sunset = UTILS.Split( sunset, ":" ) local SUNSET = "no time"
local SUNSET = string.format( "%s%s", sunset[1], sunset[2] ) if tostring(sunset) ~= "N/S" then
if self.useSRS then sunset = UTILS.Split( sunset, ":" )
SUNSET = string.format( "%s %s %s", sunset[1], sunset[2], hours ) SUNSET = string.format( "%s%s", sunset[1], sunset[2] )
if self.useSRS then
SUNSET = string.format( "%s %s %s", sunset[1], sunset[2], hours )
end
end end
--------------------------------- ---------------------------------