Index: trunk/BNC/RTCM/RTCM2.cpp
===================================================================
--- trunk/BNC/RTCM/RTCM2.cpp	(revision 209)
+++ trunk/BNC/RTCM/RTCM2.cpp	(revision 210)
@@ -30,4 +30,5 @@
 #include "RTCM2.h"
 
+#include "../bncutils.h"
 
 using namespace std;
@@ -1063,4 +1064,8 @@
   _buffer.append(buffer, bufLen);
 
+  int    refWeek;
+  double refSecs;
+  gpsWeekAndSec(refWeek, refSecs);
+
   while(true) {
     PP.getPacket(_buffer);
@@ -1070,4 +1075,8 @@
       ObsBlock.extract(PP);
       if (!ObsBlock.valid()) continue;
+
+      int    epochWeek;
+      double epochSecs;
+      ObsBlock.resolveEpoch(refWeek, refSecs, epochWeek, epochSecs);
         
       for (int iSat=0; iSat < ObsBlock.nSat; iSat++) {
@@ -1076,6 +1085,6 @@
 
           obs->SVPRN          = ObsBlock.PRN[iSat];
-          obs->GPSWeek        = 1390;
-          obs->GPSWeeks       = ObsBlock.secs;
+          obs->GPSWeek        = epochWeek;
+          obs->GPSWeeks       = (int) epochSecs;
           obs->sec            = ObsBlock.secs;
           obs->pCodeIndicator = 0;