Skip to content

Commit 90ee1be

Browse files
committed
Merge branch 'main' into derek/fde
2 parents a2e9e4d + c14fdac commit 90ee1be

9 files changed

Lines changed: 343 additions & 3420 deletions

File tree

docs/source/requirements.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ alabaster==0.7.13 ; python_version >= "3.8" and python_version < "3.12"
22
anyio==3.7.1 ; python_version >= "3.8" and python_version < "3.12"
33
appnope==0.1.3 ; python_version >= "3.8" and python_version < "3.12" and platform_system == "Darwin" or python_version >= "3.8" and python_version < "3.12" and sys_platform == "darwin"
44
argon2-cffi-bindings==21.2.0 ; python_version >= "3.8" and python_version < "3.12"
5-
argon2-cffi==21.3.0 ; python_version >= "3.8" and python_version < "3.12"
5+
argon2-cffi==23.1.0 ; python_version >= "3.8" and python_version < "3.12"
66
arrow==1.2.3 ; python_version >= "3.8" and python_version < "3.12"
77
astroid==2.15.6 ; python_version >= "3.8" and python_version < "3.12"
88
asttokens==2.2.1 ; python_version >= "3.8" and python_version < "3.12"
@@ -17,16 +17,16 @@ charset-normalizer==3.2.0 ; python_version >= "3.8" and python_version < "3.12"
1717
colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "win32" or python_version >= "3.8" and python_version < "3.12" and platform_system == "Windows"
1818
comm==0.1.4 ; python_version >= "3.8" and python_version < "3.12"
1919
contourpy==1.1.0 ; python_version >= "3.8" and python_version < "3.12"
20-
coverage[toml]==7.2.7 ; python_version >= "3.8" and python_version < "3.12"
20+
coverage[toml]==7.3.0 ; python_version >= "3.8" and python_version < "3.12"
2121
cycler==0.11.0 ; python_version >= "3.8" and python_version < "3.12"
2222
datetime==4.9 ; python_version >= "3.8" and python_version < "3.12"
23-
debugpy==1.6.7 ; python_version >= "3.8" and python_version < "3.12"
23+
debugpy==1.6.7.post1 ; python_version >= "3.8" and python_version < "3.12"
2424
decorator==5.1.1 ; python_version >= "3.8" and python_version < "3.12"
2525
defusedxml==0.7.1 ; python_version >= "3.8" and python_version < "3.12"
2626
dill==0.3.7 ; python_version >= "3.8" and python_version < "3.12"
2727
docutils==0.16 ; python_version >= "3.8" and python_version < "3.12"
2828
entrypoints==0.4 ; python_version >= "3.8" and python_version < "3.12"
29-
exceptiongroup==1.1.2 ; python_version >= "3.8" and python_version < "3.11"
29+
exceptiongroup==1.1.3 ; python_version >= "3.8" and python_version < "3.11"
3030
executing==1.2.0 ; python_version >= "3.8" and python_version < "3.12"
3131
fastjsonschema==2.18.0 ; python_version >= "3.8" and python_version < "3.12"
3232
fonttools==4.42.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -36,9 +36,9 @@ hatanaka==2.8.1 ; python_version >= "3.8" and python_version < "3.12"
3636
idna==3.4 ; python_version >= "3.8" and python_version < "3.12"
3737
imagesize==1.4.1 ; python_version >= "3.8" and python_version < "3.12"
3838
importlib-metadata==6.8.0 ; python_version >= "3.8" and python_version < "3.10"
39-
importlib-resources==6.0.0 ; python_version >= "3.8" and python_version < "3.12"
39+
importlib-resources==6.0.1 ; python_version >= "3.8" and python_version < "3.12"
4040
iniconfig==2.0.0 ; python_version >= "3.8" and python_version < "3.12"
41-
ipykernel==6.25.0 ; python_version >= "3.8" and python_version < "3.12"
41+
ipykernel==6.25.1 ; python_version >= "3.8" and python_version < "3.12"
4242
ipython-genutils==0.2.0 ; python_version >= "3.8" and python_version < "3.12"
4343
ipython==8.12.2 ; python_version >= "3.8" and python_version < "3.12"
4444
ipywidgets==8.1.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -48,14 +48,14 @@ jedi==0.19.0 ; python_version >= "3.8" and python_version < "3.12"
4848
jinja2==3.1.2 ; python_version >= "3.8" and python_version < "3.12"
4949
jsonpointer==2.4 ; python_version >= "3.8" and python_version < "3.12"
5050
jsonschema-specifications==2023.7.1 ; python_version >= "3.8" and python_version < "3.12"
51-
jsonschema==4.18.6 ; python_version >= "3.8" and python_version < "3.12"
52-
jsonschema[format-nongpl]==4.18.6 ; python_version >= "3.8" and python_version < "3.12"
51+
jsonschema==4.19.0 ; python_version >= "3.8" and python_version < "3.12"
52+
jsonschema[format-nongpl]==4.19.0 ; python_version >= "3.8" and python_version < "3.12"
5353
jupyter-client==7.4.9 ; python_version >= "3.8" and python_version < "3.12"
5454
jupyter-console==6.6.3 ; python_version >= "3.8" and python_version < "3.12"
5555
jupyter-core==5.3.1 ; python_version >= "3.8" and python_version < "3.12"
5656
jupyter-events==0.7.0 ; python_version >= "3.8" and python_version < "3.12"
5757
jupyter-server-terminals==0.4.4 ; python_version >= "3.8" and python_version < "3.12"
58-
jupyter-server==2.7.0 ; python_version >= "3.8" and python_version < "3.12"
58+
jupyter-server==2.7.1 ; python_version >= "3.8" and python_version < "3.12"
5959
jupyter==1.0.0 ; python_version >= "3.8" and python_version < "3.12"
6060
jupyterlab-pygments==0.2.2 ; python_version >= "3.8" and python_version < "3.12"
6161
jupyterlab-widgets==3.0.8 ; python_version >= "3.8" and python_version < "3.12"
@@ -78,7 +78,7 @@ nest-asyncio==1.5.7 ; python_version >= "3.8" and python_version < "3.12"
7878
notebook-shim==0.2.3 ; python_version >= "3.8" and python_version < "3.12"
7979
notebook==6.5.5 ; python_version >= "3.8" and python_version < "3.12"
8080
numpy==1.24.4 ; python_version < "3.12" and python_version >= "3.8"
81-
overrides==7.3.1 ; python_version >= "3.8" and python_version < "3.12"
81+
overrides==7.4.0 ; python_version >= "3.8" and python_version < "3.12"
8282
packaging==23.1 ; python_version >= "3.8" and python_version < "3.12"
8383
pandas==2.0.3 ; python_version >= "3.8" and python_version < "3.12"
8484
pandocfilters==1.5.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -88,7 +88,7 @@ pickleshare==0.7.5 ; python_version >= "3.8" and python_version < "3.12"
8888
pillow==10.0.0 ; python_version >= "3.8" and python_version < "3.12"
8989
pkgutil-resolve-name==1.3.10 ; python_version >= "3.8" and python_version < "3.9"
9090
platformdirs==3.10.0 ; python_version >= "3.8" and python_version < "3.12"
91-
plotly==5.15.0 ; python_version >= "3.8" and python_version < "3.12"
91+
plotly==5.16.0 ; python_version >= "3.8" and python_version < "3.12"
9292
pluggy==1.2.0 ; python_version >= "3.8" and python_version < "3.12"
9393
pockets==0.9.1 ; python_version >= "3.8" and python_version < "3.12"
9494
prometheus-client==0.17.1 ; python_version >= "3.8" and python_version < "3.12"
@@ -98,7 +98,7 @@ ptyprocess==0.7.0 ; python_version >= "3.8" and python_version < "3.12" and os_n
9898
pure-eval==0.2.2 ; python_version >= "3.8" and python_version < "3.12"
9999
py==1.11.0 ; python_version >= "3.8" and python_version < "3.12" and implementation_name == "pypy"
100100
pycparser==2.21 ; python_version >= "3.8" and python_version < "3.12"
101-
pygments==2.15.1 ; python_version >= "3.8" and python_version < "3.12"
101+
pygments==2.16.1 ; python_version >= "3.8" and python_version < "3.12"
102102
pylint-exit==1.2.0 ; python_version >= "3.8" and python_version < "3.12"
103103
pylint==2.17.5 ; python_version >= "3.8" and python_version < "3.12"
104104
pynmea2==1.19.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -115,15 +115,15 @@ pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "3.12"
115115
pyzmq==24.0.1 ; python_version >= "3.8" and python_version < "3.12"
116116
qtconsole==5.4.3 ; python_version >= "3.8" and python_version < "3.12"
117117
qtpy==2.3.1 ; python_version >= "3.8" and python_version < "3.12"
118-
referencing==0.30.0 ; python_version >= "3.8" and python_version < "3.12"
118+
referencing==0.30.2 ; python_version >= "3.8" and python_version < "3.12"
119119
reindent==3.5.1 ; python_version >= "3.8" and python_version < "3.12"
120120
requests==2.31.0 ; python_version >= "3.8" and python_version < "3.12"
121121
rfc3339-validator==0.1.4 ; python_version >= "3.8" and python_version < "3.12"
122122
rfc3986-validator==0.1.1 ; python_version >= "3.8" and python_version < "3.12"
123123
rpds-py==0.9.2 ; python_version >= "3.8" and python_version < "3.12"
124124
scipy==1.10.1 ; python_version >= "3.8" and python_version < "3.12"
125125
send2trash==1.8.2 ; python_version >= "3.8" and python_version < "3.12"
126-
setuptools==68.0.0 ; python_version >= "3.8" and python_version < "3.12"
126+
setuptools==68.1.0 ; python_version >= "3.8" and python_version < "3.12"
127127
six==1.16.0 ; python_version >= "3.8" and python_version < "3.12"
128128
sniffio==1.3.0 ; python_version >= "3.8" and python_version < "3.12"
129129
snowballstemmer==2.2.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -138,13 +138,13 @@ sphinxcontrib-napoleon==0.7 ; python_version >= "3.8" and python_version < "3.12
138138
sphinxcontrib-qthelp==1.0.3 ; python_version >= "3.8" and python_version < "3.12"
139139
sphinxcontrib-serializinghtml==1.1.5 ; python_version >= "3.8" and python_version < "3.12"
140140
stack-data==0.6.2 ; python_version >= "3.8" and python_version < "3.12"
141-
tenacity==8.2.2 ; python_version >= "3.8" and python_version < "3.12"
141+
tenacity==8.2.3 ; python_version >= "3.8" and python_version < "3.12"
142142
terminado==0.17.1 ; python_version >= "3.8" and python_version < "3.12"
143143
tinycss2==1.2.1 ; python_version >= "3.8" and python_version < "3.12"
144144
tomli==2.0.1 ; python_version >= "3.8" and python_full_version <= "3.11.0a6"
145145
tomlkit==0.12.1 ; python_version >= "3.8" and python_version < "3.12"
146-
tornado==6.3.2 ; python_version >= "3.8" and python_version < "3.12"
147-
tqdm==4.65.0 ; python_version >= "3.8" and python_version < "3.12"
146+
tornado==6.3.3 ; python_version >= "3.8" and python_version < "3.12"
147+
tqdm==4.66.1 ; python_version >= "3.8" and python_version < "3.12"
148148
traitlets==5.9.0 ; python_version >= "3.8" and python_version < "3.12"
149149
typing-extensions==4.7.1 ; python_version >= "3.8" and python_version < "3.11"
150150
tzdata==2023.3 ; python_version >= "3.8" and python_version < "3.12"

gnss_lib_py/parsers/clk.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ def __init__(self, input_paths):
9494
self["b_sv_m"] = b_sv_m
9595

9696
def interpolate_clk(self, navdata, window=6, verbose=False):
97-
"""Interpolate clock data from clk file.
97+
"""Interpolate clock data from clk file, adding inplace to given
98+
NavData instance.
9899
99100
Parameters
100101
----------
@@ -143,7 +144,7 @@ def interpolate_clk(self, navdata, window=6, verbose=False):
143144
b_sv_m = np.zeros(len(navdata_id))
144145
b_dot_sv_mps = np.zeros(len(navdata_id))
145146

146-
# iterate through needed polynoials so don't repeat fit
147+
# iterate through needed polynomials so don't repeat fit
147148
insert_indexes = np.searchsorted(x_data,navdata_id_gps_millis)
148149
for insert_index in np.unique(insert_indexes):
149150
max_index = min(len(clk_id)-1,insert_index+int(window/2))

gnss_lib_py/parsers/sp3.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ def __init__(self, input_paths):
4747
input_paths = [input_paths]
4848

4949
gps_millis = []
50-
unix_millis = []
5150
gnss_sv_ids = []
5251
gnss_id = []
5352
sv_id = []
@@ -105,7 +104,8 @@ def __init__(self, input_paths):
105104
self["z_sv_m"] = z_sv_m
106105

107106
def interpolate_sp3(self, navdata, window=6, verbose=False):
108-
"""Interpolate ECEF position data from sp3 file.
107+
"""Interpolate ECEF position data from sp3 file, inplace to
108+
given navdata instance.
109109
110110
Parameters
111111
----------
@@ -148,7 +148,7 @@ def interpolate_sp3(self, navdata, window=6, verbose=False):
148148

149149
xyz_sv_m = np.zeros((6,len(navdata_id)))
150150

151-
# iterate through needed polynoials so don't repeat fit
151+
# iterate through needed polynomials so don't repeat fit
152152
insert_indexes = np.searchsorted(x_data,navdata_id_gps_millis)
153153
for insert_index in np.unique(insert_indexes):
154154
max_index = min(len(sp3_id)-1,insert_index+int(window/2))

notebooks/tutorials/ephemeris/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)