Imdroid/weather-station
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 固定24分的雷达数据瓦片

Browse Source
This commit is contained in:
yarnom 2025-10-28 09:40:30 +08:00
parent b8530cb614
commit abb45a13ec
1 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cmd/service-splitarea/main.go
View File

@ -2,7 +2,6 @@ package main
import (
"context"
"database/sql"
"encoding/csv"
"encoding/json"
"errors"
@ -186,30 +185,13 @@ func job(ctx context.Context, z, y, x int, bounds string, tzOffset int, outDir s
}
runAt = runAt.In(loc)
// Prefer current hour's :30 tile, fallback to :24 then :00 if missing.
targetBase := runAt.Truncate(time.Hour)
candidates := []int{30, 24, 0}
var (
targetLocal time.Time
rec *radarTileRecord
)
for _, minute := range candidates {
candidate := targetBase.Add(time.Duration(minute) * time.Minute)
tile, err := getRadarTileAt(ctx, z, y, x, candidate)
if err == nil {
if minute != candidates[0] {
log.Printf("[splitarea] fallback to %02d-minute radar tile at %s", minute, candidate.Format("2006-01-02 15:04:05"))
}
targetLocal = candidate
rec = tile
break
}
if !errors.Is(err, sql.ErrNoRows) {
return fmt.Errorf("load radar tile z=%d y=%d x=%d at %s: %w", z, y, x, candidate.Format("2006-01-02 15:04:05"), err)
}
}
if rec == nil {
return fmt.Errorf("no radar tile found for z=%d y=%d x=%d near %s (checked minutes %v)", z, y, x, targetBase.Format("2006-01-02 15:04:05"), candidates)
// Current hour's :30
targetLocal := runAt.Truncate(time.Hour).Add(24 * time.Minute)
// Fetch tile
rec, err := getRadarTileAt(ctx, z, y, x, targetLocal)
if err != nil {
return fmt.Errorf("load radar tile z=%d y=%d x=%d at %s: %w", z, y, x, targetLocal.Format("2006-01-02 15:04:05"), err)
}
// Bounds
@ -245,11 +227,10 @@ func job(ctx context.Context, z, y, x int, bounds string, tzOffset int, outDir s
return fmt.Errorf("invalid tile data")
}
// Prepare output dir: export_data/split_area/YYYYMMDD/HH/mm
// Prepare output dir: export_data/split_area/YYYYMMDD/HH/30 (keep legacy minute path)
ymd := targetLocal.Format("20060102")
hh := targetLocal.Format("15")
mm := targetLocal.Format("04")
dir := filepath.Join(outDir, ymd, hh, mm)
dir := filepath.Join(outDir, ymd, hh, "30")
if err := os.MkdirAll(dir, 0o755); err != nil {
return err
}