pygnss 0.6.0__cp310-cp310-musllinux_1_2_i686.whl → 0.7.0__cp310-cp310-musllinux_1_2_i686.whl

pygnss/__init__.py

@@ -1 +1 @@
-__version__ = "0.6.0"
+__version__ = "0.7.0"

pygnss/ionex.py

@@ -4,8 +4,10 @@ import math
 import os
 from typing import List
 
+import nequick
 import numpy as np
 
+
 from .iono import gim
 from .decorator import read_contents
 
@@ -268,14 +270,43 @@ def _parse_ionex_epoch(ionex_line: str) -> datetime.datetime:
     return datetime.datetime.strptime(ionex_line[:36], _HEADER_EPOCH_FORMAT)
 
 
+
+class NeQuickGimHandlerArray(gim.GimHandler):
+    """
+    Handler to store the incoming GIMs in arrays
+    """
+
+    def __init__(self):
+        self.vtec_gims: List[gim.Gim] = []
+
+    def process(self, nequick_gim: nequick.Gim):
+        """
+        Process a GIM file
+        """
+
+        incoming_gim = gim.Gim(nequick_gim.epoch,
+                               nequick_gim.longitudes, nequick_gim.latitudes,
+                               nequick_gim.vtec_values)
+
+        self.vtec_gims.append(incoming_gim)
+
+
 def cli():
     """
     This function allows users to compute the difference between two IONEX files
+    or between an IONEX file and the NeQuick model (with three coefficients),
     and save the result in a new IONEX file.
+
+
+    Example:
+        Compute the difference between two IONEX files:
+        $ python ionex.py file1.ionex file2.ionex output.ionex
+
+        Compute the difference between an IONEX file and the NeQuick model:
+        $ python ionex.py file1.ionex output.ionex --nequick 0.123 0.456 0.789
     """
-    parser = argparse.ArgumentParser(
-        description="Compute the difference between two IONEX files and save the result in a new IONEX file."
-    )
+    parser = argparse.ArgumentParser(description=cli.__doc__,
+                                     formatter_class=argparse.RawDescriptionHelpFormatter )
 
     parser.add_argument(
         "lhs",
@@ -284,19 +315,96 @@ def cli():
     )
 
     parser.add_argument(
-        "rhs",
+        "output",
+        type=str,
+        help="Path to the output IONEX file where the differences will be saved.",
+    )
+
+    rhs = parser.add_mutually_exclusive_group(required=True)
+
+    rhs.add_argument(
+        "--rhs",
         type=str,
-        help="Path to the second IONEX file (right-hand side).",
+        help="Path to the second IONEX file (right-hand side). If not provided, --nequick must be specified.",
+    )
+
+    rhs.add_argument(
+        "--nequick",
+        type=float,
+        nargs=3,
+        metavar=("AZ0", "AZ1", "AZ2"),
+        help="Use the NeQuick model to compare against the 'lhs' IONEX (instead of another IONEX file). "
+        "Specify the three NeQuick coefficients (az0, az1, az2).",
     )
 
     parser.add_argument(
-        "output",
+        "--nequick-ionex",
         type=str,
-        help="Path to the output IONEX file where the differences will be saved.",
+        default=None,
+        required=False,
+        metavar='<file>',
+        help="Specify a filename to store the NeQuick model in IONEX format",
     )
 
     args = parser.parse_args()
 
     PGM = "ionex_diff"
 
-    diff(args.lhs, args.rhs, args.output, pgm=PGM)
+    # Validate input arguments
+    if args.rhs is None and args.nequick is None:
+        parser.error("Either a second IONEX file (rhs) or the '--nequick' option must be provided.")
+
+    if args.rhs is not None and args.nequick is not None:
+        parser.error("You cannot specify both a second IONEX file (rhs) and the '--nequick' option.")
+
+    if args.nequick_ionex is not None and args.nequick is None:
+        parser.error("Cannot output the IONEX file with the NeQuick model without the '--nequick' option.")
+
+    # Process the lhs IONEX file
+    gim_handler_lhs = gim.GimHandlerArray()
+    load(args.lhs, gim_handler=gim_handler_lhs)
+
+    # Add comments to the output file
+    comment_lines = [
+        "This IONEX file contains the differences of VTEC values,",
+        "computed as vtec_left - vtec_right, where:",
+        f"- vtec_left: {os.path.basename(args.lhs)}"
+    ]
+
+    # Process the rhs input (either an IONEX file or NeQuick coefficients)
+    gim_handler_rhs = None
+    if args.rhs:
+        gim_handler_rhs = gim.GimHandlerArray()
+        # Load the second IONEX file
+        load(args.rhs, gim_handler=gim_handler_rhs)
+        comment_lines += [f"- vtec_right: {os.path.basename(args.rhs)}"]
+
+    else:
+        gim_handler_rhs = NeQuickGimHandlerArray()
+        # Generate GIMs using NeQuick coefficients
+        coeffs = args.nequick
+        nequick_desc = ["NeQuick model", f"   az0={coeffs[0]}", f"   az1={coeffs[1]}", f"   az2={coeffs[2]}"]
+        comment_lines += [f"- vtec_right: {nequick_desc[0]}"] + nequick_desc[1:]
+
+        for ionex_gim in gim_handler_lhs.vtec_gims:
+
+            nequick.to_gim(nequick.Coefficients(*coeffs),
+                           ionex_gim.epoch,
+                           latitudes = ionex_gim.latitudes,
+                           longitudes = ionex_gim.longitudes,
+                           gim_handler= gim_handler_rhs)
+
+    # Compute the difference
+    gim_diffs = gim.subtract_gims(gim_handler_lhs.vtec_gims, gim_handler_rhs.vtec_gims)
+
+
+    # Write the result to the output file
+    write(args.output, gim_diffs, gim.GimType.TEC, pgm=PGM, comment_lines=comment_lines)
+
+    if args.nequick_ionex is not None:
+        comment_lines = [
+            "TEC values generated with the " + nequick_desc[0]
+        ] + nequick_desc[1:]
+
+        write(args.nequick_ionex, gim_handler_lhs.vtec_gims, gim.GimType.TEC, pgm=PGM,
+              comment_lines=comment_lines )

pygnss/iono/gim.py

@@ -50,8 +50,8 @@ class GimHandlerArray(GimHandler):
     """
 
     def __init__(self):
-        self.vtec_gims = []
-        self.rms_gims = []
+        self.vtec_gims: List[Gim] = []
+        self.rms_gims: List[Gim] = []
 
     def process(self, gim: Gim, type: GimType):
         """

{pygnss-0.6.0.dist-info → pygnss-0.7.0.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: pygnss
-Version: 0.6.0
+Version: 0.7.0
 Summary: Package with utilities and tools for GNSS data processing
 Author-email: Miquel Garcia-Fernandez <miquel@mgfernan.com>
 License: MIT
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: nequick
+Requires-Dist: nequick>=0.2.0
 Requires-Dist: numpy
 Requires-Dist: pandas>=2.2
 Requires-Dist: pyarrow>=18.0.0

{pygnss-0.6.0.dist-info → pygnss-0.7.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pygnss/__init__.py,sha256=cID1jLnC_vj48GgMN6Yb1FA3JsQ95zNmCHmRYE8TFhY,22
+pygnss/__init__.py,sha256=RaANGbRu5e-vehwXI1-Qe2ggPPfs1TQaZj072JdbLk4,22
 pygnss/_c_ext.cpython-310-i386-linux-gnu.so,sha256=naP54luFlM5URiGMrl9GO76MvtUFL22sZundy9GLCXk,80356
 pygnss/cl.py,sha256=ISmd2RjikUMmj3nLPN0VSjvQLG5rLizp2X2ajeBkoDE,4509
 pygnss/constants.py,sha256=1hF6K92X6E6Ofo0rAuCBCgrwln9jxio26RV2a6vyURk,133
@@ -6,7 +6,7 @@ pygnss/decorator.py,sha256=qB-0jl2GTEHJdvmDruNll5X3RrdySssv94u9Hok5-lA,1438
 pygnss/file.py,sha256=kkMBWjoTPkxJD1UgH0mXJT2fxnhU8u7_l2Ph5Xz2-hY,933
 pygnss/geodetic.py,sha256=3q8Rpl4b5CxGlhdn1nQRBHHSW1v-0PBFz54zOeVyO74,33633
 pygnss/hatanaka.py,sha256=P9XG6bZwUzfAPYn--6-DXfFQIEefeimE7fMJm_DF5zE,1951
-pygnss/ionex.py,sha256=Sk0U_hRyYE7cEwLyMIgiY-2bBs6wktzKmZdI92HrU7c,10422
+pygnss/ionex.py,sha256=WcY6PVwjzATjqyC0Htc5Jh_cv2a7yz4TZIcD723TpsY,14325
 pygnss/logger.py,sha256=4kvcTWXPoiG-MlyP6B330l4Fu7MfCuDjuIlIiLA8f1Y,1479
 pygnss/nequick.py,sha256=tSsUw3FoRWS-TBKKVb0_c90DFz_2jUTkUvNPsGQOLA8,1722
 pygnss/rinex.py,sha256=LsOOh3Fc263kkM8KOUBNeMeIAmbOn2ASSBO4rAUJWj8,68783
@@ -27,14 +27,14 @@ pygnss/gnss/observables.py,sha256=0x0NLkTjxf8cO9F_f_Q1b-1hEeoNjWB2x-53ecUEv0M,16
 pygnss/gnss/residuals.py,sha256=8qKGNOYkrqxHGOSjIfH21K82PAqEh2068kf78j5usL8,1244
 pygnss/gnss/types.py,sha256=lmL15KRckRiTwVkYvGzF4c1BrojnQlegrYCXSz1hGaI,10377
 pygnss/iono/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pygnss/iono/gim.py,sha256=bJ-1jRIrkZj790fuCk3np72NrPaG_Qvx-EVZsvWMfsk,3521
+pygnss/iono/gim.py,sha256=khKzClxLf46mVO6BCDk9u9DgS_50d-sbWEyoUQu7Jng,3543
 pygnss/orbit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pygnss/orbit/kepler.py,sha256=QORTgg5yBtsQXxLWSzoZ1pmh-CwPiZlFdIYqhQhv1a0,1745
 pygnss/orbit/tle.py,sha256=6CIEielPgui3DXNv46XxOGlig31ROIwjH42xLGaeE5M,5905
 pygnss/parsers/rtklib/stats.py,sha256=YV6yadxMeQMQYZvsUCaSf4ZTpK8Bbv3f2xgu0l4PekA,5449
-pygnss-0.6.0.dist-info/METADATA,sha256=0gGj855FG6F9WGYHCsZ3gbEPX8avn7JP_P5r3QNExa4,1659
-pygnss-0.6.0.dist-info/WHEEL,sha256=jUtiY_FpDXzE1gj-Bw548k9m-xJORiWhDK-vIohHdUY,110
-pygnss-0.6.0.dist-info/entry_points.txt,sha256=awWUCMfX3uMIAPPZqZfSUuw7Kd7defip8L7GtthKqgg,292
-pygnss-0.6.0.dist-info/top_level.txt,sha256=oZRSR-qOv98VW2PRRMGCVNCJmewcJjyJYmxzxfeimtg,7
-pygnss-0.6.0.dist-info/RECORD,,
-pygnss-0.6.0.dist-info/licenses/LICENSE,sha256=Wwany6RAAZ9vVHjFLA9KBJ0HE77d52s2NOUA1CPAEug,1067
+pygnss-0.7.0.dist-info/METADATA,sha256=UGioECEGQJ7eQSa5yaZTnf3aNKvXG2dsiJVrhu0sPk0,1666
+pygnss-0.7.0.dist-info/WHEEL,sha256=jUtiY_FpDXzE1gj-Bw548k9m-xJORiWhDK-vIohHdUY,110
+pygnss-0.7.0.dist-info/entry_points.txt,sha256=awWUCMfX3uMIAPPZqZfSUuw7Kd7defip8L7GtthKqgg,292
+pygnss-0.7.0.dist-info/top_level.txt,sha256=oZRSR-qOv98VW2PRRMGCVNCJmewcJjyJYmxzxfeimtg,7
+pygnss-0.7.0.dist-info/RECORD,,
+pygnss-0.7.0.dist-info/licenses/LICENSE,sha256=Wwany6RAAZ9vVHjFLA9KBJ0HE77d52s2NOUA1CPAEug,1067