rsplot 0.2.5__tar.gz → 0.2.6__tar.gz

{rsplot-0.2.5 → rsplot-0.2.6}/.gitignore

@@ -280,3 +280,4 @@ tags
 logs/
 .vscode/
 .claude
+tests/

{rsplot-0.2.5 → rsplot-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rsplot
-Version: 0.2.5
+Version: 0.2.6
 Summary: CLI tool for plotting Remote Sensing data, designed for Agent.
 Project-URL: Repository, https://git.lug.ustc.edu.cn/yaoyhu/rsplot
 Project-URL: GitHub, https://github.com/yaoyhu/rsplot
@@ -280,6 +280,8 @@ o3 = "/path/to/O3"
 o3pr = "/path/to/O3PR"
 hcho = "/path/to/HCHO"
 guokong = "/path/to/guokong_combine"
+era5 = "/path/to/era5"
+forecast = "/path/to/forecast"
 
 # Optional satellite basemap key. Leave commented unless you have a real key.
 # [tianditu]
@@ -303,6 +305,8 @@ export RSPLOT_DATA_DIR_O3="/path/to/O3"
 export RSPLOT_DATA_DIR_O3PR="/path/to/O3PR"
 export RSPLOT_DATA_DIR_HCHO="/path/to/HCHO"
 export RSPLOT_DATA_DIR_GUOKONG="/path/to/guokong_combine"
+export RSPLOT_DATA_DIR_ERA5="/path/to/era5"
+export RSPLOT_DATA_DIR_FORECAST="/path/to/forecast"
 export RSPLOT_HCHO_CMAP_FILE="/path/to/256x3_rgb_table.txt"
 ```
 
@@ -330,9 +334,22 @@ rsplot raster 安徽 20260227 -p o3pr -o o3pr_anhui_20260227.png
 # Plot an explicit TROPOMI date range.
 rsplot raster 长三角 20260101-20260131 -p no2 -o no2_yrd_202601.png
 
+# Plot gridded air-quality forecast initialized at a specific hour.
+rsplot forecast 安徽 2026063000 --lead 24 --var O3 -o forecast_anhui_o3.png
+
+# Date-only forecast input automatically selects the latest initialized hour.
+rsplot forecast 合肥 20260630 --lead 72 --var PM2.5 -o forecast_hefei_pm25.png
+
 # Plot national monitoring station observations.
 rsplot station 合肥 2026041415 --var O3 -o station_hefei_o3.png
 
+# Overlay hourly ERA5 10 m wind vectors on station observations.
+# Station timestamps default to Asia/Shanghai and are matched to ERA5 UTC.
+rsplot station 合肥 2026041415 --var O3 --wind-level 10m -o station_wind_hefei_o3.png
+
+# Pressure-level wind is also supported (1000/925/850/700/500 hPa).
+rsplot station 安徽 2026041415 --var PM2.5 --wind-level 850 -o station_wind_anhui_pm25.png
+
 # Overlay satellite raster data and station observations.
 rsplot overlay 合肥 2026041415 -p no2 --var NO2 -o overlay_hefei_no2.png
 

{rsplot-0.2.5 → rsplot-0.2.6}/README.md

@@ -53,6 +53,8 @@ o3 = "/path/to/O3"
 o3pr = "/path/to/O3PR"
 hcho = "/path/to/HCHO"
 guokong = "/path/to/guokong_combine"
+era5 = "/path/to/era5"
+forecast = "/path/to/forecast"
 
 # Optional satellite basemap key. Leave commented unless you have a real key.
 # [tianditu]
@@ -76,6 +78,8 @@ export RSPLOT_DATA_DIR_O3="/path/to/O3"
 export RSPLOT_DATA_DIR_O3PR="/path/to/O3PR"
 export RSPLOT_DATA_DIR_HCHO="/path/to/HCHO"
 export RSPLOT_DATA_DIR_GUOKONG="/path/to/guokong_combine"
+export RSPLOT_DATA_DIR_ERA5="/path/to/era5"
+export RSPLOT_DATA_DIR_FORECAST="/path/to/forecast"
 export RSPLOT_HCHO_CMAP_FILE="/path/to/256x3_rgb_table.txt"
 ```
 
@@ -103,9 +107,22 @@ rsplot raster 安徽 20260227 -p o3pr -o o3pr_anhui_20260227.png
 # Plot an explicit TROPOMI date range.
 rsplot raster 长三角 20260101-20260131 -p no2 -o no2_yrd_202601.png
 
+# Plot gridded air-quality forecast initialized at a specific hour.
+rsplot forecast 安徽 2026063000 --lead 24 --var O3 -o forecast_anhui_o3.png
+
+# Date-only forecast input automatically selects the latest initialized hour.
+rsplot forecast 合肥 20260630 --lead 72 --var PM2.5 -o forecast_hefei_pm25.png
+
 # Plot national monitoring station observations.
 rsplot station 合肥 2026041415 --var O3 -o station_hefei_o3.png
 
+# Overlay hourly ERA5 10 m wind vectors on station observations.
+# Station timestamps default to Asia/Shanghai and are matched to ERA5 UTC.
+rsplot station 合肥 2026041415 --var O3 --wind-level 10m -o station_wind_hefei_o3.png
+
+# Pressure-level wind is also supported (1000/925/850/700/500 hPa).
+rsplot station 安徽 2026041415 --var PM2.5 --wind-level 850 -o station_wind_anhui_pm25.png
+
 # Overlay satellite raster data and station observations.
 rsplot overlay 合肥 2026041415 -p no2 --var NO2 -o overlay_hefei_no2.png
 

{rsplot-0.2.5 → rsplot-0.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rsplot"
-version = "0.2.5"
+version = "0.2.6"
 description = "CLI tool for plotting Remote Sensing data, designed for Agent."
 authors = [
     { name = "Yaoyao Hu", email = "yaoyhu@mail.ustc.edu.cn" },

{rsplot-0.2.5 → rsplot-0.2.6}/src/rsplot/cli.py

@@ -152,6 +152,7 @@ def raster(
     from rsplot.geo.gridding import (
         fill_nan_gaps,
         grid_data,
+        grid_coverage_in_region,
         mask_to_region,
         smooth_grid,
     )
@@ -360,8 +361,6 @@ def raster(
             "coverage_days": coverage_days,
         }
 
-    coverage = float(np.isfinite(grid_masked).mean()) * 100
-    console.print(f"  → 网格 {grid_masked.shape}, 覆盖率 {coverage:.1f}%")
     if not np.isfinite(grid_masked).any():
         console.print(
             "[red]窗口均值全区无有效像元，可能原因：窗口内覆盖不足，"
@@ -374,6 +373,13 @@ def raster(
         grid_masked = smooth_grid(
             grid_masked, info.geometry, LON, LAT, sigma=use_smooth
         )
+    coverage, n_valid_region, total_region_pixels = grid_coverage_in_region(
+        LON, LAT, grid_masked, info.geometry
+    )
+    console.print(
+        f"  → 网格 {grid_masked.shape}, 区域内覆盖率 {coverage:.1f}% "
+        f"({n_valid_region}/{total_region_pixels})"
+    )
 
     # --- 6. Determine vmin/vmax (CLI > product default > auto) ---
     if vmin is not None and vmax is not None:
@@ -439,6 +445,254 @@ def raster(
     emit_result(result, output)
 
 
+@app.command()
+def forecast(
+    region: str = typer.Argument(
+        ..., help="区域名称，如 中国、安徽、合肥、YRD、合肥/蜀山"
+    ),
+    datetime_str: str = typer.Argument(
+        ..., help="起报时次 YYYYMMDDHH，或 YYYYMMDD 自动取当天最新小时"
+    ),
+    var: str = typer.Option(
+        "o3",
+        "--var",
+        "-v",
+        help="预报变量: PM2.5 / PM10 / SO2 / NO2 / CO / O3",
+    ),
+    lead: int = typer.Option(
+        24,
+        "--lead",
+        help="预报时效: 6 / 12 / 24 / 48 / 72 小时",
+    ),
+    level: str | None = typer.Option(
+        None,
+        "--level",
+        "-l",
+        help="强制指定级别: country / key_region / province / city / county",
+    ),
+    data_dir: str | None = typer.Option(
+        None,
+        "--data-dir",
+        "-d",
+        help="预报数据目录 (覆盖配置中的 forecast 路径)",
+    ),
+    output: str | None = typer.Option(
+        None,
+        "--output",
+        "-o",
+        help="输出文件路径",
+    ),
+    dpi: int | None = typer.Option(300, "--dpi", help="输出 DPI"),
+    basemap: str | None = typer.Option(
+        None,
+        "--basemap",
+        "-b",
+        help="底图控制: satellite / none (覆盖级别默认)",
+    ),
+    vmin: float | None = typer.Option(None, "--vmin", help="Colorbar 最小值"),
+    vmax: float | None = typer.Option(None, "--vmax", help="Colorbar 最大值"),
+    cmap: str | None = typer.Option(None, "--cmap", help="Colormap 名称"),
+    smooth: float | None = typer.Option(
+        None, "--smooth", help="高斯平滑 sigma"
+    ),
+    title: str | None = typer.Option(None, "--title", help="自定义标题"),
+) -> None:
+    """绘制空气质量预报栅格图。
+
+    示例:
+        rsplot forecast 安徽 2026063000 --lead 24 --var O3
+        rsplot forecast 合肥 20260630 --lead 72 --var PM2.5
+    """
+    from pathlib import Path
+
+    from rsplot.geo.boundaries import resolve_region
+    from rsplot.geo.gridding import (
+        grid_coverage_in_region,
+        mask_to_region,
+        smooth_grid,
+    )
+    from rsplot.plotting.colormaps import STATION_CONCENTRATION_CMAP
+    from rsplot.plotting.raster import plot_raster
+    from rsplot.plotting.styles import setup_fonts
+    from rsplot.readers.forecast import (
+        auto_forecast_vrange,
+        get_forecast_var_info,
+        read_forecast,
+    )
+    from rsplot.results import build_forecast_result, emit_result
+
+    # --- 1. Load config ---
+    cfg = AppConfig.load()
+    setup_fonts(cfg.font_dir)
+
+    # --- 2. Resolve region ---
+    console.print(f"[bold]解析区域:[/bold] {region}")
+    info = resolve_region(region, cfg, level_override=level)
+    console.print(f"  → [green]{info.name}[/green] (级别: {info.level})")
+    console.print(
+        f"  → 范围: {info.extent[0]:.2f}°~{info.extent[1]:.2f}°E, "
+        f"{info.extent[2]:.2f}°~{info.extent[3]:.2f}°N"
+    )
+
+    # --- 3. Merge params ---
+    params = info.params
+    use_dpi = dpi if dpi is not None else cfg.dpi
+    use_cmap = cmap if cmap is not None else STATION_CONCENTRATION_CMAP
+
+    if basemap is not None:
+        use_basemap: bool | None = basemap.lower() == "satellite"
+    else:
+        use_basemap = None
+    _warn_missing_tianditu_key(
+        basemap=use_basemap,
+        default_basemap=params.basemap,
+        tianditu_key=cfg.tianditu_key,
+    )
+
+    if smooth is not None and smooth < 0:
+        console.print("[red]--smooth 必须大于等于 0。[/red]")
+        raise typer.Exit(1)
+    if vmin is not None and vmax is not None and vmax <= vmin:
+        console.print("[red]--vmax 必须大于 --vmin。[/red]")
+        raise typer.Exit(1)
+
+    try:
+        var_info = get_forecast_var_info(var)
+    except ValueError as e:
+        console.print(f"[red]{e}[/red]")
+        raise typer.Exit(1) from e
+
+    try:
+        use_data_dir = (
+            data_dir
+            if data_dir is not None
+            else cfg.get_data_dir("forecast")
+        )
+    except ValueError as e:
+        console.print(f"[red]{e}[/red]")
+        raise typer.Exit(1) from e
+
+    # --- 4. Read forecast grid ---
+    buf = 0.5
+    read_extent = (
+        info.extent[0] - buf,
+        info.extent[1] + buf,
+        info.extent[2] - buf,
+        info.extent[3] + buf,
+    )
+    console.print(
+        f"\n[bold]读取预报数据:[/bold] {use_data_dir} "
+        f"(变量: {var_info.label}, 时效: {lead}h)"
+    )
+    console.print(f"  起报时次: {datetime_str}")
+    try:
+        forecast_data, resolved_dt = read_forecast(
+            use_data_dir,
+            datetime_str,
+            lead,
+            var,
+            read_extent,
+        )
+    except (FileNotFoundError, ValueError) as e:
+        console.print(f"[red]{e}[/red]")
+        raise typer.Exit(1) from e
+
+    if resolved_dt != datetime_str:
+        console.print(f"  → 自动选择最新起报: [cyan]{resolved_dt}[/cyan]")
+    console.print(
+        f"  → 预报有效时次: [cyan]{forecast_data.valid_datetime}[/cyan], "
+        f"有效网格: [green]{forecast_data.n_valid}[/green] / "
+        f"{forecast_data.n_cells}"
+    )
+
+    # --- 5. Mask, optional smooth, and color scale ---
+    grid_masked = mask_to_region(
+        forecast_data.lon,
+        forecast_data.lat,
+        forecast_data.values,
+        info.geometry,
+    )
+    if not np.isfinite(grid_masked).any():
+        console.print("[red]目标区域内没有有效预报网格。[/red]")
+        raise typer.Exit(1)
+
+    if smooth is not None and smooth > 0:
+        console.print(f"  → 高斯平滑 sigma={smooth}")
+        grid_masked = smooth_grid(
+            grid_masked,
+            info.geometry,
+            forecast_data.lon,
+            forecast_data.lat,
+            sigma=smooth,
+        )
+    coverage, n_valid_region, total_region_pixels = grid_coverage_in_region(
+        forecast_data.lon,
+        forecast_data.lat,
+        grid_masked,
+        info.geometry,
+    )
+    console.print(
+        f"  → 区域网格 {grid_masked.shape}, 区域内覆盖率 {coverage:.1f}% "
+        f"({n_valid_region}/{total_region_pixels})"
+    )
+
+    auto_min, auto_max = auto_forecast_vrange(grid_masked, var_info)
+    use_vmin = vmin if vmin is not None else auto_min
+    use_vmax = vmax if vmax is not None else auto_max
+    if use_vmax <= use_vmin:
+        console.print("[red]色标范围无效：vmax 必须大于 vmin。[/red]")
+        raise typer.Exit(1)
+    console.print(f"  → 色标范围: {use_vmin:.1f} ~ {use_vmax:.1f}")
+
+    # --- 6. Plot ---
+    if output is None:
+        output = (
+            f"/tmp/rsplot_forecast_{info.name}_{forecast_data.variable}_"
+            f"{forecast_data.init_datetime}_f{forecast_data.lead_hour}.png"
+        )
+    Path(output).parent.mkdir(parents=True, exist_ok=True)
+
+    if title is None:
+        title = (
+            f"Forecast {forecast_data.label} - {info.name} "
+            f"(valid {forecast_data.valid_datetime}, "
+            f"+{forecast_data.lead_hour}h)"
+        )
+
+    console.print("\n[bold]绘图中...[/bold]")
+    plot_raster(
+        forecast_data.lon,
+        forecast_data.lat,
+        grid_masked,
+        info,
+        dpi=use_dpi,
+        cmap=use_cmap,
+        vmin=use_vmin,
+        vmax=use_vmax,
+        basemap=use_basemap,
+        tianditu_key=cfg.tianditu_key,
+        hcho_cmap_file=cfg.hcho_cmap_file,
+        title=title,
+        output=output,
+        colorbar_label=var_info.colorbar_label,
+    )
+
+    console.print(f"\n[bold green]✓ 已保存:[/bold green] {output}")
+
+    # --- 7. Emit structured result for downstream agents ---
+    result = build_forecast_result(
+        region=info,
+        data=forecast_data,
+        LON=forecast_data.lon,
+        LAT=forecast_data.lat,
+        grid=grid_masked,
+        vmin=use_vmin,
+        vmax=use_vmax,
+        output=output,
+    )
+    emit_result(result, output)
+
+
 @app.command()
 def station(
     region: str = typer.Argument(
@@ -479,20 +733,68 @@ def station(
         "-b",
         help="底图控制: satellite / none",
     ),
+    wind_level: str | None = typer.Option(
+        None,
+        "--wind-level",
+        help="叠加 ERA5 风场层次: 10m / 100m / 1000 / 925 / 850 / 700 / 500",
+    ),
+    wind_data_dir: str | None = typer.Option(
+        None,
+        "--wind-data-dir",
+        help="ERA5 数据目录 (覆盖配置中的 era5 路径)",
+    ),
+    station_timezone: str = typer.Option(
+        "Asia/Shanghai",
+        "--station-timezone",
+        help="国控文件名时次的 IANA 时区，用于匹配 ERA5 UTC",
+    ),
+    wind_stride: int | None = typer.Option(
+        None,
+        "--wind-stride",
+        help="风矢量抽稀步长；默认根据区域和网格大小自动选择",
+    ),
+    wind_scale: float | None = typer.Option(
+        None,
+        "--wind-scale",
+        help="Matplotlib quiver scale；不指定时自动缩放",
+    ),
+    wind_width: float = typer.Option(
+        0.004,
+        "--wind-width",
+        help="风箭头宽度；默认 0.004",
+    ),
+    wind_cmap: str = typer.Option(
+        "viridis", "--wind-cmap", help="风速色标名称"
+    ),
+    wind_vmin: float | None = typer.Option(
+        None, "--wind-vmin", help="风速色标最小值"
+    ),
+    wind_vmax: float | None = typer.Option(
+        None, "--wind-vmax", help="风速色标最大值"
+    ),
     title: str | None = typer.Option(None, "--title", help="自定义标题"),
 ) -> None:
-    """绘制国控站点散点图。
+    """绘制国控站点散点图，可选叠加 ERA5 风场。
 
     示例:
         rsplot station 安徽 20260414        (自动取当天最新小时)
         rsplot station 安徽 2026041415      (精确到15时)
         rsplot station 中国 20260414 --var PM2.5_24h
         rsplot station YRD 2026041415 --var NO2 -o logs/yrd_no2.png
+        rsplot station 合肥 2026041415 --var O3 --wind-level 10m
     """
-    from rsplot.config import STATION_VAR_META, get_exceedance_threshold
+    from rsplot.config import (
+        STATION_VAR_LABELS,
+        STATION_VAR_META,
+        get_exceedance_threshold,
+    )
     from rsplot.geo.boundaries import resolve_region
-    from rsplot.plotting.station import plot_station
+    from rsplot.plotting.station import plot_station, wind_stride_for_shape
     from rsplot.plotting.styles import setup_fonts
+    from rsplot.readers.era5_wind import (
+        mask_wind_to_region,
+        read_era5_wind,
+    )
     from rsplot.readers.guokong import mask_stations_to_region, read_stations
 
     # --- 1. Load config ---
@@ -546,7 +848,67 @@ def station(
             f"  → 超标阈值: {threshold}, 超标站点: [red]{n_exceed}[/red]"
         )
 
-    # --- 6. Plot ---
+    # --- 6. Optional ERA5 wind overlay ---
+    wind_data = None
+    use_wind_stride = None
+    if wind_level is not None:
+        if wind_stride is not None and wind_stride < 1:
+            console.print("[red]--wind-stride 必须大于等于 1。[/red]")
+            raise typer.Exit(1)
+        if wind_scale is not None and wind_scale <= 0:
+            console.print("[red]--wind-scale 必须大于 0。[/red]")
+            raise typer.Exit(1)
+        if wind_width <= 0:
+            console.print("[red]--wind-width 必须大于 0。[/red]")
+            raise typer.Exit(1)
+        if (
+            wind_vmin is not None
+            and wind_vmax is not None
+            and wind_vmax <= wind_vmin
+        ):
+            console.print("[red]--wind-vmax 必须大于 --wind-vmin。[/red]")
+            raise typer.Exit(1)
+
+        use_wind_data_dir = (
+            wind_data_dir
+            if wind_data_dir is not None
+            else cfg.get_data_dir("era5")
+        )
+        console.print(
+            f"\n[bold]读取 ERA5 风场:[/bold] {use_wind_data_dir}"
+        )
+        console.print(
+            f"  站点时次: {resolved_dt} ({station_timezone}), "
+            f"层次: {wind_level}"
+        )
+        try:
+            wind_data = read_era5_wind(
+                use_wind_data_dir,
+                resolved_dt,
+                wind_level,
+                read_extent,
+                station_timezone=station_timezone,
+            )
+            wind_data = mask_wind_to_region(wind_data, info.geometry)
+        except (FileNotFoundError, ValueError) as e:
+            console.print(f"[red]{e}[/red]")
+            raise typer.Exit(1) from e
+        if wind_data.n_valid == 0:
+            console.print("[red]目标区域内没有有效 ERA5 风矢量。[/red]")
+            raise typer.Exit(1)
+
+        use_wind_stride = (
+            wind_stride
+            if wind_stride is not None
+            else wind_stride_for_shape(wind_data.speed.shape, info.level)
+        )
+        console.print(
+            f"  → ERA5 UTC 时次: [cyan]{wind_data.datetime_utc}[/cyan], "
+            f"有效网格: [green]{wind_data.n_valid}[/green], "
+            f"抽稀步长: {use_wind_stride}"
+        )
+
+    # --- 7. Plot ---
     use_dpi = dpi if dpi is not None else cfg.dpi
 
     if basemap is not None:
@@ -560,27 +922,47 @@ def station(
     )
 
     unit = STATION_VAR_META[var][0]
-    colorbar_label = f"{var} ({unit})" if unit else var
+    display_var = STATION_VAR_LABELS.get(var, var)
+    colorbar_label = f"{display_var} ({unit})" if unit else display_var
+    use_title = title
+    if use_title is None and display_var != var:
+        if wind_data is None:
+            use_title = f"{display_var} - {info.name}"
+        else:
+            use_title = (
+                f"{display_var} + ERA5 {wind_data.level} wind - {info.name}"
+            )
 
     if output is None:
-        output = f"/tmp/rsplot_station_{info.name}_{var}_{resolved_dt}.png"
+        wind_suffix = f"_wind{wind_data.level}" if wind_data is not None else ""
+        output = (
+            f"/tmp/rsplot_station_{info.name}_{var}_{resolved_dt}"
+            f"{wind_suffix}.png"
+        )
 
     console.print("\n[bold]绘图中...[/bold]")
     plot_station(
         data,
         info,
+        wind=wind_data,
+        wind_stride=use_wind_stride or 1,
+        wind_scale=wind_scale,
+        wind_width=wind_width,
+        wind_cmap=wind_cmap,
+        wind_vmin=wind_vmin,
+        wind_vmax=wind_vmax,
         threshold=threshold,
         dpi=use_dpi,
         basemap=use_basemap,
         tianditu_key=cfg.tianditu_key,
-        title=title,
+        title=use_title,
         output=output,
         colorbar_label=colorbar_label,
     )
 
     console.print(f"\n[bold green]✓ 已保存:[/bold green] {output}")
 
-    # --- 7. Emit structured result for downstream agents ---
+    # --- 8. Emit structured result for downstream agents ---
     from rsplot.geo.boundaries import _load_city
     from rsplot.results import build_station_result, emit_result
 
@@ -592,6 +974,8 @@ def station(
         unit=unit,
         cities_gdf=_load_city(cfg.require_geojson_dir()),
         output=output,
+        wind=wind_data,
+        wind_stride=use_wind_stride,
     )
     emit_result(result, output)
 
@@ -691,6 +1075,7 @@ def overlay(
     from rsplot.geo.gridding import (
         fill_nan_gaps,
         grid_data,
+        grid_coverage_in_region,
         mask_to_region,
         smooth_grid,
     )
@@ -792,13 +1177,17 @@ def overlay(
     )
     grid_filled = fill_nan_gaps(LON, LAT, grid_raw)
     grid_masked = mask_to_region(LON, LAT, grid_filled, info.geometry)
-    coverage = float(np.isfinite(grid_masked).mean()) * 100
-    console.print(f"  → 网格 {grid_masked.shape}, 覆盖率 {coverage:.1f}%")
-
     if use_smooth is not None:
         grid_masked = smooth_grid(
             grid_masked, info.geometry, LON, LAT, sigma=use_smooth
         )
+    coverage, n_valid_region, total_region_pixels = grid_coverage_in_region(
+        LON, LAT, grid_masked, info.geometry
+    )
+    console.print(
+        f"  → 网格 {grid_masked.shape}, 区域内覆盖率 {coverage:.1f}% "
+        f"({n_valid_region}/{total_region_pixels})"
+    )
 
     # --- 8. Raster vmin/vmax ---
     if vmin is not None and vmax is not None:
@@ -1180,6 +1569,7 @@ def fnr(
         validate_fnr_thresholds,
     )
     from rsplot.geo.boundaries import resolve_region
+    from rsplot.geo.gridding import grid_coverage_in_region
     from rsplot.plotting.fnr import plot_fnr
     from rsplot.plotting.styles import setup_fonts
     from rsplot.results import build_fnr_result, emit_result
@@ -1302,9 +1692,14 @@ def fnr(
         )
         raise typer.Exit(1)
 
-    coverage_pct = 100 * len(finite) / fnr_out.fnr.size
+    coverage_pct, n_valid_region, total_region_pixels = (
+        grid_coverage_in_region(
+            fnr_out.LON, fnr_out.LAT, fnr_out.fnr, info.geometry
+        )
+    )
     console.print(
-        f"  → FNR 覆盖率 {coverage_pct:.1f}%, "
+        f"  → FNR 区域内覆盖率 {coverage_pct:.1f}% "
+        f"({n_valid_region}/{total_region_pixels}), "
         f"中位数 {float(np.median(finite)):.2f}"
     )
 

{rsplot-0.2.5 → rsplot-0.2.6}/src/rsplot/config.py

@@ -22,7 +22,15 @@ else:
 # ---------------------------------------------------------------------------
 # Safe built-in path defaults
 # ---------------------------------------------------------------------------
-KNOWN_DATA_PRODUCTS = ("no2", "o3", "o3pr", "hcho", "guokong")
+KNOWN_DATA_PRODUCTS = (
+    "no2",
+    "o3",
+    "o3pr",
+    "hcho",
+    "guokong",
+    "era5",
+    "forecast",
+)
 
 DEFAULT_DATA_DIRS: dict[str, str] = {}
 DEFAULT_GEOJSON_DIR = None
@@ -342,6 +350,11 @@ STATION_VAR_META: dict[str, tuple[str, str | None, str | None]] = {
     "CO_24h": ("mg/m3", "CO", "daily"),
 }
 
+STATION_VAR_LABELS: dict[str, str] = {
+    "O3_8h": "8h O3",
+    "O3_8h_24h": "MDA8 O3",
+}
+
 
 def get_exceedance_threshold(var_name: str) -> float | None:
     """Return the exceedance threshold for a station variable, or None."""