Merge branch 'issue_347_Galileo_Antex_Offsets' into 'master'

Adding Galileo antenna capbility See merge request !272
SGL-UT · Jun 21, 2018 · c468542 · c468542
2 parents 39007e5 + 9d4e9c3
commit c468542
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/ext/lib/Geomatics/AntennaStore.cpp b/ext/lib/Geomatics/AntennaStore.cpp
@@ -301,7 +301,7 @@ namespace gpstk
                   fact1 = 2.5458;   // (alpha+1)/alpha
                   fact2 = -1.5458;  // -1/alpha
                   freq1 = "G01";
-                  freq2 = "G01";
+                  freq2 = "G02";
                   break;
                }
                case 'R':
@@ -321,6 +321,16 @@ namespace gpstk
                   break;
                }
 
+               case 'E':
+               {
+                  double alpha = ((154*154) / (116.5*116.5)) -1.0;   // E1 and E5a
+                  fact1 = (alpha+1.0) / alpha;   
+                  fact2 = -1.0 / alpha; 
+                  freq1 = "E01";
+                  freq2 = "E05";
+                  break;
+               }
+
                default:
                {
                   stringstream ss;
@@ -382,7 +392,7 @@ namespace gpstk
       switch (sidr.system)
       {
          case SatID::systemGPS:     {sys='G'; break;}
-         //case systemGalileo: {sys='E'; break;}   Not yet  implemented
+         case SatID::systemGalileo: {sys='E'; break;}  
          case SatID::systemGlonass: {sys='R'; break;}
          case SatID::systemBeiDou:  {sys='C'; break;}
          default:

diff --git a/ext/lib/Geomatics/AntexData.cpp b/ext/lib/Geomatics/AntexData.cpp
@@ -73,7 +73,7 @@ namespace gpstk
 
    // NB. this dimension must be updated with the list
    /// Number of types that are used for satellites
-   const int Nsattype=14;
+   const int Nsattype=18;
    string sattype[Nsattype] =
    { 
       string("BLOCK I"),         // 1
@@ -89,7 +89,11 @@ namespace gpstk
       string("GLONASS-K1"),      // 11
       string("BEIDOU-2G"),       // 12
       string("BEIDOU-2I"),       // 13
-      string("BEIDOU-2M")        // 14
+      string("BEIDOU-2M"),       // 14
+      string("GALILEO-1"),       // 15
+      string("GALILEO-2"),       // 16
+      string("GALILEO-0A"),      // 17
+      string("GALILEO-0B")       // 18
    };
    /// vector of type strings that identify satellites; must be kept updated.
    const vector<string> AntexData::SatelliteTypes(sattype,sattype+Nsattype);