Index: trunk/BNC/RTCM/GPSDecoder.h
===================================================================
--- trunk/BNC/RTCM/GPSDecoder.h	(revision 2688)
+++ trunk/BNC/RTCM/GPSDecoder.h	(revision 2689)
@@ -39,5 +39,4 @@
 
   t_obsInternal() {
-    flags         = 0;
     satSys        = 'G';
     satNum        = 0;
@@ -56,7 +55,4 @@
     slip_cnt_L2   = -1;
     slip_cnt_L5   = -1;
-    lock_timei_L1 = -1;
-    lock_timei_L2 = -1;
-    lock_timei_L5 = -1;
     S1            = 0.0;
     S2            = 0.0;
@@ -88,7 +84,4 @@
   int    slip_cnt_L2;   // L2 cumulative loss of continuity indicator (negative value = undefined)
   int    slip_cnt_L5;   // L5 cumulative loss of continuity indicator (negative value = undefined)
-  int    lock_timei_L1; // L1 last lock time indicator                (negative value = undefined)
-  int    lock_timei_L2; // L2 last lock time indicator                (negative value = undefined)
-  int    lock_timei_L5; // L5 last lock time indicator                (negative value = undefined)
   double S1;            // L1 signal-to noise ratio
   double S2;            // L2 signal-to noise ratio
Index: trunk/BNC/RTCM/RTCM2Decoder.cpp
===================================================================
--- trunk/BNC/RTCM/RTCM2Decoder.cpp	(revision 2688)
+++ trunk/BNC/RTCM/RTCM2Decoder.cpp	(revision 2689)
@@ -159,6 +159,4 @@
 	  obs->_o.slip_cnt_L1   = _ObsBlock.slip_L1[iSat];
 	  obs->_o.slip_cnt_L2   = _ObsBlock.slip_L2[iSat];
-	  obs->_o.lock_timei_L1 = -1;
-	  obs->_o.lock_timei_L2 = -1;
         }
         _ObsBlock.clear();
@@ -398,10 +396,8 @@
 	  new_obs->_o.L1 = *obsVal / LAMBDA_1;
 	  new_obs->_o.slip_cnt_L1   = corr->lock1;
-	  new_obs->_o.lock_timei_L1 = -1;
 	  break;
 	case 1: // --- L2 ---
 	  new_obs->_o.L2 = *obsVal / LAMBDA_2;
 	  new_obs->_o.slip_cnt_L2   = corr->lock2;
-	  new_obs->_o.lock_timei_L2 = -1;
 	  break;
 	case 2: // --- C1 / P1 ---
Index: trunk/BNC/bncrinex.cpp
===================================================================
--- trunk/BNC/bncrinex.cpp	(revision 2688)
+++ trunk/BNC/bncrinex.cpp	(revision 2689)
@@ -596,10 +596,6 @@
     // Cycle slips detection
     // ---------------------
-    int prn = 0;
-    switch (obs->_o.satSys) {
-    case 'G': prn = obs->_o.satNum;       break;
-    case 'R': prn = obs->_o.satNum + 200; break;
-    default:  prn = obs->_o.satNum;
-    }
+    QString prn = QString("%1%2").arg(obs->_o.satSys)
+                            .arg(obs->_o.satNum, 2, 10, QChar('0'));
 
     char lli1 = ' ';
@@ -612,10 +608,4 @@
       }
     }
-    else if ( obs->_o.lock_timei_L1 >= 0 ) {
-      if ( _lock_timei_L1.find(prn)         != _lock_timei_L1.end() && 
-           _lock_timei_L1.find(prn).value() != obs->_o.lock_timei_L1 ) {
-        lli1 = '1';
-      }
-    }
 
     if ( obs->_o.slip_cnt_L2 >= 0 ) {
@@ -625,10 +615,4 @@
       }
     }
-    else if ( obs->_o.lock_timei_L2 >= 0 ) {
-      if ( _lock_timei_L2.find(prn)         != _lock_timei_L2.end() && 
-           _lock_timei_L2.find(prn).value() != obs->_o.lock_timei_L2 ) {
-        lli2 = '1';
-      }
-    }
 
     if ( obs->_o.slip_cnt_L5 >= 0 ) {
@@ -638,18 +622,8 @@
       }
     }
-    else if ( obs->_o.lock_timei_L5 >= 0 ) {
-      if ( _lock_timei_L5.find(prn)         != _lock_timei_L5.end() && 
-           _lock_timei_L5.find(prn).value() != obs->_o.lock_timei_L5 ) {
-        lli5 = '1';
-      }
-    }
 
     _slip_cnt_L1[prn]   = obs->_o.slip_cnt_L1;
     _slip_cnt_L2[prn]   = obs->_o.slip_cnt_L2;
     _slip_cnt_L5[prn]   = obs->_o.slip_cnt_L5;
-
-    _lock_timei_L1[prn] = obs->_o.lock_timei_L1;
-    _lock_timei_L2[prn] = obs->_o.lock_timei_L2;
-    _lock_timei_L5[prn] = obs->_o.lock_timei_L5;
 
     // RINEX Version 3
Index: trunk/BNC/bncrinex.h
===================================================================
--- trunk/BNC/bncrinex.h	(revision 2688)
+++ trunk/BNC/bncrinex.h	(revision 2689)
@@ -86,10 +86,7 @@
    double        _approxPos[3];
 
-   QMap<int, int> _slip_cnt_L1;
-   QMap<int, int> _slip_cnt_L2;
-   QMap<int, int> _slip_cnt_L5;
-   QMap<int, int> _lock_timei_L1;
-   QMap<int, int> _lock_timei_L2;
-   QMap<int, int> _lock_timei_L5;
+   QMap<QString, int>  _slip_cnt_L1;
+   QMap<QString, int>  _slip_cnt_L2;
+   QMap<QString, int>  _slip_cnt_L5;
 };