Add proper implementation for BDSBAS

FAQ.md

@@ -22,7 +22,7 @@ More details are in the European Global Navigation Satellite System Agency (GSA)
     * GPS-aided GEO augmented navigation (GAGAN) (India)
     * Multi-functional Satellite Augmentation System (MSAS) (Japan)
     * System for Differential Corrections and Monitoring (SDCM) (Russia)
-    * Satellite Navigation Augmentation System (SNAS) (China)
+    * BeiDou Satellite-Based Augmentation System (BDSBAS) (China)
     * Soluciόn de Aumentaciόn para Caribe, Centro y Sudamérica (SACCSA) (ICAO)
 
 For lists of upcoming satellite launches and real-time satellite status on-line see https://github.com/barbeau/awesome-gnss#lists.

GPSTest/src/androidTest/java/com/android/gpstest/CarrierFreqUtilsTest.kt

@@ -679,7 +679,102 @@ class CarrierFreqUtilsTest {
 
         label = CarrierFreqUtils.getCarrierFrequencyLabel(southpan122L5)
         assertEquals("L5", label)	  
-
+
+        // BDSBAS 130 B1C
+        val snas130B1C = SatelliteStatus(130,
+                GnssType.SBAS,
+                30f,
+                true,
+                true,
+                true,
+                72f,
+                25f);
+        snas130B1C.hasCarrierFrequency = true
+        snas130B1C.carrierFrequencyHz = 1575420000.0
+        snas130B1C.sbasType = SbasType.SNAS
+
+        label = CarrierFreqUtils.getCarrierFrequencyLabel(snas130B1C)
+        assertEquals("B1C", label)
+
+        // BDSBAS 130 B2a
+        val snas130B2a = SatelliteStatus(130,
+                GnssType.SBAS,
+                30f,
+                true,
+                true,
+                true,
+                72f,
+                25f);
+        snas130B2a.hasCarrierFrequency = true
+        snas130B2a.carrierFrequencyHz = 1176450000.0
+        snas130B2a.sbasType = SbasType.SNAS
+
+        label = CarrierFreqUtils.getCarrierFrequencyLabel(snas130B2a)
+        assertEquals("B2a", label)	  
+
+        // BDSBAS 143 B1C
+        val snas143B1C = SatelliteStatus(143,
+                GnssType.SBAS,
+                30f,
+                true,
+                true,
+                true,
+                72f,
+                25f);
+        snas143B1C.hasCarrierFrequency = true
+        snas143B1C.carrierFrequencyHz = 1575420000.0
+        snas143B1C.sbasType = SbasType.SNAS
+
+        label = CarrierFreqUtils.getCarrierFrequencyLabel(snas143B1C)
+        assertEquals("B1C", label)
+
+        // BDSBAS 143 B2a
+        val snas143B2a = SatelliteStatus(122,
+                GnssType.SBAS,
+                30f,
+                true,
+                true,
+                true,
+                72f,
+                25f);
+        snas143B2a.hasCarrierFrequency = true
+        snas143B2a.carrierFrequencyHz = 1176450000.0
+        snas143B2a.sbasType = SbasType.SNAS
+
+        label = CarrierFreqUtils.getCarrierFrequencyLabel(snas143B2a)
+        assertEquals("B2a", label)	  
+
+        // BDSBAS 144 B1C
+        val snas144B1C = SatelliteStatus(144,
+                GnssType.SBAS,
+                30f,
+                true,
+                true,
+                true,
+                72f,
+                25f);
+        snas144B1C.hasCarrierFrequency = true
+        snas144B1C.carrierFrequencyHz = 1575420000.0
+        snas144B1C.sbasType = SbasType.SNAS
+
+        label = CarrierFreqUtils.getCarrierFrequencyLabel(snas144B1C)
+        assertEquals("B1C", label)
+
+        // BDSBAS 144 B2a
+        val snas144B2a = SatelliteStatus(144,
+                GnssType.SBAS,
+                30f,
+                true,
+                true,
+                true,
+                72f,
+                25f);
+        snas144B2a.hasCarrierFrequency = true
+        snas144B2a.carrierFrequencyHz = 1176450000.0
+        snas144B2a.sbasType = SbasType.SNAS
+
+        label = CarrierFreqUtils.getCarrierFrequencyLabel(snas144B2a)
+        assertEquals("B2a", label)	  
 
         // Test variations on the "same" numbers to make sure floating point equality works
         val gpsL1variation = SatelliteStatus(1,

README.md

@@ -27,7 +27,7 @@ It supports dual-frequency¹ GNSS for:
     * GPS-aided GEO augmented navigation (GAGAN) (India)
     * Multi-functional Satellite Augmentation System (MSAS) (Japan)
     * System for Differential Corrections and Monitoring (SDCM) (Russia)
-    * Satellite Navigation Augmentation System (SNAS) (China)
+    * BeiDou Satellite-Based Augmentation System (BDSBAS) (China)
     * Soluciόn de Aumentaciόn para Caribe, Centro y Sudamérica (SACCSA) (ICAO)
     * Southern Positioning Augmentation Network (SouthPAN) (Australia / New Zealand)
 

library/src/main/java/com/android/gpstest/library/util/SatelliteUtil.kt

@@ -294,7 +294,7 @@ object SatelliteUtil {
         } else if (this == 125 || this == 140 || this == 141) {
             return SbasType.SDCM
         } else if (this == 130 || this == 143 || this == 144) {
-            // Also referred to as BDSBAS
+            // Was renamed to BDSBAS nowadays
             return SbasType.SNAS
         } else if (this == 131 || this == 133 || this == 135 || this == 138) {
             return SbasType.WAAS

library/src/main/res/values/strings.xml

@@ -147,7 +147,7 @@
     <string name="gagan_content_description">GAGAN</string>
     <string name="msas_content_description">MSAS</string>
     <string name="sdcm_content_description">SDCM</string>
-    <string name="snas_content_description">SNAS</string>
+    <string name="snas_content_description">BDSBAS</string>
     <string name="saccsa_content_description">SACCSA</string>
     <string name="southpan_content_description">SouthPAN</string>    
 
@@ -192,7 +192,7 @@
     <string name="sky_legend_shape_gagan">GAGAN (India)</string>
     <string name="sky_legend_shape_msas">MSAS (Japan)</string>
     <string name="sky_legend_shape_sdcm">SDCM (Russia)</string>
-    <string name="sky_legend_shape_snas">BDSBAS/SNAS (China)</string>
+    <string name="sky_legend_shape_snas">BDSBAS (China)</string>
     <string name="sky_legend_shape_saccsa">SACCSA (ICAO)</string>
     <string name="sky_legend_shape_southpan">SouthPAN (Australia / New Zealand)</string>
 
@@ -464,7 +464,7 @@
         - Pentagons\n&#8226;\u0020
         <b>IRNSS/NavIC (India)</b>
         - Ovals\n&#8226;\u0020
-        <b>SBAS (WAAS, EGNOS, GAGAN, MSAS, SDCM, BDSBAS/SNAS, SACCSA, SouthPAN)</b>
+        <b>SBAS (WAAS, EGNOS, GAGAN, MSAS, SDCM, BDSBAS, SACCSA, SouthPAN)</b>
         - Diamonds\n\n
 
         &#8226;\u0020 Transparent satellites - Not in view\n