rsplot 0.2.2__tar.gz → 0.2.4__tar.gz

{rsplot-0.2.2 → rsplot-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rsplot
-Version: 0.2.2
+Version: 0.2.4
 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
@@ -279,6 +279,9 @@ rsplot raster 合肥 20260115 -p no2 -o ./logs/hcho/raster_city_jiujiang_hcho.pn
 # Plot a 30-day TROPOMI window mean.
 rsplot raster 安徽 20260131 -p hcho --days 30 -o hcho_anhui_202601.png
 
+# Plot a TROPOMI ozone-profile tropospheric column raster.
+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
 
@@ -293,6 +296,9 @@ rsplot fnr 合肥 20260114 -o fnr_hefei.png
 
 # Plot an FNR regime map with an explicit date range.
 rsplot fnr 长三角 20260101-20260130 -o fnr_yrd_202601.png
+
+# Override FNR regime thresholds for agent-driven sensitivity tests.
+rsplot fnr 合肥 20260114 --voc-threshold 0.8 --nox-threshold 1.8 --display-max 5 -o fnr_hefei_sensitivity.png
 ```
 
 When `-o/--output` is provided, `rsplot` writes the image to that path and also

{rsplot-0.2.2 → rsplot-0.2.4}/README.md

@@ -52,6 +52,9 @@ rsplot raster 合肥 20260115 -p no2 -o ./logs/hcho/raster_city_jiujiang_hcho.pn
 # Plot a 30-day TROPOMI window mean.
 rsplot raster 安徽 20260131 -p hcho --days 30 -o hcho_anhui_202601.png
 
+# Plot a TROPOMI ozone-profile tropospheric column raster.
+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
 
@@ -66,6 +69,9 @@ rsplot fnr 合肥 20260114 -o fnr_hefei.png
 
 # Plot an FNR regime map with an explicit date range.
 rsplot fnr 长三角 20260101-20260130 -o fnr_yrd_202601.png
+
+# Override FNR regime thresholds for agent-driven sensitivity tests.
+rsplot fnr 合肥 20260114 --voc-threshold 0.8 --nox-threshold 1.8 --display-max 5 -o fnr_hefei_sensitivity.png
 ```
 
 When `-o/--output` is provided, `rsplot` writes the image to that path and also

{rsplot-0.2.2 → rsplot-0.2.4}/pyproject.toml

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

{rsplot-0.2.2 → rsplot-0.2.4}/src/rsplot/cli.py

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from importlib.metadata import PackageNotFoundError, version
 import math
+from importlib.metadata import PackageNotFoundError, version
 from typing import Any
 
 import numpy as np
@@ -47,17 +47,20 @@ def _default_raster_n_min(product: str, window_n: int) -> int:
         return max(3, math.ceil(window_n * 0.25))
     return max(3, window_n // 2)
 
+
 def _get_version() -> str:
     try:
         return version("rsplot")
     except PackageNotFoundError:
         return "unknown"
 
+
 def _version_callback(value: bool) -> None:
     if value:
         console.print(f"rsplot {_get_version()}")
         raise typer.Exit()
 
+
 @app.callback()
 def _callback(
     show_version: bool = typer.Option(
@@ -86,7 +89,7 @@ def raster(
         "o3",
         "--product",
         "-p",
-        help="产品类型: no2 / o3 / hcho",
+        help="产品类型: no2 / o3 / o3pr / hcho",
     ),
     days: int | None = typer.Option(
         None,
@@ -98,8 +101,8 @@ def raster(
         None,
         "--n-min",
         help=(
-            "窗口模式下每像元最少有效天数。默认: NO2/O3=max(3, 天数//2), "
-            "HCHO=max(3, ceil(天数*0.25))"
+            "窗口模式下每像元最少有效天数。默认: NO2/O3/O3PR="
+            "max(3, 天数//2), HCHO=max(3, ceil(天数*0.25))"
         ),
     ),
     level: str | None = typer.Option(
@@ -205,12 +208,25 @@ def raster(
 
     # --- 3. Merge params (level defaults + CLI overrides) ---
     params = info.params
-    use_res = res if res is not None else params.res
     use_dpi = dpi if dpi is not None else cfg.dpi
     prod_info = get_product_info(product)
+    product_defaults = prod_info.defaults_for_level(info.level)
+    use_res = (
+        res
+        if res is not None
+        else product_defaults.res
+        if product_defaults.res is not None
+        else params.res
+    )
     use_cmap = cmap if cmap is not None else prod_info.cmap
     use_qa = qa if qa is not None else cfg.qa_threshold
-    use_smooth = smooth if smooth is not None else params.smooth_sigma
+    use_smooth = (
+        smooth
+        if smooth is not None
+        else product_defaults.smooth_sigma
+        if product_defaults.smooth_sigma is not None
+        else params.smooth_sigma
+    )
 
     if basemap is not None:
         use_basemap: bool | None = basemap.lower() == "satellite"
@@ -313,9 +329,7 @@ def raster(
         coverage_days = {
             "min": int(covered.min()) if len(covered) else 0,
             "max": int(covered.max()) if len(covered) else 0,
-            "mean": (
-                round(float(covered.mean()), 1) if len(covered) else 0.0
-            ),
+            "mean": (round(float(covered.mean()), 1) if len(covered) else 0.0),
         }
         if len(covered):
             coverage_days.update(
@@ -377,9 +391,7 @@ def raster(
     # --- 7. Plot ---
     if output is None:
         if window_mode:
-            output = (
-                f"/tmp/rsplot_{info.name}_{dates[0]}_{dates[-1]}.png"
-            )
+            output = f"/tmp/rsplot_{info.name}_{dates[0]}_{dates[-1]}.png"
         else:
             output = f"/tmp/rsplot_{info.name}_{dates[0]}.png"
 
@@ -520,17 +532,17 @@ def station(
     if resolved_dt != datetime_str:
         console.print(f"  → 自动选择最新时次: [cyan]{resolved_dt}[/cyan]")
     console.print(
-        f"  → [green]{data.n_valid}[/green] 有效站点 "
-        f"(共 {data.n_stations} 站)"
+        f"  → [green]{data.n_valid}[/green] 有效站点 (共 {data.n_stations} 站)"
     )
 
     # --- 5. Exceedance threshold ---
     threshold = get_exceedance_threshold(var)
     if threshold is not None:
-        n_exceed = int(np.sum(data.values[np.isfinite(data.values)] > threshold))
+        n_exceed = int(
+            np.sum(data.values[np.isfinite(data.values)] > threshold)
+        )
         console.print(
-            f"  → 超标阈值: {threshold}, "
-            f"超标站点: [red]{n_exceed}[/red]"
+            f"  → 超标阈值: {threshold}, 超标站点: [red]{n_exceed}[/red]"
         )
 
     # --- 6. Plot ---
@@ -590,6 +602,7 @@ def station(
 _PRODUCT_STATION_PAIR: dict[str, str] = {
     "no2": "NO2",
     "o3": "O3",
+    "o3pr": "O3",
 }
 
 
@@ -608,7 +621,7 @@ def overlay(
         "o3",
         "--product",
         "-p",
-        help="卫星产品类型: no2 / o3",
+        help="卫星产品类型: no2 / o3 / o3pr / hcho",
     ),
     # --- station variable ---
     var: str | None = typer.Option(
@@ -648,8 +661,12 @@ def overlay(
         "-b",
         help="底图控制: satellite / none (覆盖级别默认)",
     ),
-    vmin: float | None = typer.Option(None, "--vmin", help="卫星 colorbar 最小值"),
-    vmax: float | None = typer.Option(None, "--vmax", help="卫星 colorbar 最大值"),
+    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"
@@ -714,12 +731,25 @@ def overlay(
 
     # --- 5. Merge params ---
     params = info.params
-    use_res = res if res is not None else params.res
     use_dpi = dpi if dpi is not None else cfg.dpi
     prod_info = get_product_info(product)
+    product_defaults = prod_info.defaults_for_level(info.level)
+    use_res = (
+        res
+        if res is not None
+        else product_defaults.res
+        if product_defaults.res is not None
+        else params.res
+    )
     use_cmap = cmap if cmap is not None else prod_info.cmap
     use_qa = qa if qa is not None else cfg.qa_threshold
-    use_smooth = smooth if smooth is not None else params.smooth_sigma
+    use_smooth = (
+        smooth
+        if smooth is not None
+        else product_defaults.smooth_sigma
+        if product_defaults.smooth_sigma is not None
+        else params.smooth_sigma
+    )
 
     if basemap is not None:
         use_basemap: bool | None = basemap.lower() == "satellite"
@@ -744,7 +774,9 @@ def overlay(
         info.extent[2] - buf,
         info.extent[3] + buf,
     )
-    console.print(f"\n[bold]读取卫星数据:[/bold] {use_raster_dir} (产品: {product})")
+    console.print(
+        f"\n[bold]读取卫星数据:[/bold] {use_raster_dir} (产品: {product})"
+    )
     console.print(f"  日期: {date}, QA > {use_qa}")
     swath = reader.read(use_raster_dir, date, read_extent, qa_threshold=use_qa)
     console.print(
@@ -799,23 +831,22 @@ def overlay(
     if resolved_dt != datetime_str:
         console.print(f"  → 自动选择最新时次: [cyan]{resolved_dt}[/cyan]")
     console.print(
-        f"  → [green]{data.n_valid}[/green] 有效站点 "
-        f"(共 {data.n_stations} 站)"
+        f"  → [green]{data.n_valid}[/green] 有效站点 (共 {data.n_stations} 站)"
     )
 
     # --- 10. Exceedance threshold ---
     threshold = get_exceedance_threshold(var)
     if threshold is not None:
-        n_exceed = int(np.sum(data.values[np.isfinite(data.values)] > threshold))
+        n_exceed = int(
+            np.sum(data.values[np.isfinite(data.values)] > threshold)
+        )
         console.print(
             f"  → 超标阈值: {threshold}, 超标站点: [red]{n_exceed}[/red]"
         )
 
     # --- 11. Plot ---
     if output is None:
-        output = (
-            f"/tmp/rsplot_overlay_{info.name}_{product}_{resolved_dt}.png"
-        )
+        output = f"/tmp/rsplot_overlay_{info.name}_{product}_{resolved_dt}.png"
 
     unit = STATION_VAR_META[var][0]
     station_label = f"{var} ({unit})" if unit else var
@@ -892,7 +923,7 @@ def recent(
         "o3",
         "--product",
         "-p",
-        help="source=raster 时的产品: no2 / o3 / hcho",
+        help="source=raster 时的产品: no2 / o3 / o3pr / hcho",
     ),
     var: str = typer.Option(
         "AQI",
@@ -971,7 +1002,14 @@ def recent(
 
     if use_source == "raster":
         prod_info = get_product_info(product)
-        use_res = res if res is not None else info.params.res
+        product_defaults = prod_info.defaults_for_level(info.level)
+        use_res = (
+            res
+            if res is not None
+            else product_defaults.res
+            if product_defaults.res is not None
+            else info.params.res
+        )
         use_qa = qa if qa is not None else cfg.qa_threshold
         use_data_dir = (
             data_dir if data_dir is not None else cfg.get_data_dir(product)
@@ -1013,9 +1051,7 @@ def recent(
             data_dir if data_dir is not None else cfg.get_data_dir("guokong")
         )
         unit = STATION_VAR_META[var][0]
-        console.print(
-            f"\n[bold]统计站点:[/bold] {use_data_dir} (变量: {var})"
-        )
+        console.print(f"\n[bold]统计站点:[/bold] {use_data_dir} (变量: {var})")
         daily = summarize_recent_station(
             region=info,
             data_dir=use_data_dir,
@@ -1070,6 +1106,21 @@ def fnr(
         help="最小平均 NO2 柱浓度阈值 (x10^15 molec/cm2)；"
         "低于此值的像元 FNR 不可信，输出为 NaN",
     ),
+    voc_threshold: float = typer.Option(
+        1.0,
+        "--voc-threshold",
+        help="VOC-limited 分级阈值：FNR 小于该值判为 VOC-limited",
+    ),
+    nox_threshold: float = typer.Option(
+        2.0,
+        "--nox-threshold",
+        help="NOx-limited 分级阈值：FNR 大于该值判为 NOx-limited",
+    ),
+    display_max: float = typer.Option(
+        6.0,
+        "--display-max",
+        help="FNR 图例显示上限，必须大于 --nox-threshold",
+    ),
     # --- overrides ---
     level: str | None = typer.Option(
         None,
@@ -1121,7 +1172,11 @@ def fnr(
         rsplot fnr 安徽   20260131 --days 30      (30日窗口)
         rsplot fnr 长三角 20260101-20260130       (显式范围)
     """
-    from rsplot.fnr import compute_fnr, parse_date_window
+    from rsplot.fnr import (
+        compute_fnr,
+        parse_date_window,
+        validate_fnr_thresholds,
+    )
     from rsplot.geo.boundaries import resolve_region
     from rsplot.plotting.fnr import plot_fnr
     from rsplot.plotting.styles import setup_fonts
@@ -1145,11 +1200,27 @@ def fnr(
             f"[red]--n-min ({use_n_min}) 大于窗口天数 ({window_n})[/red]"
         )
         raise typer.Exit(1)
+    try:
+        use_voc_threshold, use_nox_threshold, use_display_max = (
+            validate_fnr_thresholds(
+                voc_threshold=voc_threshold,
+                nox_threshold=nox_threshold,
+                display_max=display_max,
+            )
+        )
+    except ValueError as e:
+        console.print(f"[red]FNR 阈值错误: {e}[/red]")
+        raise typer.Exit(1) from e
 
     console.print(
         f"[bold]时间窗口:[/bold] {dates[0]} ~ {dates[-1]} "
         f"({window_n} 天，每像元至少 {use_n_min} 天有效)"
     )
+    console.print(
+        f"[bold]FNR 分级:[/bold] VOC<{use_voc_threshold:g}, "
+        f"transition {use_voc_threshold:g}~{use_nox_threshold:g}, "
+        f"NOx>{use_nox_threshold:g}"
+    )
 
     # --- 3. Resolve region ---
     console.print(f"[bold]解析区域:[/bold] {region}")
@@ -1175,7 +1246,9 @@ def fnr(
 
     # --- 5. Resolve data dirs ---
     use_no2_dir = (
-        raster_dir_no2 if raster_dir_no2 is not None else cfg.get_data_dir("no2")
+        raster_dir_no2
+        if raster_dir_no2 is not None
+        else cfg.get_data_dir("no2")
     )
     use_hcho_dir = (
         raster_dir_hcho
@@ -1205,12 +1278,10 @@ def fnr(
     n_found_no2 = len(fnr_out.dates_found_no2)
     n_found_hcho = len(fnr_out.dates_found_hcho)
     console.print(
-        f"  → NO2 有效天数 {n_found_no2}/{window_n} "
-        f"(失败 {n_fail_no2})"
+        f"  → NO2 有效天数 {n_found_no2}/{window_n} (失败 {n_fail_no2})"
     )
     console.print(
-        f"  → HCHO 有效天数 {n_found_hcho}/{window_n} "
-        f"(失败 {n_fail_hcho})"
+        f"  → HCHO 有效天数 {n_found_hcho}/{window_n} (失败 {n_fail_hcho})"
     )
     if use_n_min > min(n_found_no2, n_found_hcho):
         console.print(
@@ -1236,7 +1307,12 @@ def fnr(
     )
 
     from rsplot.fnr import regime_percentages
-    pct = regime_percentages(fnr_out.fnr)
+
+    pct = regime_percentages(
+        fnr_out.fnr,
+        voc_threshold=use_voc_threshold,
+        nox_threshold=use_nox_threshold,
+    )
     console.print(
         f"  → Regime: [red]VOC-limited {pct['voc_limited']}%[/red] | "
         f"[yellow]transition {pct['transition']}%[/yellow] | "
@@ -1245,9 +1321,7 @@ def fnr(
 
     # --- 7. Plot ---
     if output is None:
-        output = (
-            f"/tmp/rsplot_fnr_{info.name}_{dates[0]}_{dates[-1]}.png"
-        )
+        output = f"/tmp/rsplot_fnr_{info.name}_{dates[0]}_{dates[-1]}.png"
 
     subtitle = (
         f"{dates[0]}~{dates[-1]}  ·  N_days={window_n} "
@@ -1266,6 +1340,9 @@ def fnr(
         title=title,
         output=output,
         subtitle=subtitle,
+        voc_threshold=use_voc_threshold,
+        nox_threshold=use_nox_threshold,
+        display_max=use_display_max,
     )
     console.print(f"\n[bold green]✓ 已保存:[/bold green] {output}")
 
@@ -1275,6 +1352,9 @@ def fnr(
         fnr_out=fnr_out,
         res=use_res,
         output=output,
+        voc_threshold=use_voc_threshold,
+        nox_threshold=use_nox_threshold,
+        display_max=use_display_max,
     )
     emit_result(result, output)
 

{rsplot-0.2.2 → rsplot-0.2.4}/src/rsplot/config.py

@@ -24,6 +24,7 @@ else:
 DEFAULT_DATA_DIRS: dict[str, str] = {
     "no2": "/satellite/exports2/yaoyhu/NO2",
     "o3": "/satellite/exports2/yaoyhu/O3",
+    "o3pr": "/satellite/exports2/yaoyhu/O3PR",
     "hcho": "/satellite/exports2/yaoyhu/HCHO",
     "guokong": "/home/zzgsg/data/guokong_combine",
 }

{rsplot-0.2.2 → rsplot-0.2.4}/src/rsplot/fnr.py

@@ -60,6 +60,34 @@ NO2_MIN_COLUMN = 0.5
 FNR_DISPLAY_MAX = 6.0
 
 
+def validate_fnr_thresholds(
+    *,
+    voc_threshold: float = FNR_VOC_LIMIT,
+    nox_threshold: float = FNR_NOX_LIMIT,
+    display_max: float = FNR_DISPLAY_MAX,
+) -> tuple[float, float, float]:
+    """Validate FNR regime/display thresholds and return normalized floats."""
+    values = {
+        "voc_threshold": float(voc_threshold),
+        "nox_threshold": float(nox_threshold),
+        "display_max": float(display_max),
+    }
+    for name, value in values.items():
+        if not np.isfinite(value):
+            raise ValueError(f"{name} 必须是有限数字")
+    if values["voc_threshold"] < 0:
+        raise ValueError("voc_threshold 必须 >= 0")
+    if values["voc_threshold"] >= values["nox_threshold"]:
+        raise ValueError("voc_threshold 必须小于 nox_threshold")
+    if values["nox_threshold"] >= values["display_max"]:
+        raise ValueError("nox_threshold 必须小于 display_max")
+    return (
+        values["voc_threshold"],
+        values["nox_threshold"],
+        values["display_max"],
+    )
+
+
 # ---------------------------------------------------------------------------
 # Date window parsing
 # ---------------------------------------------------------------------------
@@ -361,19 +389,41 @@ def compute_fnr(
 # ---------------------------------------------------------------------------
 # Regime helpers (used by the plotter and the JSON builder)
 # ---------------------------------------------------------------------------
-def classify_regime(fnr: np.ndarray) -> np.ndarray:
+def classify_regime(
+    fnr: np.ndarray,
+    *,
+    voc_threshold: float = FNR_VOC_LIMIT,
+    nox_threshold: float = FNR_NOX_LIMIT,
+) -> np.ndarray:
     """Return int codes: 0=VOC-limited, 1=transition, 2=NOx-limited, -1=NaN."""
+    voc_threshold = float(voc_threshold)
+    nox_threshold = float(nox_threshold)
+    if not np.isfinite(voc_threshold) or not np.isfinite(nox_threshold):
+        raise ValueError("FNR regime thresholds 必须是有限数字")
+    if voc_threshold < 0:
+        raise ValueError("voc_threshold 必须 >= 0")
+    if voc_threshold >= nox_threshold:
+        raise ValueError("voc_threshold 必须小于 nox_threshold")
     code = np.full(fnr.shape, -1, dtype=np.int8)
     valid = np.isfinite(fnr)
-    code[valid & (fnr < FNR_VOC_LIMIT)] = 0
-    code[valid & (fnr >= FNR_VOC_LIMIT) & (fnr <= FNR_NOX_LIMIT)] = 1
-    code[valid & (fnr > FNR_NOX_LIMIT)] = 2
+    code[valid & (fnr < voc_threshold)] = 0
+    code[valid & (fnr >= voc_threshold) & (fnr <= nox_threshold)] = 1
+    code[valid & (fnr > nox_threshold)] = 2
     return code
 
 
-def regime_percentages(fnr: np.ndarray) -> dict[str, float]:
+def regime_percentages(
+    fnr: np.ndarray,
+    *,
+    voc_threshold: float = FNR_VOC_LIMIT,
+    nox_threshold: float = FNR_NOX_LIMIT,
+) -> dict[str, float]:
     """% of valid pixels in each regime."""
-    code = classify_regime(fnr)
+    code = classify_regime(
+        fnr,
+        voc_threshold=voc_threshold,
+        nox_threshold=nox_threshold,
+    )
     valid_total = int((code >= 0).sum())
     if valid_total == 0:
         return {"voc_limited": 0.0, "transition": 0.0, "nox_limited": 0.0}

{rsplot-0.2.2 → rsplot-0.2.4}/src/rsplot/plotting/fnr.py

@@ -2,8 +2,8 @@
 
 Uses the same boundary / basemap / gridline conventions as plot_raster,
 but swaps the continuous colorbar for a 3-segment discrete one aligned
-with the FNR_VOC_LIMIT / FNR_NOX_LIMIT thresholds so the regime readout
-is directly visible on the map.
+with the active VOC/NOx thresholds so the regime readout is directly
+visible on the map.
 """
 
 from __future__ import annotations
@@ -19,7 +19,12 @@ from cartopy.feature import ShapelyFeature
 from cartopy.mpl.gridliner import LATITUDE_FORMATTER, LONGITUDE_FORMATTER
 from matplotlib.colors import BoundaryNorm, ListedColormap
 
-from rsplot.fnr import FNR_DISPLAY_MAX, FNR_NOX_LIMIT, FNR_VOC_LIMIT
+from rsplot.fnr import (
+    FNR_DISPLAY_MAX,
+    FNR_NOX_LIMIT,
+    FNR_VOC_LIMIT,
+    validate_fnr_thresholds,
+)
 from rsplot.plotting.raster import _add_sub_labels, _figsize_for_level
 from rsplot.tiles.tianditu import TianDiTuTiles
 
@@ -36,10 +41,15 @@ _REGIME_COLORS = [
 ]
 
 
-def _build_fnr_cmap() -> tuple[ListedColormap, BoundaryNorm]:
+def _build_fnr_cmap(
+    *,
+    voc_threshold: float,
+    nox_threshold: float,
+    display_max: float,
+) -> tuple[ListedColormap, BoundaryNorm]:
     cmap = ListedColormap(_REGIME_COLORS, name="fnr_regime")
     cmap.set_bad(color="#dddddd", alpha=0.0)  # NaN → transparent
-    bounds = [0.0, FNR_VOC_LIMIT, FNR_NOX_LIMIT, FNR_DISPLAY_MAX]
+    bounds = [0.0, voc_threshold, nox_threshold, display_max]
     norm = BoundaryNorm(bounds, ncolors=cmap.N)
     return cmap, norm
 
@@ -56,8 +66,16 @@ def plot_fnr(
     title: str | None = None,
     output: str | None = None,
     subtitle: str | None = None,
+    voc_threshold: float = FNR_VOC_LIMIT,
+    nox_threshold: float = FNR_NOX_LIMIT,
+    display_max: float = FNR_DISPLAY_MAX,
 ) -> None:
     """Draw an FNR regime map."""
+    voc_threshold, nox_threshold, display_max = validate_fnr_thresholds(
+        voc_threshold=voc_threshold,
+        nox_threshold=nox_threshold,
+        display_max=display_max,
+    )
     params = region.params
     use_basemap = basemap if basemap is not None else params.basemap
 
@@ -74,7 +92,11 @@ def plot_fnr(
         subplot_kw={"projection": projection},
     )
 
-    cmap, norm = _build_fnr_cmap()
+    cmap, norm = _build_fnr_cmap(
+        voc_threshold=voc_threshold,
+        nox_threshold=nox_threshold,
+        display_max=display_max,
+    )
     alpha = 0.65 if use_basemap else 0.9
     im = ax.pcolormesh(
         LON,
@@ -160,16 +182,16 @@ def plot_fnr(
         shrink=shrink,
         pad=0.05,
         ticks=[
-            FNR_VOC_LIMIT / 2,
-            (FNR_VOC_LIMIT + FNR_NOX_LIMIT) / 2,
-            (FNR_NOX_LIMIT + FNR_DISPLAY_MAX) / 2,
+            voc_threshold / 2,
+            (voc_threshold + nox_threshold) / 2,
+            (nox_threshold + display_max) / 2,
         ],
     )
     cb.ax.set_yticklabels(
         [
-            f"VOC-limited\n(<{FNR_VOC_LIMIT:.0f})",
-            f"Transition\n({FNR_VOC_LIMIT:.0f}-{FNR_NOX_LIMIT:.0f})",
-            f"NOx-limited\n(>{FNR_NOX_LIMIT:.0f})",
+            f"VOC-limited\n(<{voc_threshold:g})",
+            f"Transition\n({voc_threshold:g}-{nox_threshold:g})",
+            f"NOx-limited\n(>{nox_threshold:g})",
         ],
         fontsize=8,
     )

{rsplot-0.2.2 → rsplot-0.2.4}/src/rsplot/readers/__init__.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import math
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 import numpy as np
 
@@ -11,10 +11,19 @@ from rsplot.readers.base import BaseReader
 from rsplot.readers.tropomi_hcho import TropomiHCHOReader
 from rsplot.readers.tropomi_no2 import TropomiNO2Reader
 from rsplot.readers.tropomi_o3 import TropomiO3Reader
+from rsplot.readers.tropomi_o3pr import TropomiO3PRReader
 
 HCHO_CMAP = "rsplot_hcho"
 
 
+@dataclass
+class ProductPlotDefaults:
+    """Optional per-product plotting defaults by administrative level."""
+
+    res: float | None = None
+    smooth_sigma: float | None = None
+
+
 @dataclass
 class ProductInfo:
     """Per-product metadata: reader class, display settings, auto-range config."""
@@ -25,6 +34,13 @@ class ProductInfo:
     vmin: float | None  # None = auto from data percentiles
     vmax: float | None
     min_range: float  # minimum vmax-vmin to avoid exaggerating small differences
+    level_defaults: dict[str, ProductPlotDefaults] = field(
+        default_factory=dict
+    )
+
+    def defaults_for_level(self, level: str) -> ProductPlotDefaults:
+        """Return product-specific defaults for an administrative level."""
+        return self.level_defaults.get(level, ProductPlotDefaults())
 
 
 PRODUCT_REGISTRY: dict[str, ProductInfo] = {
@@ -44,6 +60,24 @@ PRODUCT_REGISTRY: dict[str, ProductInfo] = {
         vmax=None,
         min_range=30.0,
     ),
+    "o3pr": ProductInfo(
+        reader_cls=TropomiO3PRReader,
+        colorbar_label="O3 Tropospheric Column from Profile (DU)",
+        cmap="YlOrRd",
+        vmin=None,
+        vmax=None,
+        min_range=5.0,
+        level_defaults={
+            # O3__PR is a coarse 30x30 km profile product. These defaults
+            # keep map pixels close to the native sampling while still using
+            # modest smoothing for display.
+            "country": ProductPlotDefaults(res=0.25, smooth_sigma=1.0),
+            "key_region": ProductPlotDefaults(res=0.15, smooth_sigma=1.2),
+            "province": ProductPlotDefaults(res=0.1, smooth_sigma=1.5),
+            "city": ProductPlotDefaults(res=0.075, smooth_sigma=1.5),
+            "county": ProductPlotDefaults(res=0.05, smooth_sigma=2.0),
+        },
+    ),
     "hcho": ProductInfo(
         reader_cls=TropomiHCHOReader,
         colorbar_label="HCHO VCD (x10^15 molec/cm2)",

rsplot-0.2.4/src/rsplot/readers/tropomi_o3pr.py

@@ -0,0 +1,103 @@
+"""TROPOMI O3 profile tropospheric-column reader.
+
+Reads ``S5P_*_L2__O3__PR`` ozone profile products and uses the provided
+``ozone_tropospheric_column`` variable directly. Values are converted from
+``mol m-2`` to DU.
+"""
+
+from __future__ import annotations
+
+import glob
+import os
+
+import numpy as np
+from rich.progress import track
+
+from rsplot.readers.base import (
+    BaseReader,
+    SwathData,
+    read_tropomi_product_arrays,
+)
+
+VALUE_NAME = "ozone_tropospheric_column"
+
+# mol/m2 -> DU, from the product attribute
+# multiplication_factor_to_convert_to_DU = 2241.15
+UNIT_CONVERSION = 2241.15
+
+
+class TropomiO3PRReader(BaseReader):
+    """Reader for TROPOMI L2 O3 profile tropospheric-column files."""
+
+    def read(
+        self,
+        data_dir: str,
+        date: str,
+        extent: tuple[float, float, float, float],
+        qa_threshold: float = 0.5,
+    ) -> SwathData:
+        patterns = [
+            os.path.join(data_dir, f"S5P_*_L2__O3__PR_{date}T*.nc"),
+            os.path.join(data_dir, f"S5P_*_L2__O3__PR_{date}T*.nc.zip"),
+        ]
+        files: list[str] = []
+        for p in patterns:
+            files.extend(glob.glob(p))
+        files = sorted(set(files))
+        if not files:
+            raise FileNotFoundError(
+                f"未找到匹配文件:\n  "
+                + "\n  ".join(patterns)
+                + "\n请检查 --data-dir 和 --date 参数。"
+            )
+
+        lon_min, lon_max, lat_min, lat_max = extent
+        all_lon, all_lat, all_o3 = [], [], []
+        broken = 0
+        broken_examples: list[str] = []
+
+        for f in track(files, description="[cyan]读取 O3PR 轨道..."):
+            try:
+                lon, lat, o3, qa = read_tropomi_product_arrays(f, VALUE_NAME)
+            except (OSError, ValueError, KeyError) as e:
+                broken += 1
+                if len(broken_examples) < 3:
+                    broken_examples.append(
+                        f"{os.path.basename(f)}: {str(e).splitlines()[0]}"
+                    )
+                continue
+
+            mask = (
+                (qa > qa_threshold)
+                & (lon >= lon_min)
+                & (lon <= lon_max)
+                & (lat >= lat_min)
+                & (lat <= lat_max)
+                & np.isfinite(o3)
+                & (o3 < 1e30)
+            )
+            if mask.sum() > 0:
+                all_lon.append(lon[mask])
+                all_lat.append(lat[mask])
+                all_o3.append(o3[mask] * UNIT_CONVERSION)
+
+        if not all_lon:
+            broken_msg = (
+                "\n损坏/不可读示例:\n  " + "\n  ".join(broken_examples)
+                if broken_examples
+                else ""
+            )
+            raise ValueError(
+                f"{date} 当天 O3PR 无有效数据覆盖目标区域 {extent}。\n"
+                f"共扫描 {len(files)} 个文件，损坏 {broken} 个。"
+                f"{broken_msg}"
+            )
+
+        return SwathData(
+            lon=np.concatenate(all_lon),
+            lat=np.concatenate(all_lat),
+            values=np.concatenate(all_o3),
+            n_pixels=sum(len(a) for a in all_lon),
+            n_files=len(files),
+            n_broken=broken,
+        )

{rsplot-0.2.2 → rsplot-0.2.4}/src/rsplot/results.py

@@ -13,6 +13,8 @@ from typing import TYPE_CHECKING, Any
 
 import numpy as np
 
+from rsplot.fnr import FNR_DISPLAY_MAX, FNR_NOX_LIMIT, FNR_VOC_LIMIT
+
 if TYPE_CHECKING:
     import geopandas as gpd
 
@@ -475,12 +477,13 @@ def _fnr_per_city_stats(
     LAT: np.ndarray,
     fnr: np.ndarray,
     cities_gdf: gpd.GeoDataFrame,
+    *,
+    voc_threshold: float,
+    nox_threshold: float,
 ) -> list[dict[str, Any]]:
     """Per-city mean FNR and dominant regime."""
     from shapely.vectorized import contains
 
-    from rsplot.fnr import FNR_NOX_LIMIT, FNR_VOC_LIMIT
-
     rows: list[dict[str, Any]] = []
     for _, row in cities_gdf.iterrows():
         mask = contains(row.geometry, LON, LAT)
@@ -489,9 +492,9 @@ def _fnr_per_city_stats(
         if len(finite) == 0:
             continue
         mean_fnr = float(np.mean(finite))
-        if mean_fnr < FNR_VOC_LIMIT:
+        if mean_fnr < voc_threshold:
             regime = "voc_limited"
-        elif mean_fnr <= FNR_NOX_LIMIT:
+        elif mean_fnr <= nox_threshold:
             regime = "transition"
         else:
             regime = "nox_limited"
@@ -503,10 +506,10 @@ def _fnr_per_city_stats(
                 "median_fnr": _round(np.median(finite)),
                 "regime": regime,
                 "voc_limited_pct": round(
-                    100 * float((finite < FNR_VOC_LIMIT).mean()), 1
+                    100 * float((finite < voc_threshold).mean()), 1
                 ),
                 "nox_limited_pct": round(
-                    100 * float((finite > FNR_NOX_LIMIT).mean()), 1
+                    100 * float((finite > nox_threshold).mean()), 1
                 ),
             }
         )
@@ -520,13 +523,20 @@ def build_fnr_result(
     fnr_out: FnrResult,
     res: float,
     output: str,
+    voc_threshold: float = FNR_VOC_LIMIT,
+    nox_threshold: float = FNR_NOX_LIMIT,
+    display_max: float = FNR_DISPLAY_MAX,
 ) -> dict[str, Any]:
     """Build the JSON sidecar for an FNR run."""
     from rsplot.fnr import (
-        FNR_DISPLAY_MAX,
-        FNR_NOX_LIMIT,
-        FNR_VOC_LIMIT,
         regime_percentages,
+        validate_fnr_thresholds,
+    )
+
+    voc_threshold, nox_threshold, display_max = validate_fnr_thresholds(
+        voc_threshold=voc_threshold,
+        nox_threshold=nox_threshold,
+        display_max=display_max,
     )
 
     fnr = fnr_out.fnr
@@ -585,9 +595,9 @@ def build_fnr_result(
         "params": {
             "n_min": fnr_out.n_min,
             "no2_min_column": fnr_out.no2_min_column,
-            "voc_threshold": FNR_VOC_LIMIT,
-            "nox_threshold": FNR_NOX_LIMIT,
-            "display_max": FNR_DISPLAY_MAX,
+            "voc_threshold": voc_threshold,
+            "nox_threshold": nox_threshold,
+            "display_max": display_max,
             "resolution_deg": res,
         },
         "stats": {
@@ -599,7 +609,11 @@ def build_fnr_result(
             "mask_diagnostics": mask_diagnostics,
             **_basic_stats(fnr),
         },
-        "regime_pct": regime_percentages(fnr),
+        "regime_pct": regime_percentages(
+            fnr,
+            voc_threshold=voc_threshold,
+            nox_threshold=nox_threshold,
+        ),
         "mean_fields": {
             "hcho_mean_raw_stats": _basic_stats(fnr_out.hcho_mean),
             "no2_mean_raw_stats": _basic_stats(fnr_out.no2_mean),
@@ -611,7 +625,12 @@ def build_fnr_result(
     sub_gdf = region.sub_boundary_gdf
     if sub_gdf is not None and len(sub_gdf) > 0:
         result["city_ranking"] = _fnr_per_city_stats(
-            fnr_out.LON, fnr_out.LAT, fnr, sub_gdf
+            fnr_out.LON,
+            fnr_out.LAT,
+            fnr,
+            sub_gdf,
+            voc_threshold=voc_threshold,
+            nox_threshold=nox_threshold,
         )
 
     return result