cssrlib 1.2.0__tar.gz → 1.2.1__tar.gz

{cssrlib-1.2.0/src/cssrlib.egg-info → cssrlib-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cssrlib
-Version: 1.2.0
+Version: 1.2.1
 Summary: Python Toolkit for PPP/PPP-RTK positioning
 Home-page: https://github.com/hirokawa/cssrlib
 Author: Rui Hirokawa
@@ -16,7 +16,6 @@ Requires-Dist: notebook
 Requires-Dist: numpy
 Requires-Dist: matplotlib
 Requires-Dist: cartopy
-Requires-Dist: pysolid
 Dynamic: license-file
 
 CSSRlib - Toolkit for PPP-RTK/RTK in Python using Compact SSR

{cssrlib-1.2.0 → cssrlib-1.2.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cssrlib"
-version = "1.2.0"
+version = "1.2.1"
 description = "Python Toolkit for PPP/PPP-RTK positioning"
 authors = [
     {name="Rui Hirokawa", email="rui.hirokawa@gmail.com"},
@@ -23,5 +23,4 @@ dependencies = [
     "numpy",
     "matplotlib",
     "cartopy",
-    "pysolid",
 ]

{cssrlib-1.2.0 → cssrlib-1.2.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = cssrlib
-version = 1.2.0
+version = 1.2.1
 author = Rui Hirokawa
 author_email = rui.hirokawa@gmail.com
 description = Python Toolkit for PPP/PPP-RTK positioning

{cssrlib-1.2.0 → cssrlib-1.2.1}/src/cssrlib/cssr_has.py

@@ -183,8 +183,13 @@ class cnav_msg():
                 continue
             hass, res = bs.unpack_from('u2u2', buff, i)
             i += 4
+            # HAS status
             if hass >= 2:  # 0:test,1:operational,2:res,3:dnu
                 continue
+            # mt: type of message
+            # mid: id of the message
+            # ms: size of non-encoded message in number of pages 0:1,...
+            # pid: id of the transmitted HAS encoded page
             mt, mid, ms, pid = bs.unpack_from('u2u5u5u8', buff, i)
 
             self.msgtype = mt
@@ -202,7 +207,7 @@ class cnav_msg():
             if self.monlevel >= 2:
                 print(f"{mt} {mid} {ms} {pid}")
 
-        if len(self.rec) >= self.ms_:
+        if self.ms_ > 0 and len(self.rec) >= self.ms_:
             if self.monlevel >= 2:
                 print(" data collected mid={:2d} ms={:2d} tow={:.0f}"
                       .format(self.mid_, self.ms_, tow))

{cssrlib-1.2.0 → cssrlib-1.2.1}/src/cssrlib/cssr_mdc.py

@@ -10,7 +10,7 @@ QZSS MADOCA-PPP correction data decoder
 import numpy as np
 import bitstruct as bs
 from cssrlib.cssrlib import cssr, sCSSRTYPE, sCSSR, local_corr, sCType
-from cssrlib.gnss import gpst2time, uGNSS, prn2sat, rCST
+from cssrlib.gnss import gpst2time, time2str, uGNSS, prn2sat, rCST, sat2id
 
 
 class areaInfo():
@@ -46,6 +46,8 @@ class cssr_mdc(cssr):
         self.ci = {}
 
         self.area = -1
+        self.reg = -1
+        self.alrt = 0
         self.narea_t = {1: 8, 2: 16, 3: 5, 4: 1, 5: 8}
         self.MAXNET = np.sum(list(self.narea_t.values()))
 
@@ -63,8 +65,8 @@ class cssr_mdc(cssr):
         latd, lond = np.rad2deg(pos[0:2])
         self.reg = self.area = -1
 
-        for reg in self.pnt.key():
-            for area in self.pnt[reg].key():
+        for reg in self.pnt.keys():
+            for area in self.pnt[reg].keys():
                 p = self.pnt[reg][area]
                 if p.sid == 0:  # rectangle shape:
                     if p.latr-p.lats <= latd and latd <= p.latr+p.lats and \
@@ -102,15 +104,16 @@ class cssr_mdc(cssr):
         """ calculate STEC correction by interporation """
         if self.inet < 0:
             print("get_stec: region, area not defined.")
-            return 0.0
+            return np.zeros(self.nsat_n)
 
         p = self.lc[self.inet]
         # if p.inet_ref != self.iodssr:
         #    return 0.0
-        stec = np.zeros(self.nsat_n)
+        stec = np.zeros(p.nsat_n)
+        v = np.array([1, dlat, dlon, dlat*dlon, dlat**2, dlon**2])
 
-        for i, sat in enumerate(self.sat_n):
-            stec[i] = [1, dlat, dlon, dlat*dlon, dlat**2, dlon**2]@p.ci[sat]
+        for i, sat in enumerate(p.sat_n):
+            stec[i] = v@p.ci[sat]
 
         return stec
 
@@ -121,6 +124,9 @@ class cssr_mdc(cssr):
         self.tow0 = tow//3600*3600
         reg, alrt, len_, narea = bs.unpack_from('u8u1u16u5', buff, i)
         i += 30
+        self.reg = reg
+        self.alrt = alrt
+
         if reg not in self.pnt:
             self.pnt[reg] = {}
 
@@ -130,14 +136,14 @@ class cssr_mdc(cssr):
 
             if sid == 0:  # rectangle shape
                 latr, lonr, lats, lons = bs.unpack_from('s11u12u8u8', buff, i)
-                if self.monlevel > 2:
+                if self.monlevel >= 2:
                     print(f"{reg} {area:2d} {sid} {latr*0.1:5.1f} "
                           f"{lonr*0.1:5.1f} {lats*0.1:3.1f} {lons*0.1:3.1f}")
                 self.pnt[reg][area] = areaInfo(
                     sid, latr*0.1, lonr*0.1, lats*0.1, lons*0.1)
             else:  # circle range
                 latr, lonr, rng = bs.unpack_from('s15u16u8', buff, i)
-                if self.monlevel > 2:
+                if self.monlevel >= 2:
                     print(f"{reg} {area:2d} {sid} {latr*0.01:6.2f} "
                           f"{lonr*0.01:6.2f} {rng*10}")
                 self.pnt[reg][area] = areaInfo(
@@ -148,6 +154,9 @@ class cssr_mdc(cssr):
     def get_inet(self, reg, area):
         """ region, area to inet conversion """
 
+        if reg < 0 or area < 0:
+            return -1
+
         inet = 0
         for r in self.narea_t.keys():
             if r >= reg:
@@ -165,6 +174,9 @@ class cssr_mdc(cssr):
         reg, area, stype_ = bs.unpack_from('u8u5u2', buff, i)
         i += 15
 
+        self.reg = reg
+        self.area = area
+
         nsat = bs.unpack_from('u5u5u5u5u5', buff, i)
         i += 25
         # gps, glo, gal, bds, qzss
@@ -221,6 +233,48 @@ class cssr_mdc(cssr):
 
         return i
 
+    def out_log(self):
+        # if self.msgtype not in (1, 2):
+        #    return super(cssr_mdc, self).out_log()
+
+        sz_t = [1, 3, 4, 6]
+
+        if self.time == -1:
+            return
+
+        self.fh.write("{:4d}\t{:s}\n".format(self.msgtype,
+                                             time2str(self.time)))
+
+        if self.msgtype == 1:
+
+            self.fh.write(f"Reg\tArea\tsid\t"
+                          f"latr\tlonr\tlats\tlons\n")
+
+            for area in self.pnt[self.reg].keys():
+                p = self.pnt[self.reg][area]
+                self.fh.write(f"{self.reg}\t{area:2d}\t{p.sid}\t"
+                              f"{p.latr:3.1f}\t{p.lonr:4.1f}\t")
+
+                if p.sid == 0:
+                    self.fh.write(f"{p.lats:3.1f}\t{p.lons:3.1f}\n")
+                else:
+                    self.fh.write(f"{p.rng:3.1f}\n")
+
+        elif self.msgtype == 2:
+            inet = self.get_inet(self.reg, self.area)
+
+            self.fh.write(f"Reg:{self.reg}\tArea:{self.area:2d}\n")
+            self.fh.write("Sat,stype,c00,c01,c10,c11,c20,c02\n")
+
+            for sat in self.lc[inet].sat_n:
+                stype = self.lc[inet].stype[sat]
+                ci = self.lc[inet].ci[sat]
+                self.fh.write(f"{sat2id(sat)}\t{stype}")
+                for k in range(sz_t[stype]):
+                    self.fh.write(f"\t{ci[k]:6.2f}")
+                self.fh.write("\n")
+        self.fh.flush()
+
     def decode_cssr(self, msg, i=0):
         """decode Compact SSR message with MADOCA-PPP extension """
         df = {'msgtype': 4073}
@@ -230,6 +284,7 @@ class cssr_mdc(cssr):
             if df['msgtype'] not in [1, 2, 4073]:
                 return -1
 
+            self.msgtype = df['msgtype']
             self.subtype = df['subtype']
             if df['msgtype'] == 4073:  # Compact SSR
                 if self.subtype == sCSSR.MASK:

{cssrlib-1.2.0 → cssrlib-1.2.1}/src/cssrlib/cssrlib.py

@@ -282,7 +282,7 @@ class cssr:
         self.sid = -1
         self.cstat = 0
         self.local_pbias = True  # for QZS CLAS
-        self.buff = bytearray(250*5)
+        self.buff = bytearray(250*10)
         self.buff_p = None
         self.sinfo = bytearray(160)
         self.grid = None
@@ -1316,7 +1316,7 @@ class cssr:
         if l6head['sid'] == 1:
             self.fcnt = 0
             self.buff_p = copy.copy(self.buff)
-            self.buff = bytearray(250*5)
+            self.buff = bytearray(250*10)
 
         if l6head['vendor'] == 5:  # CLAS
             facility = facility_t[l6head['pt']][l6head['facility']]
@@ -1347,6 +1347,7 @@ class cssre():
         self.len = 0
         self.dlen = 0
         self.msgtype = 0
+        self.iodssr = 0
 
     def encode_mask(self, v, bitlen, ofst=1):
         """ encode n-bit mask with offset """