Add country kwarg to aiscat Decoder; bump 0.68.2 -> 0.68.3

Author: jvde-github

python/README.md

@@ -49,18 +49,21 @@ For perspective: a busy AIS shore station produces ~50 msg/s. Throughput matters
 
 ```python
 class Decoder:
-    def __init__(self, *, annotated: bool = False) -> None: ...
+    def __init__(self, *, annotated: bool = False, country: bool = False) -> None: ...
     def feed(self, data: bytes | bytearray | str) -> int: ...
     def next(self) -> dict | None: ...
     def pending(self) -> int: ...
 
-def iter_decode(chunks: Iterable[bytes | str], *, annotated: bool = False) -> Iterator[dict]: ...
+def iter_decode(
+    chunks: Iterable[bytes | str], *, annotated: bool = False, country: bool = False
+) -> Iterator[dict]: ...
 ```
 
 - `feed(data)` parses NMEA AIVDM/AIVDO sentences out of the buffer. Multipart messages are reassembled internally; partial chunks are buffered until completed. Returns the number of decoded messages waiting.
 - `next()` pops one decoded message as a `dict`, or `None` if the queue is empty. Pop in a loop after each `feed()`.
 - The queue is unbounded — drain it after each feed, or memory grows.
 - `annotated=True` wraps every scalar as `{"value": x, "unit": ..., "description": ..., "text": ...}` (the latter three included only when defined for that key) — useful for self-describing displays and field reference. See [Annotated mode](#annotated-mode) below.
+- `country=True` adds `country` and `country_code` to every message, derived from the MMSI prefix (ITU-R M.585 MID table).
 
 ```python
 # Streaming pattern

python/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "aiscat"
-version = "0.68.2"
+version = "0.68.3"
 description = "Fast Python bindings for AIS-catcher's NMEA-to-JSON AIS decoder"
 readme = "README.md"
 license = "GPL-3.0-or-later"

python/src/aiscat/__init__.py

@@ -3,18 +3,21 @@
 from ._core import Decoder
 from .types import AISMessage
 
-__version__ = "0.68.2"
+__version__ = "0.68.3"
 __all__ = ["Decoder", "iter_decode", "AISMessage"]
 
 
-def iter_decode(chunks, *, annotated=False):
+def iter_decode(chunks, *, annotated=False, country=False):
     """Yield decoded AIS messages (as dicts) from an iterable of bytes/str chunks.
 
     If ``annotated`` is True, every scalar value is wrapped as
     ``{"value": x, "unit": ..., "description": ..., "text": ...}`` (the latter
     three fields included only when defined for that key).
+
+    If ``country`` is True, every message gets ``country`` and ``country_code``
+    fields derived from the MMSI prefix.
     """
-    dec = Decoder(annotated=annotated)
+    dec = Decoder(annotated=annotated, country=country)
     for chunk in chunks:
         dec.feed(chunk)
         msg = dec.next()

python/src/aiscat/_core.cpp

@@ -177,9 +177,9 @@ typedef struct {
 } DecoderObject;
 
 static int Decoder_init(DecoderObject *self, PyObject *args, PyObject *kwds) {
-    static const char *kwlist[] = {"annotated", nullptr};
-    int annotated = 0;
-    if (!PyArg_ParseTupleAndKeywords(args, kwds, "|p", (char **)kwlist, &annotated))
+    static const char *kwlist[] = {"annotated", "country", nullptr};
+    int annotated = 0, country = 0;
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "|pp", (char **)kwlist, &annotated, &country))
         return -1;
 
     self->nmea = new AIS::NMEA();
@@ -188,6 +188,7 @@ static int Decoder_init(DecoderObject *self, PyObject *args, PyObject *kwds) {
     self->sink->annotated = (annotated != 0);
     self->tag = new TAG();
     self->tag->clear();
+    if (country) self->tag->mode |= 4;  // enables JSONAIS::COUNTRY (MMSI prefix → country, country_code)
     self->nmea->out.Connect(self->jsonais);
     self->jsonais->out.Connect(self->sink);
     return 0;