Merge branch 'ashwin/measures_sats' into derek/sort-where

Author: betaBison

docs/source/requirements.txt

@@ -113,7 +113,7 @@ pyzmq==25.0.2 ; python_version >= "3.8" and python_version < "3.12"
 qtconsole==5.4.2 ; python_version >= "3.8" and python_version < "3.12"
 qtpy==2.3.1 ; python_version >= "3.8" and python_version < "3.12"
 reindent==3.5.1 ; python_version >= "3.8" and python_version < "3.12"
-requests==2.28.2 ; python_version >= "3.8" and python_version < "3.12"
+requests==2.29.0 ; python_version >= "3.8" and python_version < "3.12"
 rfc3339-validator==0.1.4 ; python_version >= "3.8" and python_version < "3.12"
 rfc3986-validator==0.1.1 ; python_version >= "3.8" and python_version < "3.12"
 scipy==1.10.1 ; python_version >= "3.8" and python_version < "3.12"

gnss_lib_py/utils/sv_models.py

@@ -352,6 +352,13 @@ def _combine_gnss_sv_ids(measurement_frame):
     measurement_frame : gnss_lib_py.parsers.navdata.NavData
         NavData instance containing measurements including `gnss_id` and
         `sv_id`.
+
+    Returns
+    -------
+    gnss_sv_id : np.ndarray
+	New row values that combine `gnss_id` and `sv_id` into a something
+	similar to 'R01' or 'G12' for example.
+
     """
     constellation_char_inv = {const : gnss_char for gnss_char, const in consts.CONSTELLATION_CHARS.items()}
     gnss_chars = [constellation_char_inv[const] for const in measurement_frame['gnss_id']]

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gnss-lib-py"
-version = "0.1.8"
+version = "0.1.9"
 description = "Modular Python tool for parsing, analyzing, and visualizing Global Navigation Satellite Systems (GNSS) data and state estimates"
 authors = ["Derek Knowles <dcknowles@stanford.edu>",
            "Ashwin Kanhere <akanhere@stanford.edu>",
@@ -34,6 +34,7 @@ pytest-lazy-fixture = "^0.6.3"
 matplotlib = "^3.5.1"
 plotly = "^5.8.0"
 kaleido = "0.2.1"
+requests = "^2.29.0"
 
 [tool.poetry.group.dev.dependencies]
 Sphinx = "^4.1.1"

pyproject.toml

@@ -9,7 +9,9 @@ attrs==23.1.0 ; python_version >= "3.8" and python_version < "3.12"
 backcall==0.2.0 ; python_version >= "3.8" and python_version < "3.12"
 beautifulsoup4==4.12.2 ; python_version >= "3.8" and python_version < "3.12"
 bleach==6.0.0 ; python_version >= "3.8" and python_version < "3.12"
+certifi==2022.12.7 ; python_version >= "3.8" and python_version < "3.12"
 cffi==1.15.1 ; python_version >= "3.8" and python_version < "3.12"
+charset-normalizer==3.1.0 ; python_version >= "3.8" and python_version < "3.12"
 colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "win32"
 comm==0.1.3 ; python_version >= "3.8" and python_version < "3.12"
 contourpy==1.0.7 ; python_version >= "3.8" and python_version < "3.12"
@@ -103,6 +105,7 @@ pyzmq==25.0.2 ; python_version >= "3.8" and python_version < "3.12"
 qtconsole==5.4.2 ; python_version >= "3.8" and python_version < "3.12"
 qtpy==2.3.1 ; python_version >= "3.8" and python_version < "3.12"
 reindent==3.5.1 ; python_version >= "3.8" and python_version < "3.12"
+requests==2.29.0 ; python_version >= "3.8" and python_version < "3.12"
 rfc3339-validator==0.1.4 ; python_version >= "3.8" and python_version < "3.12"
 rfc3986-validator==0.1.1 ; python_version >= "3.8" and python_version < "3.12"
 scipy==1.10.1 ; python_version >= "3.8" and python_version < "3.12"
@@ -124,6 +127,7 @@ typing-extensions==4.5.0 ; python_version >= "3.8" and python_version < "3.12"
 tzdata==2023.3 ; python_version >= "3.8" and python_version < "3.12"
 unlzw3==0.2.2 ; python_version >= "3.8" and python_version < "3.12"
 uri-template==1.2.0 ; python_version >= "3.8" and python_version < "3.12"
+urllib3==1.26.15 ; python_version >= "3.8" and python_version < "3.12"
 wcwidth==0.2.6 ; python_version >= "3.8" and python_version < "3.12"
 webcolors==1.13 ; python_version >= "3.8" and python_version < "3.12"
 webencodings==0.5.1 ; python_version >= "3.8" and python_version < "3.12"

requirements.txt

@@ -7,6 +7,7 @@
 
 import os
 import ftplib
+import requests
 from datetime import datetime, timezone
 
 import pytest
@@ -247,8 +248,48 @@ def test_download_ephem(ephem_download_path, fileinfo):
         dest_filepath = os.path.join(ephem_man.data_directory, 'nasa', filename)
 
     # download the ephemeris file
-    ephem_man.retrieve_file(url, directory, filename,
-                       dest_filepath)
+    try:
+        ephem_man.retrieve_file(url, directory, filename,
+                           dest_filepath)
+    except ftplib.error_perm as ftplib_exception:
+        print(ftplib_exception)
+
+    remove_download_eph(ephem_download_path)
+
+@pytest.mark.parametrize('fileinfo',
+    [
+     {'filepath': 'IGS/BRDC/2023/099/BRDC00WRD_S_20230990000_01D_MN.rnx.gz',
+       'url': 'http://igs.bkg.bund.de/root_ftp/'},
+     ])
+def test_request_igs(ephem_download_path, fileinfo):
+    """Test requests download for igs files.
+
+    The reason for this test is that Github workflow actions seem to
+    block international IPs and so won't properly bind to the igs IP.
+
+    Parameters
+    ----------
+    ephem_download_path : string
+        Location where ephemeris files are stored/to be downloaded to.
+    fileinfo : dict
+        Filenames for ephemeris with ftp server and constellation details
+
+    """
+
+    remove_download_eph(ephem_download_path)
+    os.makedirs(ephem_download_path)
+
+    ephem_man = EphemerisManager(ephem_download_path, verbose=True)
+
+    filepath = fileinfo['filepath']
+    filename = os.path.split(filepath)[1]
+    dest_filepath = os.path.join(ephem_man.data_directory, 'igs', filename)
+
+    requests_url = fileinfo['url'] + fileinfo['filepath']
+
+    response = requests.get(requests_url, timeout=5)
+    with open(dest_filepath,'wb') as file:
+        file.write(response.content)
 
     remove_download_eph(ephem_download_path)