Changeset 6798 in ntrip for trunk/BNC/src/ephemeris.cpp

Timestamp:

Apr 27, 2015, 4:00:38 PM (9 years ago)

Author:

stuerze

Message:

considerationn of the aspect that Galileo navigation messages can be provided for the same epoch but with different flags, e.g.: I/NAV, F/NAV, changed DVS;
simplification for accuracy entries that can be provided as index or in meter

File:

• trunk/BNC/src/ephemeris.cpp (modified) (10 diffs)

trunk/BNC/src/ephemeris.cpp

@@ -23 +23 @@
   _orbCorr    = 0;
   _clkCorr    = 0;
+  _flags      = 0;
 }
 
@@ -426 +427 @@
 void t_ephGal::set(const galileoephemeris* ee) {
 
-  _SISA     = -1.0; // set RINEX entry to invalid
-
   _receptDateTime = currentDateAndTimeGPS();
 
@@ -448 +447 @@
 
   _TOEsec   = _TOC.gpssec();
+  //  _TOEsec   = ee->TOE;  // TODO:
 
   _Cic      = ee->Cic;
@@ -461 +461 @@
   _TOEweek  = ee->Week;
   
-  _SISAI    = ee->SISA; // index from RTCM
+  if ((ee->SISA >= 0) && (ee->SISA <= 49)) {
+    _SISA = ee->SISA / 100.0;
+  }
+  else if((ee->SISA >= 50) && (ee->SISA <= 74)) {
+    _SISA = (50 + (ee->SISA - 50.0) * 2.0) / 100.0;
+  }
+  else if((ee->SISA >= 75) && (ee->SISA <= 99)) {
+    _SISA = 1.0 + (ee->SISA - 75.0) * 0.04;
+  }
+  else if((ee->SISA >= 100) && (ee->SISA <= 125)) {
+    _SISA = 2.0 + (ee->SISA - 100.0) * 0.16;
+  }
+  else if (ee->SISA >= 126 ) {
+    _SISA = -1.0;
+  }
   _E5aHS    = ee->E5aHS;
   _E5bHS    = ee->E5bHS;
@@ -813 +827 @@
   double SVhealth = 0.0;
   double datasource = 0.0;
+
   int pos[4];
-  _SISAI = -1; // set index from RTCM invalid
   pos[0] = (rnxVersion <= 2.12) ?  3 :  4;
   pos[1] = pos[0] + fieldLen;
@@ -1196 +1210 @@
     .arg(0.0,                19, 'e', 12);
 
-  // RINEX file input
-  double SISA = _SISA; // [m]
-  // RTCM stream input
-  if ((_SISAI >= 0) && (_SISAI <= 49)) {
-    SISA = _SISAI / 100.0;
-  }
-  if((_SISAI >= 50) && (_SISAI <= 74)) {
-    SISA = (50 + (_SISAI - 50.0) * 2.0) / 100.0;
-  }
-  if((_SISAI >= 75) && (_SISAI <= 99)) {
-    SISA = 1.0 + (_SISAI - 75.0) * 0.04;
-  }
-  if((_SISAI >= 100) && (_SISAI <= 125)) {
-    SISA = 2.0 + (_SISAI - 100.0) * 0.16;
-  }
-  if (_SISAI >= 126 ) {
-    SISA = -1.0;
-  }
-  out << QString(fmt)
-    .arg(SISA,             19, 'e', 12)
+  out << QString(fmt)
+    .arg(_SISA,            19, 'e', 12)
     .arg(double(SVhealth), 19, 'e', 12)
     .arg(BGD_1_5A,         19, 'e', 12)
@@ -1436 +1432 @@
   int fieldLen = 19;
   double TOEw;
-  _URAI = -1; // RINEX usage: set RTCM entry to be undefined
 
   int pos[4];
@@ -1618 +1613 @@
   _TGD2     = ee->TGD_B2_B3;
 
-  _URAI     = ee->URAI;
+  if ((ee->URAI <  6) && (ee->URAI >= 0)) {
+    _URA = ceil(10.0 * pow(2.0, ((double)ee->URAI/2.0) + 1.0)) / 10.0;
+  }
+  if ((ee->URAI >= 6) && (ee->URAI < 15)) {
+    _URA = ceil(10.0 * pow(2.0, ((double)ee->URAI/2.0)      )) / 10.0;
+  }
   _SatH1    = (ee->flags & BDSEPHF_SATH1) ? 1: 0;
 
@@ -1796 +1796 @@
     .arg(_OMEGADOT, 19, 'e', 12);
 
-
   out << QString(fmt)
     .arg(_IDOT,                             19, 'e', 12)
@@ -1803 +1802 @@
     .arg(0.0,                               19, 'e', 12);
 
-  // RINEX file input
-  double ura = _URA;
-  // RTCM stream input
-  if ((_URAI <  6) && (_URAI >= 0)) {
-    ura = ceil(10.0 * pow(2.0, ((double)_URAI/2.0) + 1.0)) / 10.0;
-  }
-  if ((_URAI >= 6) && (_URAI < 15)) {
-    ura = ceil(10.0 * pow(2.0, ((double)_URAI/2.0)      )) / 10.0;
-  }
-  out << QString(fmt)
-    .arg(ura,            19, 'e', 12)
+  out << QString(fmt)
+    .arg(_URA,           19, 'e', 12)
     .arg(double(_SatH1), 19, 'e', 12)
     .arg(_TGD1,          19, 'e', 12)