Changeset 6586 in ntrip for trunk/BNC/src/rinex

Timestamp:

Feb 15, 2015, 11:58:20 AM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/rinex/rnxobsfile.cpp (modified) (1 diff)

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -1061 +1061 @@
       QString typeV3 = header.obsType(sys, iTypeV3);
       QMapIterator<QString, t_rnxObs> itObs(rnxSat.obs);
+
+      // Exact match
+      // -----------
       while (itObs.hasNext()) {
         itObs.next();
         const QString&  type   = itObs.key();
         const t_rnxObs& rnxObs = itObs.value();
-        if ( typeV3 == type2to3(sys, type) || 
-             (typeV3 == type2to3(sys, type).left(2) && rnxObs.value != 0.0) ) {
+        if (typeV3 == type2to3(sys, type) && rnxObs.value != 0.0) {
+          hlp[iTypeV3] = &itObs.value();
+        }
+      }
+
+      // Non-Exact match
+      // ---------------
+      itObs.toFront();
+      while (itObs.hasNext()) {
+        itObs.next();
+        const QString&  type   = itObs.key();
+        const t_rnxObs& rnxObs = itObs.value();
+        if (hlp[iTypeV3] == 0 && typeV3 == type2to3(sys, type).left(2) && rnxObs.value != 0.0) {
           hlp[iTypeV3] = &itObs.value();
         }