b612/astro
1
1
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

moon buf fix

Browse Source
This commit is contained in:
兔子 2019-11-04 19:18:45 +08:00
parent 11702093ed
commit 08fcbf9f89
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
astro.go
View File

@ -148,6 +148,9 @@ func MoonRiseTime(jde, lon, lat, timezone float64, aero bool) (time.Time, error)
tz = 1 tz = 1
} }
tm := basic.GetMoonRiseTime(jde, lon, lat, timezone, tz) tm := basic.GetMoonRiseTime(jde, lon, lat, timezone, tz)
if tm == -3 {
err = errors.New("非今日")
}
if tm == -2 { if tm == -2 {
err = errors.New("极夜") err = errors.New("极夜")
} }
@ -172,6 +175,9 @@ func MoonDownTime(jde, lon, lat, timezone float64, aero bool) (time.Time, error)
tz = 1 tz = 1
} }
tm := basic.GetMoonDownTime(jde, lon, lat, timezone, tz) tm := basic.GetMoonDownTime(jde, lon, lat, timezone, tz)
if tm == -3 {
err = errors.New("非今日")
}
if tm == -2 { if tm == -2 {
err = errors.New("极夜") err = errors.New("极夜")
} }

26
basic/moon.go
View File

@ -1402,7 +1402,7 @@ func GetMoonRiseTime(JD, Lon, Lat, TZ, ZS float64) float64 {
ntz := TZ ntz := TZ
TZ = Lon / 15 TZ = Lon / 15
var An, tms float64 = 0, 0 var An, tms float64 = 0, 0
JD = math.Floor(JD) + 0.5 //求0时JDE JD = math.Floor(JD) + 0.5 - ntz/24 + TZ/24 //求0时JDE
JD1 := JD JD1 := JD
moonheight := MoonHeight(JD, Lon, Lat, TZ) //求此时月亮高度 moonheight := MoonHeight(JD, Lon, Lat, TZ) //求此时月亮高度
if ZS != 0 { if ZS != 0 {
@ -1415,19 +1415,19 @@ func GetMoonRiseTime(JD, Lon, Lat, TZ, ZS float64) float64 {
} else { } else {
tms = (180 - moonang) / 15 tms = (180 - moonang) / 15
} }
JD1 += (tms/24 + (tms/24*12.0)/15/24) JD1 += (tms/24 + (tms/24*12.0)/15.0/24.0)
} }
if moonheight < 0 && moonang > 180 { if moonheight < 0 && moonang > 180 {
tms = (180 - moonang) / 15 tms = (180 - moonang) / 15
JD1 += (tms/24 + (tms/24*12.0)/15/24) JD1 += (tms/24 + (tms/24*12.0)/15.0/24.0)
} else if moonheight < 0 && moonang < 180 { } else if moonheight < 0 && moonang < 180 {
tms = (-180 + moonang) / 15 tms = (-180 + moonang) / 15
JD1 += (tms/24 + (tms/24*12.0)/15/24) JD1 += (tms/24 + (tms/24*12.0)/15.0/24.0)
} }
now := MoonTimeAngle(JD1, Lon, Lat, TZ) now := MoonTimeAngle(JD1, Lon, Lat, TZ)
if math.Abs(now-180) > 0.5 { if math.Abs(now-180) > 0.5 {
JD1 += (180 - now) * 4 / 60 / 24 JD1 += (180 - now) * 4.0 / 60.0 / 24.0
} }
hei := MoonHeight(JD1, Lon, Lat, TZ) hei := MoonHeight(JD1, Lon, Lat, TZ)
if !(hei < -10 && math.Abs(Lat) < 60) { if !(hei < -10 && math.Abs(Lat) < 60) {
@ -1464,7 +1464,7 @@ func GetMoonDownTime(JD, Lon, Lat, TZ, ZS float64) float64 {
ntz := TZ ntz := TZ
TZ = Lon / 15 TZ = Lon / 15
var An, tms float64 = 0, 0 var An, tms float64 = 0, 0
JD = math.Floor(JD) + 0.5 //求0时JDE JD = math.Floor(JD) + 0.5 - ntz/24 + TZ/24 //求0时JDE
JD1 := JD JD1 := JD
moonheight := MoonHeight(JD, Lon, Lat, TZ) //求此时月亮高度 moonheight := MoonHeight(JD, Lon, Lat, TZ) //求此时月亮高度
if ZS != 0 { if ZS != 0 {
@ -1473,34 +1473,34 @@ func GetMoonDownTime(JD, Lon, Lat, TZ, ZS float64) float64 {
moonang := MoonTimeAngle(JD, Lon, Lat, TZ) moonang := MoonTimeAngle(JD, Lon, Lat, TZ)
if moonheight < 0 { //月亮在地平线上或在落下与下中天之间 if moonheight < 0 { //月亮在地平线上或在落下与下中天之间
tms = (360 - moonang) / 15 tms = (360 - moonang) / 15
JD1 += (tms/24 + (tms/24*12.0)/15/24) JD1 += (tms/24 + (tms/24.0*12.0)/15.0/24.0)
} }
if moonheight > 0 && moonang < 180 { if moonheight > 0 && moonang < 180 {
tms = (-moonang) / 15 tms = (-moonang) / 15
JD1 += (tms/24 + (tms/24*12.0)/15/24) JD1 += (tms/24.0 + (tms/24.0*12.0)/15.0/24.0)
} else if moonheight > 0 { } else if moonheight > 0 {
tms = (360 - moonang) / 15 tms = (360 - moonang) / 15
JD1 += (tms/24 + (tms/24*12.0)/15/24) JD1 += (tms/24.0 + (tms/24.0*12.0)/15.0/24.0)
} }
now := MoonTimeAngle(JD1, Lon, Lat, TZ) now := MoonTimeAngle(JD1, Lon, Lat, TZ)
if now < 180 { if now < 180 {
now += 360 now += 360
} }
if math.Abs(now-360) > 0.5 { if math.Abs(now-360) > 0.5 {
JD1 += (360 - now) * 4 / 60 / 24 JD1 += (360 - now) * 4.0 / 60.0 / 24.0
} }
hei := MoonHeight(JD1, Lon, Lat, TZ) hei := MoonHeight(JD1, Lon, Lat, TZ)
if !(hei > 10 && math.Abs(Lat) < 60) { if !(hei > 10 && math.Abs(Lat) < 60) {
if hei < An { if hei < An {
return -2 //沉 return -2 //沉
} }
if MoonHeight(JD1+12/24+6/15/24, Lon, Lat, TZ) > An { if MoonHeight(JD1+12.0/24.0+6.0/15.0/24.0, Lon, Lat, TZ) > An {
return -1 //拱 return -1 //拱
} }
} }
dec := MoonSeeDec(JD1, Lon, Lat, TZ) dec := MoonSeeDec(JD1, Lon, Lat, TZ)
SJ := (ArcCos(-Tan(Lat) * Tan(dec))) / 15 SJ := (ArcCos(-Tan(Lat) * Tan(dec))) / 15.0
JD1 += SJ/24 + SJ/33/15 JD1 += SJ/24 + SJ/33.0/15.0
for { for {
JD0 := JD1 JD0 := JD1
stDegree := HMoonHeight(JD0, Lon, Lat, TZ) - An stDegree := HMoonHeight(JD0, Lon, Lat, TZ) - An

6
moon/moon.go
View File

@ -133,6 +133,9 @@ func RiseTime(jde, lon, lat, timezone float64, aero bool) (float64, error) {
tz = 1 tz = 1
} }
tm := basic.GetMoonRiseTime(jde, lon, lat, timezone, tz) tm := basic.GetMoonRiseTime(jde, lon, lat, timezone, tz)
if tm == -3 {
err = errors.New("非今日")
}
if tm == -2 { if tm == -2 {
err = errors.New("极夜") err = errors.New("极夜")
} }
@ -157,6 +160,9 @@ func DownTime(jde, lon, lat, timezone float64, aero bool) (float64, error) {
tz = 1 tz = 1
} }
tm := basic.GetMoonDownTime(jde, lon, lat, timezone, tz) tm := basic.GetMoonDownTime(jde, lon, lat, timezone, tz)
if tm == -3 {
err = errors.New("非今日")
}
if tm == -2 { if tm == -2 {
err = errors.New("极夜") err = errors.New("极夜")
} }