feat: 完善日月食与月掩几何链路并扩展历法接口
- 新增日月食中心带、偏食带、阴影足迹、等时线、食分线及升落边界计算,支持极区与混合食拓扑 - 新增日食单时刻阴影求解器、站心状态查询、批量采样和 ΔT 覆盖接口 - 重构恒星与行星月掩路径,补充有限盘面接触、站心修正、掩带宽度、极区投影及升落边界 - 扩展 SVG 与 GeoJSON 输出,支持详细面板、全球/极区/地球投影、边界闭合、时间标记和拓扑签名 - 扩展日月食候选搜索、局地搜索、沙罗序列预计算与范围外推,补充系列锚点和成员一致性校验 - 补齐古历纪年、儒略历独有闰日、多公历候选、历法改革跨日及精确日期运算接口 - 优化 ΔT、章动、恒星时、月球地平线、事件根搜索和本地星历缓存,降低重复计算开销并提升边界稳定
This commit is contained in:
+37
-30
@@ -1,6 +1,6 @@
|
||||
package calendar
|
||||
|
||||
func nanMingCals() map[int]uint32 {
|
||||
var nanMingCals = memoUint32Map(func() map[int]uint32 {
|
||||
return map[int]uint32{
|
||||
1645: 1232804864,
|
||||
1646: 1232088832,
|
||||
@@ -42,9 +42,9 @@ func nanMingCals() map[int]uint32 {
|
||||
1682: 3529516544,
|
||||
1683: 3912440576,
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
func nanMingEras01() []Era {
|
||||
var nanMingEras01 = memoEras(func() []Era {
|
||||
return []Era{
|
||||
{
|
||||
Year: 1646,
|
||||
@@ -70,9 +70,9 @@ func nanMingEras01() []Era {
|
||||
Dynasty: "明",
|
||||
},
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
func nanMingEras02() []Era {
|
||||
var nanMingEras02 = memoEras(func() []Era {
|
||||
return []Era{
|
||||
{
|
||||
Year: 1647,
|
||||
@@ -81,48 +81,55 @@ func nanMingEras02() []Era {
|
||||
Dynasty: "南明",
|
||||
},
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
func nanMingEraMap() map[string][][]int {
|
||||
var nanMingEraMap = memoEraMap(func() map[string][][]int {
|
||||
return map[string][][]int{
|
||||
"永历": [][]int{{1647, 1683}},
|
||||
"鲁王监国": [][]int{{1646, 1653}},
|
||||
"隆武": [][]int{{1645, 1646}},
|
||||
"弘光": [][]int{{1645, 1645}},
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
func innerSolarToLunarNanMing(date Time) Time {
|
||||
year := date.solarTime.Year()
|
||||
month := int(date.solarTime.Month())
|
||||
day := date.solarTime.Day()
|
||||
// 农历年早于对应年号表首年时 eras 为空,此类候选与主流日期完全相同且无朝代,跳过追加。
|
||||
if year > 1644 && year < 1654 {
|
||||
lyear, lmonth, ganzhiMonth, lday, isLeap, ldesc := rapidLunarHan2Qing(year, month, day, 0, nanMingCals)
|
||||
date.lunars = append(date.lunars, LunarTime{
|
||||
solarDate: date.solarTime,
|
||||
year: lyear,
|
||||
month: lmonth,
|
||||
day: lday,
|
||||
leap: isLeap,
|
||||
desc: ldesc,
|
||||
ganzhiMonth: ganzhiMonth,
|
||||
comment: "",
|
||||
eras: innerEras(lyear, nanMingEras01),
|
||||
})
|
||||
eras := innerEras(lyear, nanMingEras01)
|
||||
if len(eras) > 0 {
|
||||
date.lunars = append(date.lunars, LunarTime{
|
||||
solarDate: date.solarTime,
|
||||
year: lyear,
|
||||
month: lmonth,
|
||||
day: lday,
|
||||
leap: isLeap,
|
||||
desc: ldesc,
|
||||
ganzhiMonth: ganzhiMonth,
|
||||
comment: "",
|
||||
eras: eras,
|
||||
})
|
||||
}
|
||||
}
|
||||
if year > 1646 && year < 1684 {
|
||||
lyear, lmonth, ganzhiMonth, lday, isLeap, ldesc := rapidLunarHan2Qing(year, month, day, 0, nanMingCals)
|
||||
date.lunars = append(date.lunars, LunarTime{
|
||||
solarDate: date.solarTime,
|
||||
year: lyear,
|
||||
month: lmonth,
|
||||
day: lday,
|
||||
leap: isLeap,
|
||||
desc: ldesc,
|
||||
ganzhiMonth: ganzhiMonth,
|
||||
comment: "",
|
||||
eras: innerEras(lyear, nanMingEras02),
|
||||
})
|
||||
eras := innerEras(lyear, nanMingEras02)
|
||||
if len(eras) > 0 {
|
||||
date.lunars = append(date.lunars, LunarTime{
|
||||
solarDate: date.solarTime,
|
||||
year: lyear,
|
||||
month: lmonth,
|
||||
day: lday,
|
||||
leap: isLeap,
|
||||
desc: ldesc,
|
||||
ganzhiMonth: ganzhiMonth,
|
||||
comment: "",
|
||||
eras: eras,
|
||||
})
|
||||
}
|
||||
}
|
||||
return date
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user