Merge branch 'main' into ramya/timeconversions

Author: betaBison

docs/source/img/skyplot.png

@@ -2,88 +2,89 @@ alabaster==0.7.12; python_version >= "3.6"
 appnope==0.1.3; platform_system == "Darwin" and python_version >= "3.8" and sys_platform == "darwin"
 argon2-cffi-bindings==21.2.0; python_version >= "3.7"
 argon2-cffi==21.3.0; python_version >= "3.7"
-astroid==2.11.5; python_full_version >= "3.6.2"
-asttokens==2.0.5; python_version >= "3.8"
-atomicwrites==1.4.0; python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.4.0"
-attrs==21.4.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7"
-babel==2.10.1; python_version >= "3.6"
+astroid==2.11.7; python_full_version >= "3.7.2"
+asttokens==2.0.7; python_version >= "3.8"
+atomicwrites==1.4.1; python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.4.0"
+attrs==22.1.0; python_version >= "3.7"
+babel==2.10.3; python_version >= "3.6"
 backcall==0.2.0; python_version >= "3.8"
 beautifulsoup4==4.11.1; python_full_version >= "3.6.0" and python_version >= "3.7"
-bleach==5.0.0; python_version >= "3.7"
-certifi==2022.5.18.1; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.8"
-cffi==1.15.0; implementation_name == "pypy" and python_version >= "3.7"
-charset-normalizer==2.0.12; python_full_version >= "3.6.0" and python_version >= "3.6"
-colorama==0.4.4; sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.6.2" and (python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.5.0") and (python_version >= "3.8" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.8" and python_full_version >= "3.5.0")
-coverage==6.4.2; python_version >= "3.7"
+bleach==5.0.1; python_version >= "3.7"
+certifi==2022.6.15; python_version >= "3.8" and python_version < "4"
+cffi==1.15.1; implementation_name == "pypy" and python_version >= "3.7"
+charset-normalizer==2.1.0; python_version >= "3.7" and python_version < "4" and python_full_version >= "3.6.0"
+colorama==0.4.5; sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.7.2" and (python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.5.0") and (python_version >= "3.8" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.8" and python_full_version >= "3.5.0")
+coverage==6.4.3; python_version >= "3.7"
 cycler==0.11.0; python_version >= "3.7"
-datetime==4.4
-debugpy==1.6.0; python_version >= "3.7"
+datetime==4.5
+debugpy==1.6.2; python_version >= "3.7"
 decorator==5.1.1; python_version >= "3.8"
 defusedxml==0.7.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7"
-dill==0.3.5.1; python_full_version >= "3.7.0"
+dill==0.3.5.1; python_full_version >= "3.7.2"
 docutils==0.16; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6"
 entrypoints==0.4; python_version >= "3.7"
-executing==0.8.3; python_version >= "3.8"
-fastjsonschema==2.15.3; python_version >= "3.7"
-fonttools==4.33.3; python_version >= "3.7"
+executing==0.9.1; python_version >= "3.8"
+fastjsonschema==2.16.1; python_version >= "3.7"
+fonttools==4.34.4; python_version >= "3.7"
 georinex==1.16.1; python_version >= "3.7"
 hatanaka==2.8.0; python_version >= "3.7"
-idna==3.3; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
-imagesize==1.3.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
-importlib-metadata==4.11.4; python_version < "3.10" and python_version >= "3.7"
-importlib-resources==5.7.1; python_version < "3.9" and python_version >= "3.7"
+idna==3.3; python_version >= "3.7" and python_version < "4"
+imagesize==1.4.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
+importlib-metadata==4.12.0; python_version < "3.10" and python_version >= "3.7"
+importlib-resources==5.9.0; python_version < "3.9" and python_version >= "3.7"
 iniconfig==1.1.1; python_version >= "3.6"
-ipykernel==6.13.0; python_version >= "3.7"
+ipykernel==6.15.1; python_version >= "3.7"
 ipython-genutils==0.2.0; python_version >= "3.7"
-ipython==8.3.0; python_version >= "3.8"
-ipywidgets==7.7.0
-isort==5.10.1; python_full_version >= "3.6.2" and python_version < "4.0"
+ipython==8.4.0; python_version >= "3.8"
+ipywidgets==7.7.1
+isort==5.10.1; python_full_version >= "3.7.2" and python_version < "4.0"
 jedi==0.18.1; python_version >= "3.8"
 jinja2==3.1.2; python_version >= "3.7"
-jsonschema==4.5.1; python_version >= "3.7"
-jupyter-client==7.3.1; python_full_version >= "3.7.0" and python_version >= "3.7"
-jupyter-console==6.4.3; python_version >= "3.6"
-jupyter-core==4.10.0; python_version >= "3.7"
+jsonschema==4.9.1; python_version >= "3.7"
+jupyter-client==7.3.4; python_full_version >= "3.7.0" and python_version >= "3.7"
+jupyter-console==6.4.4; python_version >= "3.7"
+jupyter-core==4.11.1; python_version >= "3.7"
 jupyter==1.0.0
 jupyterlab-pygments==0.2.2; python_version >= "3.7"
-jupyterlab-widgets==1.1.0; python_version >= "3.6"
-kiwisolver==1.4.2; python_version >= "3.7"
-lazy-object-proxy==1.7.1; python_version >= "3.6" and python_full_version >= "3.6.2"
+jupyterlab-widgets==1.1.1; python_version >= "3.6"
+kiwisolver==1.4.4; python_version >= "3.7"
+lazy-object-proxy==1.7.1; python_version >= "3.6" and python_full_version >= "3.7.2"
 markupsafe==2.1.1; python_version >= "3.7"
 matplotlib-inline==0.1.3; python_version >= "3.8"
 matplotlib==3.5.2; python_version >= "3.7"
-mccabe==0.7.0; python_version >= "3.6" and python_full_version >= "3.6.2"
+mccabe==0.7.0; python_version >= "3.6" and python_full_version >= "3.7.2"
 mistune==0.8.4; python_version >= "3.7"
-nbclient==0.6.3; python_full_version >= "3.7.0" and python_version >= "3.7"
+nbclient==0.6.6; python_full_version >= "3.7.0" and python_version >= "3.7"
 nbconvert==6.5.0; python_version >= "3.7"
 nbformat==5.4.0; python_full_version >= "3.7.0" and python_version >= "3.7"
 nbsphinx-link==1.3.0
 nbsphinx==0.8.9; python_version >= "3.6"
 ncompress==1.0.0; python_version >= "3.7"
 nest-asyncio==1.5.5; python_full_version >= "3.7.0" and python_version >= "3.7"
-notebook==6.4.11; python_version >= "3.7"
-numpy==1.22.4; python_version >= "3.8"
+notebook==6.4.12; python_version >= "3.7"
+numpy==1.23.1; python_version >= "3.8"
 packaging==21.3; python_version >= "3.8"
-pandas==1.4.2; python_version >= "3.8"
+pandas==1.4.3; python_version >= "3.8"
 pandocfilters==1.5.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7"
 parso==0.8.3; python_version >= "3.8"
 pexpect==4.8.0; sys_platform != "win32" and python_version >= "3.8"
 pickleshare==0.7.5; python_version >= "3.8"
-pillow==9.1.1; python_version >= "3.7"
-platformdirs==2.5.2; python_version >= "3.7" and python_full_version >= "3.6.2"
-plotly==5.8.0; python_version >= "3.6"
+pillow==9.2.0; python_version >= "3.7"
+pkgutil-resolve-name==1.3.10; python_version < "3.9" and python_version >= "3.7"
+platformdirs==2.5.2; python_version >= "3.7" and python_full_version >= "3.7.2"
+plotly==5.9.0; python_version >= "3.6"
 pluggy==1.0.0; python_version >= "3.6"
 pockets==0.9.1
 prometheus-client==0.14.1; python_version >= "3.7"
-prompt-toolkit==3.0.29; python_full_version >= "3.6.2" and python_version >= "3.8"
+prompt-toolkit==3.0.30; python_full_version >= "3.6.2" and python_version >= "3.8"
 psutil==5.9.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7"
 ptyprocess==0.7.0; os_name != "nt" and python_version >= "3.8" and sys_platform != "win32"
 pure-eval==0.2.2; python_version >= "3.8"
 py==1.11.0; python_version >= "3.7" and python_full_version < "3.0.0" and implementation_name == "pypy" or python_full_version >= "3.5.0" and python_version >= "3.7" and implementation_name == "pypy"
 pycparser==2.21; python_version >= "3.7" and python_full_version < "3.0.0" and implementation_name == "pypy" or implementation_name == "pypy" and python_version >= "3.7" and python_full_version >= "3.4.0"
 pygments==2.12.0; python_version >= "3.8"
 pylint-exit==1.2.0
-pylint==2.13.9; python_full_version >= "3.6.2"
+pylint==2.14.5; python_full_version >= "3.7.2"
 pynmea2==1.18.0
 pyparsing==3.0.9; python_full_version >= "3.6.8" and python_version >= "3.8"
 pyproj==3.3.1; python_version >= "3.8"
@@ -94,15 +95,15 @@ pytest==6.2.5; python_version >= "3.6"
 python-dateutil==2.8.2; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.8"
 pytz==2022.1; python_version >= "3.8"
 pywin32==304; sys_platform == "win32" and platform_python_implementation != "PyPy" and python_version >= "3.7"
-pywinpty==2.0.5; os_name == "nt" and python_version >= "3.7"
-pyzmq==23.0.0; python_version >= "3.7"
-qtconsole==5.3.0; python_version >= "3.7"
+pywinpty==2.0.7; os_name == "nt" and python_version >= "3.7"
+pyzmq==23.2.0; python_version >= "3.7"
+qtconsole==5.3.1; python_version >= "3.7"
 qtpy==2.1.0; python_version >= "3.7"
 reindent==3.5.1
-requests==2.27.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
-scipy==1.8.1; python_version >= "3.8" and python_version < "3.11"
+requests==2.28.1; python_version >= "3.7" and python_version < "4"
+scipy==1.9.0; python_version >= "3.8" and python_version < "3.12"
 send2trash==1.8.0; python_version >= "3.7"
-setuptools-scm==6.4.2; python_version >= "3.7"
+setuptools-scm==7.0.5; python_version >= "3.7"
 six==1.16.0; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.8"
 snowballstemmer==2.2.0; python_version >= "3.6"
 soupsieve==2.3.2.post1; python_full_version >= "3.6.0" and python_version >= "3.7"
@@ -115,21 +116,22 @@ sphinxcontrib-jsmath==1.0.1; python_version >= "3.6"
 sphinxcontrib-napoleon==0.7
 sphinxcontrib-qthelp==1.0.3; python_version >= "3.6"
 sphinxcontrib-serializinghtml==1.1.5; python_version >= "3.6"
-stack-data==0.2.0; python_version >= "3.8"
+stack-data==0.3.0; python_version >= "3.8"
 tenacity==8.0.1; python_version >= "3.6"
 terminado==0.15.0; python_version >= "3.7"
 tinycss2==1.1.1; python_version >= "3.7"
 toml==0.10.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6"
-tomli==2.0.1; python_version < "3.11" and python_full_version >= "3.6.2" and python_version >= "3.7" and python_full_version <= "3.11.0a6"
-tornado==6.1; python_version >= "3.7"
-traitlets==5.2.1.post0; python_full_version >= "3.7.0" and python_version >= "3.8"
-typing-extensions==4.2.0; python_version < "3.10" and python_full_version >= "3.6.2" and python_version >= "3.7"
+tomli==2.0.1; python_version < "3.11" and python_full_version >= "3.7.2" and python_version >= "3.7" and python_full_version <= "3.11.0a6"
+tomlkit==0.11.2; python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.7.2"
+tornado==6.2; python_version >= "3.7"
+traitlets==5.3.0; python_full_version >= "3.7.0" and python_version >= "3.8"
+typing-extensions==4.3.0; python_version < "3.10" and python_full_version >= "3.7.2" and python_version >= "3.7"
 unlzw3==0.2.1; python_version >= "3.7"
-urllib3==1.26.9; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.6"
+urllib3==1.26.11; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.7"
 wcwidth==0.2.5; python_full_version >= "3.6.2" and python_version >= "3.8"
 webencodings==0.5.1; python_version >= "3.7"
-widgetsnbextension==3.6.0
-wrapt==1.14.1; python_full_version >= "3.6.2"
-xarray==2022.3.0; python_version >= "3.8"
-zipp==3.8.0; python_version < "3.10" and python_version >= "3.7"
+widgetsnbextension==3.6.1
+wrapt==1.14.1; python_full_version >= "3.7.2"
+xarray==2022.6.0; python_version >= "3.8"
+zipp==3.8.1; python_version < "3.10" and python_version >= "3.7"
 zope.interface==5.4.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"

docs/source/requirements.txt

@@ -33,12 +33,7 @@ def __init__(self, input_path):
             Loaded measurements with consistent column names
         """
 
-        pd_df = pd.read_csv(input_path)
-        col_map = self._column_map()
-        pd_df.rename(columns=col_map, inplace=True)
-
-        super().__init__(pandas_df=pd_df)
-        self.postprocess()
+        super().__init__(csv_path=input_path)
 
     def postprocess(self):
         """Android derived specific postprocessing
@@ -57,15 +52,15 @@ def postprocess(self):
         self['corr_pr_m'] = pr_corrected
 
     @staticmethod
-    def _column_map():
+    def _row_map():
         """Map of column names from loaded to gnss_lib_py standard
 
         Returns
         -------
-        col_map : Dict
+        row_map : Dict
             Dictionary of the form {old_name : new_name}
         """
-        col_map = {'collectionName' : 'trace_name',
+        row_map = {'collectionName' : 'trace_name',
                    'phoneName' : 'rx_name',
                    'constellationType' : 'gnss_id',
                    'svid' : 'sv_id',
@@ -84,7 +79,7 @@ def _column_map():
                    'ionoDelayM' : 'iono_delay_m',
                    'tropoDelayM' : 'tropo_delay_m',
                    }
-        return col_map
+        return row_map
 
 
 class AndroidRawImu(NavData):
@@ -137,19 +132,18 @@ def preprocess(self, input_path):
         #NOTE: Assuming pandas index corresponds to measurements order
         #NOTE: Override times of gyro measurements with corresponding
         # accel times
-        measurements.rename(columns=self._column_map(), inplace=True)
         return measurements
 
     @staticmethod
-    def _column_map():
-        col_map = {'AccelXMps2' : 'acc_x_mps2',
+    def _row_map():
+        row_map = {'AccelXMps2' : 'acc_x_mps2',
                    'AccelYMps2' : 'acc_y_mps2',
                    'AccelZMps2' : 'acc_z_mps2',
                    'GyroXRadPerSec' : 'ang_vel_x_radps',
                    'GyroYRadPerSec' : 'ang_vel_y_radps',
                    'GyroZRadPerSec' : 'ang_vel_z_radps',
                    }
-        return col_map
+        return row_map
 
 
 class AndroidRawFixes(NavData):

gnss_lib_py/parsers/android.py

@@ -51,6 +51,8 @@ def __init__(self, csv_path=None, pandas_df=None, numpy_array=None,
         else:
             self.build_navdata()
 
+        self.rename(self._row_map())
+
         self.postprocess()
 
     def postprocess(self):
@@ -125,6 +127,23 @@ def from_numpy_array(self, numpy_array):
         for row_num in range(numpy_array.shape[0]):
             self.__setitem__(str(row_num), numpy_array[row_num,:])
 
+    @staticmethod
+    def _row_map():
+        """Map of column names from loaded to gnss_lib_py standard
+
+        Initializes as an emptry dictionary, must be reimplemented for
+        custom parsers.
+
+        Returns
+        -------
+        row_map : Dict
+            Dictionary of the form {old_name : new_name}
+        """
+
+        row_map = {}
+
+        return row_map
+
     def pandas_df(self):
         """Return pandas DataFrame equivalent to class
 
@@ -236,14 +255,14 @@ def _get_str_rows(self, rows):
         row_str : list
             List of boolean values indicating which rows contain strings
         """
-        str_bool = self.str_bool
+        _row_idx_str_bool = self._row_idx_str_bool
         if isinstance(rows, slice):
             slice_idx = rows.indices(self.shape[0])
             row_list = np.arange(slice_idx[0], slice_idx[1], slice_idx[2])
-            row_str = [str_bool[row] for row in row_list]
+            row_str = [_row_idx_str_bool[row] for row in row_list]
         else:
             row_list = list(rows)
-            row_str = [str_bool[row] for row in rows]
+            row_str = [_row_idx_str_bool[row] for row in rows]
         return row_list, row_str
 
     def __getitem__(self, key_idx):
@@ -296,6 +315,7 @@ def __setitem__(self, key_idx, newvalue):
             #Creating an entire new row
             if isinstance(newvalue, np.ndarray) and newvalue.dtype==object:
                 # Adding string values
+                # print("\n",key_idx,"\n",newvalue)
                 self.fillna(newvalue)
                 new_str_vals = len(np.unique(newvalue))*np.ones(np.shape(newvalue),
                                     dtype=self.arr_dtype)
@@ -308,6 +328,7 @@ def __setitem__(self, key_idx, newvalue):
                     self.array = np.vstack((self.array, np.reshape(new_str_vals, [1, -1])))
                 self.map[key_idx] = self.shape[0]-1
             else:
+                # print("\n",key_idx,"\n")#,newvalue)
                 if not isinstance(newvalue, int) and not isinstance(newvalue, float):
                     assert not isinstance(np.asarray(newvalue)[0], str), \
                             "Cannot set a row with list of strings, please use np.ndarray with dtype=object"
@@ -612,19 +633,42 @@ def rows(self):
 
 
     @property
-    def str_bool(self):
+    def _row_idx_str_bool(self):
         """Dictionary of index : if data entry is string.
 
         Row has string values if the string map is nonempty for a
         given row.
 
         Returns
         -------
-        str_bool : Dict
+        _row_idx_str_bool : Dict
             Dictionary of whether data at row number key is string or not
         """
-        str_bool = {self.map[k]: bool(len(self.str_map[k])) for k in self.str_map.keys()}
-        return str_bool
+        _row_idx_str_bool = {self.map[k]: bool(len(self.str_map[k])) for k in self.str_map.keys()}
+        return _row_idx_str_bool
+
+    def is_str(self, row_name):
+        """Check whether a row contained string values.
+
+        Parameters
+        ----------
+        row_name : string
+            Name of the row to check whether it contains string values.
+
+        Returns
+        -------
+        contains_str : bool
+            True if the row contains string values, False otherwise.
+
+        """
+
+        if row_name not in self.map:
+            raise KeyError("'" + str(row_name) \
+                           + "' key doesn't exist in NavData class")
+
+        contains_str = self._row_idx_str_bool[self.map[row_name]]
+
+        return contains_str
 
     @property
     def inv_map(self):
@@ -665,7 +709,7 @@ def rename(self, mapper):
         for key, value in mapper.items():
             if not isinstance(value, str):
                 raise TypeError("Column names must be strings")
-            if key not in self.map.keys():
+            if key not in self.map:
                 raise KeyError("'" + str(key) \
                                + "' key doesn't exist in NavData class")