diff --git a/jupiter/jupiter.go b/jupiter/jupiter.go index 6851c0e..92533fe 100644 --- a/jupiter/jupiter.go +++ b/jupiter/jupiter.go @@ -11,7 +11,7 @@ import ( var ( ERR_JUPITER_NEVER_RISE = errors.New("ERROR:极夜,木星今日永远在地平线下!") ERR_JUPITER_NEVER_SET = errors.New("ERROR:极昼,木星今日永远在地平线上!") - // ERR_JUPITER_NEVER_DOWN deprecated -- use ERR_JUPITER_NEVER_SET instead + // ERR_JUPITER_NEVER_DOWN deprecated: -- use ERR_JUPITER_NEVER_SET instead ERR_JUPITER_NEVER_DOWN = ERR_JUPITER_NEVER_SET ) @@ -129,7 +129,7 @@ func RiseTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, e return basic.JDE2DateByZone(riseJde, date.Location(), true), err } -// deprecated -- use SetTime instead +// deprecated: -- use SetTime instead // DownTime 落下时间 // date,取日期,时区忽略 // lon,经度,东正西负 diff --git a/mars/mars.go b/mars/mars.go index e28fc25..f4db8bc 100644 --- a/mars/mars.go +++ b/mars/mars.go @@ -11,7 +11,7 @@ import ( var ( ERR_MARS_NEVER_RISE = errors.New("ERROR:极夜,火星今日永远在地平线下!") ERR_MARS_NEVER_SET = errors.New("ERROR:极昼,火星今日永远在地平线上!") - // ERR_MARS_NEVER_DOWN deprecated -- use ERR_MARS_NEVER_SET instead + // ERR_MARS_NEVER_DOWN deprecated: -- use ERR_MARS_NEVER_SET instead ERR_MARS_NEVER_DOWN = ERR_MARS_NEVER_SET ) @@ -129,7 +129,7 @@ func RiseTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, e return basic.JDE2DateByZone(riseJde, date.Location(), true), err } -// deprecated -- use SetTime instead +// deprecated: -- use SetTime instead // DownTime 落下时间 // date,取日期,时区忽略 // lon,经度,东正西负 diff --git a/mercury/mercury.go b/mercury/mercury.go index a600c01..4411bb0 100644 --- a/mercury/mercury.go +++ b/mercury/mercury.go @@ -11,7 +11,7 @@ import ( var ( ERR_MERCURY_NEVER_RISE = errors.New("ERROR:极夜,水星今日永远在地平线下!") ERR_MERCURY_NEVER_SET = errors.New("ERROR:极昼,水星今日永远在地平线上!") - // ERR_MERCURY_NEVER_DOWN deprecated -- use ERR_MERCURY_NEVER_SET instead + // ERR_MERCURY_NEVER_DOWN deprecated: -- use ERR_MERCURY_NEVER_SET instead ERR_MERCURY_NEVER_DOWN = ERR_MERCURY_NEVER_SET ) @@ -129,7 +129,7 @@ func RiseTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, e return basic.JDE2DateByZone(riseJde, date.Location(), true), err } -// deprecated -- use SetTime instead +// deprecated: -- use SetTime instead // DownTime 落下时间 // date,取日期,时区忽略 // lon,经度,东正西负 diff --git a/moon/moon.go b/moon/moon.go index a73766b..41b1514 100644 --- a/moon/moon.go +++ b/moon/moon.go @@ -11,7 +11,7 @@ import ( var ( ERR_MOON_NEVER_RISE = errors.New("ERROR:极夜,月亮在今日永远在地平线下!") ERR_MOON_NEVER_SET = errors.New("ERROR:极昼,月亮在今日永远在地平线上!") - // ERR_MOON_NEVER_DOWN deprecated -- use ERR_MOON_NEVER_SET instead + // ERR_MOON_NEVER_DOWN deprecated: -- use ERR_MOON_NEVER_SET instead ERR_MOON_NEVER_DOWN = ERR_MOON_NEVER_SET ERR_NOT_TODAY = errors.New("ERROR:月亮已在(昨日/明日)(升起/降下)") ) @@ -171,7 +171,7 @@ func RiseTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, e return basic.JDE2DateByZone(riseJde, date.Location(), true), err } -// deprecated -- use SetTime instead +// deprecated: -- use SetTime instead // DownTime 落下时间 // date,取日期,时区忽略 // lon,经度,东正西负 diff --git a/neptune/neptune.go b/neptune/neptune.go index d44a7a7..19d6e82 100644 --- a/neptune/neptune.go +++ b/neptune/neptune.go @@ -11,7 +11,7 @@ import ( var ( ERR_NEPTUNE_NEVER_RISE = errors.New("ERROR:极夜,海王星今日永远在地平线下!") ERR_NEPTUNE_NEVER_SET = errors.New("ERROR:极昼,海王星今日永远在地平线上!") - // ERR_NEPTUNE_NEVER_DOWN deprecated -- use ERR_NEPTUNE_NEVER_SET instead + // ERR_NEPTUNE_NEVER_DOWN deprecated: -- use ERR_NEPTUNE_NEVER_SET instead ERR_NEPTUNE_NEVER_DOWN = ERR_NEPTUNE_NEVER_SET ) @@ -129,7 +129,7 @@ func RiseTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, e return basic.JDE2DateByZone(riseJde, date.Location(), true), err } -// deprecated -- use SetTime instead +// deprecated: -- use SetTime instead // DownTime 落下时间 // date,取日期,时区忽略 // lon,经度,东正西负 diff --git a/saturn/saturn.go b/saturn/saturn.go index c8c577f..b557563 100644 --- a/saturn/saturn.go +++ b/saturn/saturn.go @@ -11,7 +11,7 @@ import ( var ( ERR_SATURN_NEVER_RISE = errors.New("ERROR:极夜,木星今日永远在地平线下!") ERR_SATURN_NEVER_SET = errors.New("ERROR:极昼,木星今日永远在地平线上!") - // ERR_SATURN_NEVER_DOWN deprecated -- use ERR_SATURN_NEVER_SET instead + // ERR_SATURN_NEVER_DOWN deprecated: -- use ERR_SATURN_NEVER_SET instead ERR_SATURN_NEVER_DOWN = ERR_SATURN_NEVER_SET ) @@ -129,7 +129,7 @@ func RiseTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, e return basic.JDE2DateByZone(riseJde, date.Location(), true), err } -// deprecated -- use SetTime instead +// deprecated: -- use SetTime instead // DownTime 落下时间 // date,取日期,时区忽略 // lon,经度,东正西负 diff --git a/star/star.go b/star/star.go index 8a4f412..5e89202 100644 --- a/star/star.go +++ b/star/star.go @@ -11,7 +11,7 @@ import ( var ( ERR_STAR_NEVER_RISE = 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 deprecated: -- use ERR_STAR_NEVER_SET instead ERR_STAR_NEVER_DOWN = ERR_STAR_NEVER_SET ) @@ -59,7 +59,7 @@ func RiseTime(date time.Time, ra, dec, lon, lat, height float64, aero bool) (tim return basic.JDE2DateByZone(riseJde, date.Location(), true), err } -// deprecated -- use SetTime instead +// deprecated: -- use SetTime instead // DownTime 星星降落时间 // // date, 世界时(忽略此处时区) diff --git a/sun/sun.go b/sun/sun.go index 8b242be..7e248c2 100644 --- a/sun/sun.go +++ b/sun/sun.go @@ -10,7 +10,7 @@ import ( var ( ERR_SUN_NEVER_RISE = errors.New("ERROR:极夜,太阳在今日永远在地平线下!") ERR_SUN_NEVER_SET = errors.New("ERROR:极昼,太阳在今日永远在地平线上!") - // ERR_SUN_NEVER_DOWN deprecated -- use ERR_SUN_NEVER_RISE instead + // ERR_SUN_NEVER_DOWN deprecated: -- use ERR_SUN_NEVER_RISE instead ERR_SUN_NEVER_DOWN = ERR_SUN_NEVER_SET ERR_TWILIGHT_NOT_EXISTS = errors.New("ERROR:今日晨昏朦影不存在!") ) @@ -54,7 +54,7 @@ func RiseTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, e return basic.JDE2DateByZone(riseJde, date.Location(), true), err } -// deprecated -- use SetTime instead +// deprecated: -- use SetTime instead // DownTime 太阳落下时间 // date,当地时区日期,务必做时区修正 // lon,经度,东正西负 diff --git a/uranus/uranus.go b/uranus/uranus.go index b1353c9..3501f8c 100644 --- a/uranus/uranus.go +++ b/uranus/uranus.go @@ -11,7 +11,7 @@ import ( var ( ERR_URANUS_NEVER_RISE = errors.New("ERROR:极夜,天王星今日永远在地平线下!") ERR_URANUS_NEVER_SET = errors.New("ERROR:极昼,天王星今日永远在地平线上!") - // ERR_URANUS_NEVER_DOWN deprecated -- use ERR_URANUS_NEVER_SET instead + // ERR_URANUS_NEVER_DOWN deprecated: -- use ERR_URANUS_NEVER_SET instead ERR_URANUS_NEVER_DOWN = ERR_URANUS_NEVER_SET ) @@ -129,6 +129,7 @@ func RiseTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, e return basic.JDE2DateByZone(riseJde, date.Location(), true), err } +// deprecated: -- use SetTime instead // DownTime 落下时间 // date,取日期,时区忽略 // lon,经度,东正西负 @@ -136,6 +137,16 @@ func RiseTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, e // height,高度 // aero,true时进行大气修正 func DownTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, error) { + return SetTime(date, lon, lat, height, aero) +} + +// SetTime 落下时间 +// date,取日期,时区忽略 +// lon,经度,东正西负 +// lat,纬度,北正南负 +// height,高度 +// aero,true时进行大气修正 +func SetTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, error) { var err error var aeroFloat float64 if aero { diff --git a/venus/venus.go b/venus/venus.go index dc1f4c0..5fcabb5 100644 --- a/venus/venus.go +++ b/venus/venus.go @@ -11,7 +11,7 @@ import ( var ( ERR_VENUS_NEVER_RISE = errors.New("ERROR:极夜,金星今日永远在地平线下!") ERR_VENUS_NEVER_SET = errors.New("ERROR:极昼,金星今日永远在地平线上!") - // ERR_VENUS_NEVER_DOWN deprecated -- use ERR_VENUS_NEVER_SET instead + // ERR_VENUS_NEVER_DOWN deprecated: -- use ERR_VENUS_NEVER_SET instead ERR_VENUS_NEVER_DOWN = ERR_VENUS_NEVER_SET ) @@ -129,6 +129,7 @@ func RiseTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, e return basic.JDE2DateByZone(riseJde, date.Location(), true), err } +// deprecated: -- use SetTime instead // DownTime 落下时间 // date,取日期,时区忽略 // lon,经度,东正西负 @@ -136,6 +137,16 @@ func RiseTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, e // height,高度 // aero,true时进行大气修正 func DownTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, error) { + return SetTime(date, lon, lat, height, aero) +} + +// SetTime 落下时间 +// date,取日期,时区忽略 +// lon,经度,东正西负 +// lat,纬度,北正南负 +// height,高度 +// aero,true时进行大气修正 +func SetTime(date time.Time, lon, lat, height float64, aero bool) (time.Time, error) { var err error var aeroFloat float64 if aero { diff --git a/venus/venus_test.go b/venus/venus_test.go index 3c9eedc..2b907df 100644 --- a/venus/venus_test.go +++ b/venus/venus_test.go @@ -10,5 +10,5 @@ func TestVenus(t *testing.T) { date := time.Now().Add(time.Hour * -24) fmt.Println(CulminationTime(date, 115)) fmt.Println(RiseTime(date, 115, 23, 0, false)) - fmt.Println(DownTime(date, 115, 23, 0, false)) + fmt.Println(SetTime(date, 115, 23, 0, false)) }