Merge pull request #1210 from akrherz/cwa_groupdict

🐛 Account for CNCL as CWA cancellation string

Author: akrherz

CHANGELOG.md

@@ -24,6 +24,7 @@ All notable changes to this library are documented in this file.
 
 ### Bug Fixes
 
+- Account for `CNCL` as a cancellation string in `CWA` products.
 - Add preflight check of MOS database write for known column storage.
 - Improve enforcement of str types into autoplot context parsing.
 - Support `with_sqlalchemy_conn` to decorate a generator.

data/product_examples/CWA/CWAZSE_groupdict.txt

@@ -0,0 +1,7 @@
+136
+FAUS26 KZSE 290320
+ZSE6 CWA 290320
+ZSE CWA 602 VALID UNTIL 290335
+CNCL ZSE CWSU 601. REFER TO CONVECTIVE SIGMET 19W FOR FURTHER
+INFORMATION. ZSE CWSU DS290320Z.
+=

src/pyiem/nws/products/cwa.py

@@ -1,14 +1,11 @@
 """Center Weather Advisories (CWA)"""
 
-# Stdlib imports
 import math
 import re
 from typing import Tuple
 
-# Third Party
 from shapely.geometry import LineString, Point, Polygon
 
-# Local stuff
 from pyiem.models.cwa import CWAModel
 from pyiem.nws.product import TextProduct
 from pyiem.nws.ugc import str2time
@@ -35,7 +32,7 @@
 )
 NM_WIDE = re.compile(r"(\s|\.)(?P<width>\d+)\s?NM WIDE")
 DIAMETER = re.compile(r"DIAM (?P<diameter>\d+)\s?NM")
-CANCEL_LINE = re.compile("(CANCEL|ERROR)")
+CANCEL_LINE = re.compile("(CANCEL|ERROR|CNCL)")
 
 
 dirs = {
@@ -158,6 +155,7 @@ def parse_polygon(prod: TextProduct, line: str) -> Tuple[Polygon, str]:
     m = NM_WIDE.search(prod.unixtext)
     if not pts:
         return None, narrative
+    poly = None
     if len(pts) >= 2 and m is not None:
         res = m.groupdict()
         # approx
@@ -170,13 +168,14 @@ def parse_polygon(prod: TextProduct, line: str) -> Tuple[Polygon, str]:
 
     elif len(pts) == 1:
         # We have a point
-        res = DIAMETER.search(prod.unixtext).groupdict()
-        # approx
-        diameter_deg = float(res["diameter"]) * KM_NM / 111.0
-        poly = Point(*pts[0]).buffer(diameter_deg / 2)
+        if m := DIAMETER.search(prod.unixtext):
+            res = m.groupdict()
+            # approx
+            diameter_deg = float(res["diameter"]) * KM_NM / 111.0
+            poly = Point(*pts[0]).buffer(diameter_deg / 2)
     else:
         poly = Polygon(pts)
-    if not poly.is_valid:
+    if poly and not poly.is_valid:
         poly = poly.buffer(0)
         msg = "\n".join(workdone)
         if any(

tests/nws/products/test_cwa.py

@@ -1,10 +1,8 @@
 """CWA"""
 
-# third party
 import pytest
 from shapely.geometry import Polygon
 
-# this
 from pyiem.nws.products.cwa import parser
 from pyiem.util import get_test_file, utc
 
@@ -34,6 +32,18 @@
 }
 
 
+def test_260529_handle_groupdict():
+    """Test that we don't get any warnings for this and it is handled."""
+    utcnow = utc(2026, 5, 29, 0)
+    prod = parser(
+        get_test_file("CWA/CWAZSE_groupdict.txt"),
+        utcnow=utcnow,
+        nwsli_provider=LOCS,
+    )
+    assert prod.data is None
+    assert not prod.warnings
+
+
 def test_250417_none_groupdict():
     """Test that we at least get a nice warning about this."""
     utcnow = utc(2025, 4, 17, 2, 8)