From 8dd2368409d63193ebfadf0b36395210b2309e54 Mon Sep 17 00:00:00 2001 From: semuadmin <28569967+semuadmin@users.noreply.github.com> Date: Wed, 10 Apr 2024 15:49:55 +0100 Subject: [PATCH 1/2] fix IGM05/6 parsing --- src/pyrtcm/rtcmmessage.py | 4 ++-- tests/pygpsdata-NTRIP-4076.log | Bin 2806 -> 4810 bytes tests/test_stream.py | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pyrtcm/rtcmmessage.py b/src/pyrtcm/rtcmmessage.py index d535991..d080014 100644 --- a/src/pyrtcm/rtcmmessage.py +++ b/src/pyrtcm/rtcmmessage.py @@ -131,8 +131,8 @@ def _set_attribute_group(self, att: tuple, offset: int, index: list) -> tuple: rng = numr else: # number of repeats is defined in named attribute # if attribute is within a group - # append group index to name e.g. "DF379_01" - if numr == "DF379": + # append group index to name e.g. "DF379_01", "IDF023_03" + if numr in ("DF379", "IDF023"): numr += f"_{index[-1]:02d}" rng = getattr(self, numr) if numr == "IDF035": # 4076_201 range is n-1 diff --git a/tests/pygpsdata-NTRIP-4076.log b/tests/pygpsdata-NTRIP-4076.log index 9712bdf87cedd0b480f244c1f0d233c30b7db53b..f8cc5138e75828c090c1f0b82ef6054fdb28f13f 100644 GIT binary patch delta 2027 zcmciB{ZAWp0LSs~T_0Hscfg>Cb-i`SbL3%DAd%d)HUk#NAX7|Gq#Z078D>sgY!=4% zII0vOw6fuFK?jUPXAqH$Wlr>39>+380Vgrb27{Fj1W^X1l-?QHV!|I_|AEgB?@wN9 zAvd4xTH67~5g|9koSzrt0DVI(7?j z$7^0b4vJnxH##g&>KR(LsKov|HvVJDq{$ zoqbqiQcOm=LU&Dnes^ys5mhIJv!E(dU2Ua`!a`FKhc$1UU>j5Bmbn=6(w7=w)Q3-r z{-#Rw40r5ad%tIvV@8C6%k&uSS0YGnlewxYp2Ge*yk1m{OB~1$INC0DnF;Kczy#tl z{SR5G{Y}^;IASFY|IRvbKAmjQX^?O|*&>P6_*of<-m$e)0XnAP$VA*Y@_-vke%zvb zch!QXe1p~Zr-EQYG_N8bl&K->&gY29+{U?Lf>a31v(sE%J; z3h_21*`(IW)M(u?sd+k}gHSM^rB!a^u(=7pf8ojD-%40Q1HeI{Ux_vhQZGrQ8ojGm zrp*TXgyI@a4i%dr3ek7GDDAEXDMCq%CYy>G7WwOYNv`21Y)0fwg9RB2bKW!XYA-S) z$3_O-hKg@8Zf9&v!`$%1iq3@F3YTG6@~DklX8SI!ALe(kv%AnNhs2@w5^U+7#VYT0 z_DW6|d0H_KYdwv@f>lGs4~5?ax(wWU;oXNym0jlUh3#kRDabBPMZB0W`fSI zm*v}wjsEpYRgY|4%^k3eU~Vm+WJKzlRGqT5WKL|cjjnfdoN-E|q#Dnu1_Wzw!%(cq z9$0SkY!;do&WJN8Y<+E|Ljr=d=&hDdiQu!$n_XEKxodY?%f`W<+z`xveD^Cs0Gq0u zBwqbMo~i@lRxm(C)rp83*j&FihdrfQQsXMN+P%A?jvN~#$RDvyhSx!7Jq5>9n}d84 zKTpu!ePoYpIhVt;5DyODQ_K`?zS}KWS>`SzT&-TSn}DPeiKkwWOZqcGB#KVamat$L zg@YKANQ0;o)uRNtA_ez>R4*ndpv1)kNTw}bNApeOqgwAt{>n!HxkhPmxd7=&7VtLy zMgl*~HJAV~E!;`D<>9ND7>@$Lu7m*@uIj0F87g*>Lz4vQ#`rdV3VK0-X7CC4h5cLL zq0hx{2M>KN{y*?>ZC{Tga7+AF3?GT#4j%ek{C4or=i;}6hdvYU_uHv0@%iVs-hKie Q`ds{W@J0W(cy(6(KgmIZ;{X5v delta 7 OcmX@5`b~7hH!c7VlLM;& diff --git a/tests/test_stream.py b/tests/test_stream.py index 0eef9fb..594168e 100644 --- a/tests/test_stream.py +++ b/tests/test_stream.py @@ -284,6 +284,12 @@ def testigsssr4076( "", "", "", + "", + "", + "", + "", + "", + "", ] dirname = os.path.dirname(__file__) with open(os.path.join(dirname, "pygpsdata-NTRIP-4076.log"), "rb") as stream: From 6589548b2240b300830ed59f0e4c040b94178416 Mon Sep 17 00:00:00 2001 From: semuadmin <28569967+semuadmin@users.noreply.github.com> Date: Wed, 10 Apr 2024 15:53:08 +0100 Subject: [PATCH 2/2] update to 1.0.18 --- .vscode/settings.json | 2 +- RELEASE_NOTES.md | 6 ++++++ pyproject.toml | 2 +- src/pyrtcm/_version.py | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 2448ea9..0a30638 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,5 +4,5 @@ "editor.formatOnSave": true, "modulename": "${workspaceFolderBasename}", "distname": "${workspaceFolderBasename}", - "moduleversion": "1.0.17" + "moduleversion": "1.0.18" } \ No newline at end of file diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 1e2de33..dcb44ef 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,11 @@ # pyrtcm Release Notes +### RELEASE 1.0.18 + +FIXES: + +1. Fix IGM05/06 message parsing (e.g. 4076_025, 4076_066, etc.). + ### RELEASE 1.0.17 ENHANCEMENTS: diff --git a/pyproject.toml b/pyproject.toml index 05644e7..bfab38c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "pyrtcm" authors = [{ name = "semuadmin", email = "semuadmin@semuconsulting.com" }] maintainers = [{ name = "semuadmin", email = "semuadmin@semuconsulting.com" }] description = "RTCM3 protocol parser" -version = "1.0.17" +version = "1.0.18" license = { file = "LICENSE" } readme = "README.md" requires-python = ">=3.8" diff --git a/src/pyrtcm/_version.py b/src/pyrtcm/_version.py index f72a03f..2c88417 100644 --- a/src/pyrtcm/_version.py +++ b/src/pyrtcm/_version.py @@ -8,4 +8,4 @@ :license: BSD 3-Clause """ -__version__ = "1.0.17" +__version__ = "1.0.18"