Index: /trunk/BNC/src/ephemeris.cpp
===================================================================
--- /trunk/BNC/src/ephemeris.cpp	(revision 8933)
+++ /trunk/BNC/src/ephemeris.cpp	(revision 8934)
@@ -304,12 +304,13 @@
         double fitIntervalRnx;
         readDbl(line, pos[1], fieldLen, fitIntervalRnx);
-        if        (type() == t_eph::GPS) {
-          if (rnxVersion < 3.03) {// specified as flag for GPS
-            _fitInterval = fitIntervalFromFlag(fitIntervalRnx, _IODC, t_eph::GPS);
-          } else {                // specified as time period for GPS since 3.03
+        if        (type() == t_eph::GPS) {  // in RINEX specified allways as time period for GPS
             _fitInterval = fitIntervalRnx;
+        } else if (type() == t_eph::QZSS) { // specified as flag for QZSS
+          if (rnxVersion == 3.02) {
+            _fitInterval = fitIntervalRnx; // specified as time period
           }
-        } else if (type() == t_eph::QZSS) { // specified as flag for QZSS
-          _fitInterval = fitIntervalFromFlag(fitIntervalRnx, _IODC, t_eph::QZSS);
+          else {
+            _fitInterval = fitIntervalFromFlag(fitIntervalRnx, _IODC, t_eph::QZSS);
+          }
         }
       }
@@ -492,14 +493,8 @@
   }
   else {
-    double fitIntervalRnx;
-    if      (type() == t_eph::GPS) {
-      if (version < 3.03) { // specified as flag)
-        (_fitInterval == 4.0) ? fitIntervalRnx = 0.0 : fitIntervalRnx = 1.0;
-      }
-      else {
-        fitIntervalRnx = _fitInterval; // specified as time period in hours
-      }
-    }
-    else if (type() == t_eph::QZSS) {    // specified as flag
+    // for GPS and QZSS in version 3.02 specified in hours
+    double fitIntervalRnx = _fitInterval;
+    // otherwise specified as flag
+    if (type() == t_eph::QZSS && version != 3.02) {
       (_fitInterval == 2.0) ? fitIntervalRnx = 0.0 : fitIntervalRnx = 1.0;
     }