Index: /trunk/BNC/src/RTCM3/RTCM3Decoder.cpp
===================================================================
--- /trunk/BNC/src/RTCM3/RTCM3Decoder.cpp	(revision 4367)
+++ /trunk/BNC/src/RTCM3/RTCM3Decoder.cpp	(revision 4368)
@@ -260,9 +260,9 @@
               }
 
-              // WAAS
+              // SBAS
               // ----
-              else if (satID >= PRN_WAAS_START && satID <= PRN_WAAS_END) {
+              else if (satID >= PRN_SBAS_START && satID <= PRN_SBAS_END) {
                 obs.satSys = 'S';
-                obs.satNum = satID - PRN_WAAS_START + 20;
+                obs.satNum = satID - PRN_SBAS_START + 20;
               }
 
@@ -272,4 +272,18 @@
                 obs.satSys = 'E';
                 obs.satNum = satID - PRN_GIOVE_START + PRN_GIOVE_OFFSET;
+              }
+
+              // QZSS
+              // -------------
+              else if (satID >= PRN_QZSS_START && satID <= PRN_QZSS_END) {
+                obs.satSys = 'J';
+                obs.satNum = satID - PRN_QZSS_START + 1;
+              }
+
+              // COMPASS
+              // -------------
+              else if (satID >= PRN_COMPASS_START && satID <= PRN_COMPASS_END) {
+                obs.satSys = 'C';
+                obs.satNum = satID - PRN_COMPASS_START + 1;
               }