geospace-code · breid-phys · May 19, 2022 · May 19, 2022 · May 26, 2022 · May 26, 2022
diff --git a/channeldata.json b/channeldata.json
@@ -0,0 +1,7 @@
+{
+  "channeldata_version": 1,
+  "packages": {},
+  "subdirs": [
+    "noarch"
+  ]
+}
diff --git a/index.html b/index.html
@@ -0,0 +1,83 @@
+<html>
+<head>
+  <title>georinex</title>
+  <style type="text/css">
+    a, a:active {
+      text-decoration: none; color: blue;
+    }
+    a:visited {
+      color: #48468F;
+    }
+    a:hover, a:focus {
+      text-decoration: underline; color: red;
+    }
+    body {
+      background-color: #F5F5F5;
+    }
+    h2 {
+      margin-bottom: 12px;
+    }
+    th, td {
+      font: 100% monospace; text-align: left;
+    }
+    th {
+      font-weight: bold; padding-right: 14px; padding-bottom: 3px;
+    }
+    th.tight {
+        padding-right: 6px;
+    }
+    td {
+      padding-right: 14px;
+    }
+    td.tight {
+        padding-right: 8px;
+    }
+    td.s, th.s {
+      text-align: right;
+    }
+    td.summary {
+      white-space: nowrap;
+      overflow: hidden;
+    }
+    td.packagename {
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      max-width: 180px;
+      padding-right: 8px;
+    }
+    td.version {
+      //white-space: nowrap;
+      overflow: hidden;
+      max-width: 90px;
+      padding-right: 8px;
+    }
+    table {
+      background-color: white;
+      border-top: 1px solid #646464;
+      border-bottom: 1px solid #646464;
+      padding-top: 10px;
+      padding-bottom: 14px;
+    }
+    address {
+      color: #787878;
+      padding-top: 10px;
+    }
+  </style>
+</head>
+<body>
+  <h2>georinex</h2>
+  <h3><a href="rss.xml">RSS Feed</a>&nbsp;&nbsp;&nbsp;<a href="channeldata.json">channeldata.json</a></h3>
+<a href="noarch">noarch</a>&nbsp;&nbsp;&nbsp;  <table>
+    <tr>
+      <th style="padding-right:18px;">Package</th>
+      <th>Latest Version</th>
+      <th>Doc</th>
+      <th>Dev</th>
+      <th>License</th>
+<th class="tight">noarch</th>      <th>Summary</th>
+    </tr>
+  </table>
+  <address>Updated: 2023-06-08 14:39:19 +0000 - Files: 0</address>
+</body>
+</html>
diff --git a/noarch/current_repodata.json b/noarch/current_repodata.json
@@ -0,0 +1,9 @@
+{
+  "info": {
+    "subdir": "noarch"
+  },
+  "packages": {},
+  "packages.conda": {},
+  "removed": [],
+  "repodata_version": 1
+}
diff --git a/noarch/current_repodata.json.bz2 b/noarch/current_repodata.json.bz2
diff --git a/noarch/index.html b/noarch/index.html
@@ -0,0 +1,82 @@
+<html>
+<head>
+  <title>georinex/noarch</title>
+  <style type="text/css">
+    a, a:active {
+      text-decoration: none; color: blue;
+    }
+    a:visited {
+      color: #48468F;
+    }
+    a:hover, a:focus {
+      text-decoration: underline; color: red;
+    }
+    body {
+      background-color: #F5F5F5;
+    }
+    h2 {
+      margin-bottom: 12px;
+    }
+    th, td {
+      font: 100% monospace; text-align: left;
+    }
+    th {
+      font-weight: bold; padding-right: 14px; padding-bottom: 3px;
+    }
+    td {
+      padding-right: 20px;
+    }
+    td.s, th.s {
+      text-align: right;
+    }
+    table {
+      background-color: white;
+      border-top: 1px solid #646464;
+      border-bottom: 1px solid #646464;
+      padding-top: 10px;
+      padding-bottom: 14px;
+    }
+    address {
+      color: #787878;
+      padding-top: 10px;
+    }
+  </style>
+</head>
+<body>
+  <h2>georinex/noarch</h2>
+  <table>
+    <tr>
+      <th>Filename</th>
+      <th>Size</th>
+      <th>Last Modified</th>
+      <th>SHA256</th>
+      <th>MD5</th>
+    </tr>
+    <tr>
+      <td><a href="repodata.json" alt="repodata.json">repodata.json</a></td>
+      <td class="s">127 B</td>
+      <td>2023-06-08 14:39:19 +0000</td>
+      <td>b546412dc20b790c5f9c223e394ff0e39a27ba12a99631ca4d1bb6c0ca3bd05c</td>
+      <td>917338f97423c09c911618661fef3056</td>
+    </tr>    <tr>
+      <td><a href="repodata.json.bz2" alt="repodata.json.bz2">repodata.json.bz2</a></td>
+      <td class="s">126 B</td>
+      <td>2023-06-08 14:39:19 +0000</td>
+      <td>32d48c11b6d5ee61a54a9076f8c06a62ba795f69b671db3e44b1301fa0efae0e</td>
+      <td>1ecb5b301b9a2ba831f0a68a7ace5f00</td>
+    </tr>    <tr>
+      <td><a href="repodata_from_packages.json" alt="repodata_from_packages.json">repodata_from_packages.json</a></td>
+      <td class="s">127 B</td>
+      <td>2023-06-08 14:39:19 +0000</td>
+      <td>b546412dc20b790c5f9c223e394ff0e39a27ba12a99631ca4d1bb6c0ca3bd05c</td>
+      <td>917338f97423c09c911618661fef3056</td>
+    </tr>    <tr>
+      <td><a href="repodata_from_packages.json.bz2" alt="repodata_from_packages.json.bz2">repodata_from_packages.json.bz2</a></td>
+      <td class="s">126 B</td>
+      <td>2023-06-08 14:39:19 +0000</td>
+      <td>32d48c11b6d5ee61a54a9076f8c06a62ba795f69b671db3e44b1301fa0efae0e</td>
+      <td>1ecb5b301b9a2ba831f0a68a7ace5f00</td>
+    </tr>  </table>
+  <address>Updated: 2023-06-08 14:39:19 +0000 - Files: 0</address>
+</body>
+</html>
diff --git a/noarch/repodata.json b/noarch/repodata.json
@@ -0,0 +1,9 @@
+{
+  "info": {
+    "subdir": "noarch"
+  },
+  "packages": {},
+  "packages.conda": {},
+  "removed": [],
+  "repodata_version": 1
+}
diff --git a/noarch/repodata.json.bz2 b/noarch/repodata.json.bz2
diff --git a/noarch/repodata_from_packages.json b/noarch/repodata_from_packages.json
@@ -0,0 +1,9 @@
+{
+  "info": {
+    "subdir": "noarch"
+  },
+  "packages": {},
+  "packages.conda": {},
+  "removed": [],
+  "repodata_version": 1
+}
diff --git a/noarch/repodata_from_packages.json.bz2 b/noarch/repodata_from_packages.json.bz2
diff --git a/src/georinex/base.py b/src/georinex/base.py
@@ -8,6 +8,7 @@
 from .rio import rinexinfo
 from .obs2 import rinexobs2
 from .obs3 import rinexobs3
+from .obs4 import rinexobs4
 from .nav2 import rinexnav2
 from .nav3 import rinexnav3
 from .sp3 import load_sp3
@@ -154,7 +155,7 @@ def rinexnav(
 
         if fn.suffix == ".nc":
             try:
-                return xarray.open_dataset(fn, group=group)
+                return xarray.load_dataset(fn, group=group)
             except OSError as e:
                 raise LookupError(f"Group {group} not found in {fn}    {e}")
 
@@ -205,7 +206,7 @@ def rinexobs(
         # %% NetCDF4
         if fn.suffix == ".nc":
             try:
-                return xarray.open_dataset(fn, group=group)
+                return xarray.load_dataset(fn, group=group)
             except OSError as e:
                 raise LookupError(f"Group {group} not found in {fn}   {e}")
 
@@ -235,6 +236,17 @@ def rinexobs(
             fast=fast,
             interval=interval,
         )
+    elif int(info["version"]) == 4:
+        obs = rinexobs4(
+            fn,
+            use,
+            tlim=tlim,
+            useindicators=useindicators,
+            meas=meas,
+            verbose=verbose,
+            fast=fast,
+            interval=interval,
+        )
     else:
         raise ValueError(f"unknown RINEX {info}  {fn}")
 
@@ -259,7 +271,7 @@ def _groupexists(fn: Path, group: str, overwrite: bool) -> str:
 
     # be sure there isn't already NAV in it
     try:
-        xarray.open_dataset(fn, group=group)
+        xarray.load_dataset(fn, group=group)
         raise ValueError(f"{group} already in {fn}")
     except OSError:
         pass

diff --git a/src/georinex/obs2.py b/src/georinex/obs2.py
@@ -28,18 +28,17 @@ def rinexobs2(
     *,
     fast: bool = True,
     interval: float | int | timedelta = None,
-):
+) -> xarray.Dataset:
 
     if isinstance(use, str):
         use = {use}
 
     if not use:
         use = {"C", "E", "G", "J", "R", "S"}
 
-    obs = xarray.Dataset(
-        {}, coords={"time": np.array([], dtype="datetime64[ns]"), "sv": np.array([], dtype="<U3")}
-    )
-    attrs: dict[T.Hashable, T.Any] = {}
+    obs = xarray.Dataset({}, coords={"time": np.array([], dtype="datetime64[ns]"), "sv": []})
+    attrs: dict[str, T.Any] = {}
+
     for u in use:
         o = rinexsystem2(
             fn,
@@ -236,7 +235,10 @@ def rinexsystem2(
             assert darr.shape[0] == gsv.size
 
             # %% select only "used" satellites
-            isv = [int(s[1:]) - 1 for s in gsv]
+            if system == "S":
+                isv = range(len(gsv))
+            else:
+                isv = [int(s[1:]) - 1 for s in gsv]
 
             for i, k in enumerate(hdr["fields_ind"]):
                 if useindicators:
@@ -266,17 +268,20 @@ def rinexsystem2(
             else:
                 fields.extend([None, None])
 
-    obs = xarray.Dataset(
-        coords={"time": times, "sv": [f"{system}{i:02d}" for i in range(1, Nsvsys + 1)]}
-    )
+    if system == "S":
+        obs = xarray.Dataset(coords={"time": times, "sv": gsv})
+    else:
+        obs = xarray.Dataset(
+            coords={"time": times, "sv": [f"{system}{i:02d}" for i in range(1, Nsvsys + 1)]}
+        )
 
     for i, k in enumerate(fields):
         # FIXME: for limited time span reads, this drops unused data variables
         # if np.isnan(data[i, ...]).all():
         #     continue
         if k is None:
             continue
-        obs[k] = (("time", "sv"), data[i, :, :])
+        obs[k] = (("time", "sv"), data[i, :, : len(obs["sv"])])
 
     obs = obs.dropna(dim="sv", how="all")
     obs = obs.dropna(dim="time", how="all")  # when tlim specified
@@ -391,7 +396,7 @@ def obsheader2(
     hdr["Nl_sv"] = ceil(hdr["Nobs"] / 5)
     # %% list with receiver location in x,y,z cartesian ECEF (OPTIONAL)
     try:
-        hdr["position"] = [float(j) for j in hdr["APPROX POSITION XYZ"].split()]
+        hdr["position"] = [float(j) for j in hdr["APPROX POSITION XYZ"].split()][:3]
         if ecef2geodetic is not None:
             hdr["position_geodetic"] = ecef2geodetic(*hdr["position"])
     except (KeyError, ValueError):
@@ -561,7 +566,6 @@ def _timehdr(ln: str) -> datetime:
 
 
 def _timeobs(ln: str) -> datetime:
-
     year = int(ln[1:3])
     if year < 80:
         year += 2000