Changeset 10127 in ntrip for trunk/BNC/src/bncsp3.cpp

Timestamp:

Jul 20, 2023, 12:13:41 PM (10 months ago)

Author:

stuerze

Message:

 

File:

• trunk/BNC/src/bncsp3.cpp (modified) (3 diffs)

trunk/BNC/src/bncsp3.cpp

@@ -78 +78 @@
       if (_lastEpoTime.valid() && _sampl > 0) {
         for (bncTime ep = _lastEpoTime +_sampl; ep < epoTime; ep = ep +_sampl) {
-          _out << "*  " << ep.datestr(' ') << ' ' << ep.timestr(8, ' ') << endl;
+          _out << "\n*  " << ep.datestr(' ') << ' ' << ep.timestr(8, ' ');
         }
       }
@@ -84 +84 @@
       // Print the new epoch
       // -------------------
-      _out << "*  " << epoTime.datestr(' ') << ' ' << epoTime.timestr(8, ' ') << endl;
+      _out << "\n*  " << epoTime.datestr(' ') << ' ' << epoTime.timestr(8, ' ');
 
       _lastEpoTime = epoTime;
     }
 
-    _out << "P" << prn.toLatin1().data()
+    _out << "\nP" << prn.toLatin1().data()
          << setw(14) << setprecision(6) << xCoM(1) / 1000.0 // [km]
          << setw(14) << setprecision(6) << xCoM(2) / 1000.0 // [km]
          << setw(14) << setprecision(6) << xCoM(3) / 1000.0 // [km]
-         << setw(14) << setprecision(6) << sp3Clk * 1e6     // microseconds
-         << endl;
+         << setw(14) << setprecision(6) << sp3Clk * 1e6;     // microseconds
 
     if (sp3ClkRate) {
-      _out << "V" << prn.toLatin1().data()
+      _out << "\nV" << prn.toLatin1().data()
            << setw(14) << setprecision(6) << v(1) * 10.0      // [dm/s]
            << setw(14) << setprecision(6) << v(2) * 10.0      // [dm/s]
            << setw(14) << setprecision(6) << v(3) * 10.0      // [dm/s]
-           << setw(14) << setprecision(6) << sp3ClkRate * 1e2 // 10^⁻4 microseconds/sec
-           << endl;
+           << setw(14) << setprecision(6) << sp3ClkRate * 1e2; // 10^⁻4 microseconds/sec
     }
     return success;
@@ -212 +210 @@
     istringstream in(_lastLine.substr(1).c_str());
     in >> sp3Sat->_prn >> sp3Sat->_xyz(1) >> sp3Sat->_xyz(2) >> sp3Sat->_xyz(3) >> sp3Sat->_clk;
-
-    if (sp3Sat->_xyz.NormFrobenius() == 0.0) {
+    sp3Sat->_xyz *= 1.e3;
+
+    // Simple Check - check satellite radial distance
+    double rr = sp3Sat->_xyz.NormFrobenius();
+    const double MINDIST = 2.e7;
+    const double MAXDIST = 6.e7;
+    if (rr < MINDIST || rr > MAXDIST || std::isnan(rr)) {
       delete sp3Sat;
       continue;
     }
 
-    sp3Sat->_xyz *= 1.e3;
+    // Simple Check - clock valid
     if (sp3Sat->_clk == 999999.999999) {
       sp3Sat->_clkValid = false;