feat: 完善日月食与月掩几何链路并扩展历法接口
- 新增日月食中心带、偏食带、阴影足迹、等时线、食分线及升落边界计算,支持极区与混合食拓扑 - 新增日食单时刻阴影求解器、站心状态查询、批量采样和 ΔT 覆盖接口 - 重构恒星与行星月掩路径,补充有限盘面接触、站心修正、掩带宽度、极区投影及升落边界 - 扩展 SVG 与 GeoJSON 输出,支持详细面板、全球/极区/地球投影、边界闭合、时间标记和拓扑签名 - 扩展日月食候选搜索、局地搜索、沙罗序列预计算与范围外推,补充系列锚点和成员一致性校验 - 补齐古历纪年、儒略历独有闰日、多公历候选、历法改革跨日及精确日期运算接口 - 优化 ΔT、章动、恒星时、月球地平线、事件根搜索和本地星历缓存,降低重复计算开销并提升边界稳定
This commit is contained in:
@@ -17,6 +17,7 @@ func writeOccultationTimeMarkers(
|
||||
options StarOccultationSVGOptions,
|
||||
excluded []time.Time,
|
||||
greatest time.Time,
|
||||
placer *occultationLabelPlacer,
|
||||
) {
|
||||
if options.TimeLabelStep <= 0 || len(points) < 2 {
|
||||
return
|
||||
@@ -42,15 +43,28 @@ func writeOccultationTimeMarkers(
|
||||
if tooClose {
|
||||
continue
|
||||
}
|
||||
projected = append(projected, [2]float64{x, y})
|
||||
labelY := y - 8
|
||||
text := marker.Time.In(options.Location).Format("15:04")
|
||||
// 掩甚附近的标签默认压到圆点下方,给掩甚事件标记让位;两个方向都被占用就丢弃这个时刻。
|
||||
baselines := []float64{y - 8, y + 15}
|
||||
if occultationTimesNear(marker.Time, greatest, occultationGreatestTimeLabelWindow(options.TimeLabelStep)) {
|
||||
labelY = y + 15
|
||||
} else if labelY < frame.Y+10 {
|
||||
labelY = y + 15
|
||||
baselines[0], baselines[1] = baselines[1], baselines[0]
|
||||
}
|
||||
labelY, placed := 0.0, false
|
||||
for _, baseline := range baselines {
|
||||
if baseline < frame.Y+10 || baseline > frame.Y+frame.Height-8 {
|
||||
continue
|
||||
}
|
||||
if placer.place(x, baseline, "middle", text, 9, 2) {
|
||||
labelY, placed = baseline, true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !placed {
|
||||
continue
|
||||
}
|
||||
projected = append(projected, [2]float64{x, y})
|
||||
fmt.Fprintf(b, `<g class="occultation-time-marker"><circle cx="%.3f" cy="%.3f" r="2.3" fill="#087f8c" stroke="#ffffff" stroke-width="1"/><text x="%.3f" y="%.3f" fill="#075f69" stroke="#ffffff" stroke-width="3" paint-order="stroke" font-family="Arial, sans-serif" font-size="9" font-weight="700" text-anchor="middle">%s</text></g>`,
|
||||
x, y, x, labelY, html.EscapeString(marker.Time.In(options.Location).Format("15:04")))
|
||||
x, y, x, labelY, html.EscapeString(text))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user