Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h
===================================================================
--- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h	(revision 10987)
+++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h	(revision 10988)
@@ -540,13 +540,11 @@
 #define T_RELATIVE_LONGITUDE(a)                         SCALEADDBITS(14, 1000.0, a)        /* DF+029 (new RTCM) */
 #define T_RELATIVE_HIGHT(a)                             SCALEADDBITS(9,  1/12.5, a)        /* DF+030 (new RTCM) */
-#define T_NUMBER_OF_ROWS_4_LATITIDE_DIRECTION(a)        ADDBITS(6,  a)                     /* DF+031 (new RTCM) */
-#define T_NUMBER_OF_ROWS_4_LONGITUDE_DIRECTION(a)       ADDBITS(6,  a)                     /* DF+032 (new RTCM) */
-#define T_GRID_STEP_SIZE_4_LATITIDE_DIRECTION(a)        SCALEADDBITS(9,  100.0, a)         /* DF+031 (new RTCM) */
-#define T_GRID_STEP_SIZE_4_LONGITUDE_DIRECTION(a)       SCALEADDBITS(10, 100.0, a)         /* DF+032 (new RTCM) */
-
-
-#define LATITUDE_OF_REFERENCE_POINT            SCALEADDBITS()                  /* DF+028 (new RTCM) */
-#define LATITUDE_OF_REFERENCE_POINT            SCALEADDBITS()                  /* DF+029 (new RTCM) */
-#define LATITUDE_OF_REFERENCE_POINT            SCALEADDBITS()                  /* DF+030 (new RTCM) */
+#define T_NUMBER_OF_POINTS_IN_LATITIDE_DIRECTION(a)     ADDBITS(6,  a)                     /* DF+031 (new RTCM) */
+#define T_NUMBER_OF_POINTS_IN_LONGITUDE_DIRECTION(a)    ADDBITS(6,  a)                     /* DF+032 (new RTCM) */
+#define T_GRID_STEP_SIZE_IN_LATITIDE_DIRECTION(a)       SCALEADDBITS(9,  100.0, a)         /* DF+033 (new RTCM) */
+#define T_GRID_STEP_SIZE_IN_LONGITUDE_DIRECTION(a)      SCALEADDBITS(10, 100.0, a)         /* DF+034 (new RTCM) */
+#define T_GRID_MASK_AVAILABILITY_FLAG(a)                ADDBITS(1,  a)                     /* DF+035 (new RTCM) */
+#define T_GRID_MASK_LATITUDE(a)                         ADDBITS(T_NUMBER_OF_POINTS_IN_LATITIDE_DIRECTION(a), a)
+#define T_GRID_MASK_LONGITUDE(a)                        ADDBITS(T_NUMBER_OF_POINTS_IN_LONGITUDE_DIRECTION(a), a)