Changeset 10587 in ntrip for trunk/BNC/src/bncutils.cpp

Timestamp:

Dec 10, 2024, 3:57:21 PM (3 days ago)

Author:

stuerze

Message:

RINEX version 4.02 updates

File:

• trunk/BNC/src/bncutils.cpp (modified) (6 diffs)

trunk/BNC/src/bncutils.cpp

@@ -266 +266 @@
 
   // update interval: 2h, data sets are valid for 4 hours
-  if      (eph->type() == t_eph::GPS     && (dt > 14400.0 || dt < -7200.0)) {
+  if      (eph->system() == t_eph::GPS     && (dt > 14400.0 || dt < -7200.0)) {
     return true;
   }
   // update interval: 3h, data sets are valid for 4 hours
-  else if (eph->type() == t_eph::Galileo && (dt > 14400.0 || dt <     0.0)) {
+  else if (eph->system() == t_eph::Galileo && (dt > 14400.0 || dt <     0.0)) {
     return true;
   }
   // updated every 30 minutes + 5 min
-  else if (eph->type() == t_eph::GLONASS && (dt >  2100.0 || dt < -2100.0)) {
+  else if (eph->system() == t_eph::GLONASS && (dt >  2100.0 || dt < -2100.0)) {
     return true;
   }
   // orbit parameters are valid for 7200 seconds (minimum)
-  else if (eph->type() == t_eph::QZSS    && (dt >  7200.0 || dt < -3600.0)) {
+  else if (eph->system() == t_eph::QZSS    && (dt >  7200.0 || dt < -3600.0)) {
     return true;
   }
   // maximum update interval: 300 sec
-  else if (eph->type() == t_eph::SBAS    && (dt >   600.0 || dt <  -600.0)) {
+  else if (eph->system() == t_eph::SBAS    && (dt >   600.0 || dt <  -600.0)) {
     return true;
   }
   // updates 1h + 5 min
-  else if (eph->type() == t_eph::BDS     && (dt >  3900.0 || dt <     0.0) ) {
+  else if (eph->system() == t_eph::BDS     && (dt >  3900.0 || dt <     0.0) ) {
     return true;
   }
   // update interval: up to 24 hours
-  else if (eph->type() == t_eph::IRNSS   && (fabs(dt > 86400.0))) {
+  else if (eph->system() == t_eph::IRNSS   && (fabs(dt > 86400.0))) {
     return true;
   }
@@ -845 +845 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-double accuracyFromIndex(int index, t_eph::e_type type) {
+double accuracyFromIndex(int index, t_eph::e_system system) {
 double accuracy = -1.0;
 
-  if (type == t_eph::GPS ||
-      type == t_eph::BDS ||
-      type == t_eph::SBAS||
-      type == t_eph::QZSS||
-      type == t_eph::IRNSS) {
+  if (system == t_eph::GPS ||
+      system == t_eph::BDS ||
+      system == t_eph::SBAS||
+      system == t_eph::QZSS||
+      system == t_eph::IRNSS) {
     if ((index >= 0) && (index <= 6)) {
       if (index == 3) {
@@ -869 +869 @@
     }
   }
-  else if (type == t_eph::Galileo) {
+  else if (system == t_eph::Galileo) {
     if ((index >= 0) && (index <= 49)) {
       accuracy = (double(index) / 100.0);
@@ -891 +891 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-int indexFromAccuracy(double accuracy, t_eph::e_type type) {
-
-  if (type == t_eph::GPS ||
-      type == t_eph::BDS ||
-      type == t_eph::SBAS ||
-      type == t_eph::QZSS ||
-      type == t_eph::IRNSS) {
+int indexFromAccuracy(double accuracy, t_eph::e_system system) {
+
+  if (system == t_eph::GPS ||
+      system == t_eph::BDS ||
+      system == t_eph::SBAS ||
+      system == t_eph::QZSS ||
+      system == t_eph::IRNSS) {
 
     if      (accuracy <= 2.40) {
@@ -949 +949 @@
   }
 
-  if (type == t_eph::Galileo) {
+  if (system == t_eph::Galileo) {
     if      (accuracy <= 0.49) {
       return int(ceil(accuracy * 100.0));
@@ -967 +967 @@
   }
 
-  return (type == t_eph::Galileo) ? 255 : 15;
+  return (system == t_eph::Galileo) ? 255 : 15;
 }
 
 // Returns fit interval in hours from flag
 ////////////////////////////////////////////////////////////////////////////
-double fitIntervalFromFlag(int flag, double iodc, t_eph::e_type type) {
+double fitIntervalFromFlag(int flag, double iodc, t_eph::e_system system) {
   double fitInterval = 0.0;
 
   switch (flag) {
     case 0:
-      if      (type == t_eph::GPS) {
+      if      (system == t_eph::GPS) {
         fitInterval = 4.0;
       }
-      else if (type == t_eph::QZSS) {
+      else if (system == t_eph::QZSS) {
         fitInterval = 2.0;
       }
       break;
     case 1:
-      if (type == t_eph::GPS) {
+      if (system == t_eph::GPS) {
         if      (iodc >= 240 && iodc <= 247) {
           fitInterval =  8.0;