Changeset 8956 in ntrip for trunk/BNC/src/PPP/pppParlist.cpp

Timestamp:

Jun 23, 2020, 11:58:46 AM (4 years ago)

Author:

stuerze

Message:

update regarding PPP

File:

• trunk/BNC/src/PPP/pppParlist.cpp (modified) (5 diffs)

trunk/BNC/src/PPP/pppParlist.cpp

@@ -123 +123 @@
 ////////////////////////////////////////////////////////////////////////////
 double t_pppParam::partial(const bncTime& /* epoTime */, const t_pppSatObs* obs,
-                           const t_lc::type& tLC) const {//qDebug() << "t_pppParam::partial: " << tLC;
+                           const t_lc::type& tLC, const t_prn refPrn) const {
 
   // Special Case - Melbourne-Wuebbena
@@ -184 +184 @@
     return  1.0 / sin(obs->eleSat());
   case ion:
-//    qDebug() << "refPrn: " << _refPrn.toString().c_str();
+
     if (obs->prn() == _prn) {
       if      (tLC == t_lc::c1) {
@@ -202 +202 @@
       }
     }
-    if (tLC == t_lc::GIM && _prn == _refPrn) {
+    if (tLC == t_lc::GIM && _prn == refPrn) {
       return  1.0;
     }
@@ -296 +296 @@
 ////////////////////////////////////////////////////////////////////////////
 t_irc t_pppParlist::set(const bncTime& epoTime,
-    const std::vector<t_pppSatObs*>& obsVector) {
+    const std::vector<t_pppSatObs*>& obsVector,
+    const QMap<char, t_pppRefSat*>& refSatMap) {
 
   // Remove some Parameters
@@ -310 +311 @@
     }
 
-    else if (par->type() == t_pppParam::amb ||
-             par->type() == t_pppParam::crdX ||
+    else if (par->type() == t_pppParam::crdX ||
              par->type() == t_pppParam::crdY ||
              par->type() == t_pppParam::crdZ) {
       if (par->lastObsTime().valid() && (epoTime - par->lastObsTime() > 60.0)) {
+        remove = true;
+      }
+    }
+    else if (par->type() == t_pppParam::amb) {
+      char system = par->prn().system();
+      t_prn refPrn = t_prn();
+      if (OPT->_refSatRequired) {
+        refPrn = (refSatMap[system])->prn();
+      }
+      if ((par->lastObsTime().valid() && (epoTime - par->lastObsTime() > 60.0)) ||
+          ( refPrn == par->prn())) {
         remove = true;
       }