update rinexconv

Author: semuadmin

RELEASE_NOTES.md

@@ -5,6 +5,11 @@
 FIXES:
 
 1. Restore (nested) pynmeagps dependency in pyproject.toml. Fixes #136
+1. Fix blank meteorology output file error. Fixes #138
+
+CHANGES:
+
+1. Updates to rinex conversion to support RINEX version 4.02 in addition to 3.05.
 
 ### RELEASE 1.2.0
 

examples/process_rxmsfrbx_frames.py

@@ -5,7 +5,7 @@
 raw NAV subframes from a UBX RXM-SFRBX data log using
 the pygnssutils.RawNav utility class.
 
-This collates the following subframes for each SV4
+This collates the following subframes for each SV
 into a single RawNav object.
 
  - subframe 1: clock corrections, sv health, etc.
@@ -42,7 +42,7 @@
 SFR2 = 2
 SFR3 = 4
 SFR4 = 8
-TARGET_SFR = SFR1 | SFR2 | SFR3  # | SFR4
+TARGET_SFR = SFR1 | SFR2 | SFR3 # | SFR4
 
 
 def main(**kwargs):
@@ -67,9 +67,7 @@ def main(**kwargs):
             tot += 1
 
             sfrdata = RawNav.process_rxm_sfrbx(parsed)
-            if sfrdata.get("gnss", "") != GPS or sfrdata.get("sigid", "") not in (
-                "1C",
-            ):
+            if sfrdata.get("gnss", "") != GPS or sfrdata.get("sigid", "") not in ("1C","2L"):
                 continue
 
             gnss = sfrdata["gnss"]
@@ -98,8 +96,6 @@ def main(**kwargs):
                 if nav.sfracq & 0b111 == TARGET_SFR:
                     frame = navs.pop((gnss, svid))
                     print(f"{str(frame)}\n")
-                    # if frame.svid == 19:
-                    #     print(f"{frame.gnss}{frame.svid=:02d}, {frame.tow=}, {frame.iodc=}")
                     lnavs[svid] = lnavs.get(svid, 0) + 1
                 sfr += 1
             except RINEXProcessingError:

src/pygnssutils/rinex_conv.py

@@ -43,6 +43,7 @@
     MET,
     NAV,
     OBS,
+    RINEX4,
     RINEX_CANCELLED,
     RINEX_ERROR,
     RINEX_NORECS,
@@ -272,7 +273,7 @@ def process_input_data(
             for raw, parsed in gnr:
                 if stopevent is not None:
                     if stopevent.is_set():
-                        raise RINEXProcessingError("Cancelled")
+                        raise KeyboardInterrupt("Terminated by user")
                 if raw is not None:
                     self._tot += 1
                     self._progress = int(round(100 * self._tot / self._msgcount, 0))
@@ -300,9 +301,6 @@ def process_input_data(
             self.process_output_data(rinextypes)
             res = RINEX_OK
 
-        # except (TypeError, ValueError, AttributeError) as err:
-        #     self.logger.error(err)
-        #     res = RINEX_ERROR
         except RINEXProcessingError as err:
             self.logger.error(f"Processing error {err}")
             res = RINEX_ERROR
@@ -346,7 +344,7 @@ def format_header_common(self, rinextype: Literal["O", "N", "M"]) -> str:
             + format_runby()
             + format_comments(self.user_comments)
         )
-        if self._rinex_version >= "4.00":
+        if self._rinex_version >= RINEX4:
             hdr += (
                 format_doi(self._doi)
                 + format_licenseofuse(self._license)

src/pygnssutils/rinex_conv_cli.py

@@ -33,6 +33,7 @@
     RINEX_OK,
     RINEXTYPE,
     RINEXVER_DEFAULT,
+    RINEXVERSIONS,
 )
 from pygnssutils.rinex_helpers import listify
 
@@ -64,8 +65,9 @@ def main():
         "-R",
         "--rinexver",
         required=False,
-        help="RINEX Version e.g. '3.05'",
+        help="RINEX Version",
         type=str,
+        choices=RINEXVERSIONS,
         default=RINEXVER_DEFAULT,
     )
     ap.add_argument(
@@ -153,6 +155,27 @@ def main():
         type=str,
         default="",
     )
+    ap.add_argument(
+        "--doi",
+        required=False,
+        help="Digital Object Identifier (RINEX 4 only)",
+        type=str,
+        default="",
+    )
+    ap.add_argument(
+        "--license",
+        required=False,
+        help="License of Use (RINEX 4 only)",
+        type=str,
+        default="",
+    )
+    ap.add_argument(
+        "--station",
+        required=False,
+        help="Station Information (RINEX 4 only)",
+        type=str,
+        default="",
+    )
     ap.add_argument(
         "--comments",
         required=False,
@@ -191,6 +214,9 @@ def main():
         protfilter=int(
             kwargs.pop("protfilter", NMEA_PROTOCOL | UBX_PROTOCOL | RTCM3_PROTOCOL)
         ),
+        doi=kwargs.pop("doi", ""),
+        license=kwargs.pop("license", ""),
+        station=kwargs.pop("station", ""),
         **kwargs,
     )
     res = rc.process_input(