- fix: Correct sun.TrueBo calculation, now using basic.HSunTrueBo for correct solar latitude
- fix: Rename GetSunDownTime to GetSunSetTime in basic/sun.go and update related calls/outputs - fix: Update test cases to use new method and error constant names - improve: Rename all DownTime/Down functions to SetTime/Set for consistency - improve: Standardize ERR_XXX_NEVER_DOWN error constants to ERR_XXX_NEVER_SET, with ERR_XXX_NEVER_DOWN kept as compatibility alias - improve: More standard naming for interfaces and errors to improve maintainability and readability
This commit is contained in:
+19
-3
@@ -10,7 +10,9 @@ import (
|
||||
|
||||
var (
|
||||
ERR_STAR_NEVER_RISE = errors.New("ERROR:极夜,星星在今日永远在地平线下!")
|
||||
ERR_STAR_NEVER_DOWN = errors.New("ERROR:极昼,星星在今日永远在地平线上!")
|
||||
ERR_STAR_NEVER_SET = errors.New("ERROR:极昼,星星在今日永远在地平线上!")
|
||||
// ERR_STAR_NEVER_DOWN deprecated -- use ERR_STAR_NEVER_SET instead
|
||||
ERR_STAR_NEVER_DOWN = ERR_STAR_NEVER_SET
|
||||
)
|
||||
|
||||
// Constellation
|
||||
@@ -52,11 +54,12 @@ func RiseTime(date time.Time, ra, dec, lon, lat, height float64, aero bool) (tim
|
||||
err = ERR_STAR_NEVER_RISE
|
||||
}
|
||||
if riseJde == -1 {
|
||||
err = ERR_STAR_NEVER_DOWN
|
||||
err = ERR_STAR_NEVER_SET
|
||||
}
|
||||
return basic.JDE2DateByZone(riseJde, date.Location(), true), err
|
||||
}
|
||||
|
||||
// deprecated -- use SetTime instead
|
||||
// DownTime 星星降落时间
|
||||
//
|
||||
// date, 世界时(忽略此处时区)
|
||||
@@ -67,6 +70,19 @@ func RiseTime(date time.Time, ra, dec, lon, lat, height float64, aero bool) (tim
|
||||
// height,高度
|
||||
// aero,是否进行大气修正
|
||||
func DownTime(date time.Time, ra, dec, lon, lat, height float64, aero bool) (time.Time, error) {
|
||||
return SetTime(date, ra, dec, lon, lat, height, aero)
|
||||
}
|
||||
|
||||
// SetTime 星星降落时间
|
||||
//
|
||||
// date, 世界时(忽略此处时区)
|
||||
// ra,Date瞬时赤经
|
||||
// dec,Date瞬时赤纬
|
||||
// lon,经度,东正西负
|
||||
// lat,纬度,北正南负
|
||||
// height,高度
|
||||
// aero,是否进行大气修正
|
||||
func SetTime(date time.Time, ra, dec, lon, lat, height float64, aero bool) (time.Time, error) {
|
||||
var err error
|
||||
if date.Hour() > 12 {
|
||||
date = date.Add(time.Hour * -12)
|
||||
@@ -79,7 +95,7 @@ func DownTime(date time.Time, ra, dec, lon, lat, height float64, aero bool) (tim
|
||||
err = ERR_STAR_NEVER_RISE
|
||||
}
|
||||
if riseJde == -1 {
|
||||
err = ERR_STAR_NEVER_DOWN
|
||||
err = ERR_STAR_NEVER_SET
|
||||
}
|
||||
return basic.JDE2DateByZone(riseJde, date.Location(), true), err
|
||||
}
|
||||
|
||||
+1
-1
@@ -22,5 +22,5 @@ func TestStar(t *testing.T) {
|
||||
fmt.Println(tools.Format(ra/15, 1), tools.Format(dec, 0))
|
||||
fmt.Println(RiseTime(now, ra, dec, 115, 40, 0, true))
|
||||
fmt.Println(CulminationTime(now, ra, 115))
|
||||
fmt.Println(DownTime(now, ra, dec, 115, 40, 0, true))
|
||||
fmt.Println(SetTime(now, ra, dec, 115, 40, 0, true))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user