Changeset 11027 in ntrip for trunk/BNC/src/pppCrdFile.cpp

Timestamp:

Sep 11, 2026, 3:40:50 PM (42 hours ago)

Author:

stuerze

Message:

Lat/Lon/Height is supperted as well as a priori coordinates

File:

• trunk/BNC/src/pppCrdFile.cpp (modified) (5 diffs)

trunk/BNC/src/pppCrdFile.cpp

@@ -40 +40 @@
  * -----------------------------------------------------------------------*/
 
+#include <cmath>
 #include <cstdlib>
 #include <fstream>
@@ -48 +49 @@
 using namespace std;
 using namespace BNC_PPP;
+
+// Convert a 'D,M,S' (degrees, minutes, seconds) token into decimal degrees;
+// the sign of D carries the hemisphere (negative == South/West).
+//////////////////////////////////////////////////////////////////////////////
+static double dmsToDeg(const string& dms) {
+  string str = dms;
+  for (string::iterator it = str.begin(); it != str.end(); ++it) {
+    if (*it == ',') *it = ' ';
+  }
+  istringstream in(str);
+  double d = 0.0, m = 0.0, s = 0.0;
+  in >> d >> m >> s;
+  double sign = (d < 0.0) ? -1.0 : 1.0;
+  return sign * (fabs(d) + m / 60.0 + s / 3600.0);
+}
 
 //
@@ -81 +97 @@
     }
 
-    in >> staInfo._xyz(1) >> staInfo._xyz(2) >> staInfo._xyz(3);
+    // The a priori coordinate is given either as plain Cartesian 'X Y Z', or,
+    // if the line's first coordinate token is 'LAT:<D,M,S>', as geodetic
+    // 'LAT:<D,M,S> LON:<D,M,S> H:<height>' (converted to XYZ below).
+    streampos posBeforeCoord = in.tellg();
+    string firstCoordTok;
+    bool geodetic = false;
+    if (in >> firstCoordTok) {
+      geodetic = (firstCoordTok.compare(0, 4, "LAT:") == 0);
+      in.seekg(posBeforeCoord);
+    }
+    if (!geodetic) {
+      in >> staInfo._xyz(1) >> staInfo._xyz(2) >> staInfo._xyz(3);
+    }
 
-    // Optional 'EPOCH:<decimalYear>' and 'VEL:<vx>,<vy>,<vz>' keyword tokens
-    // (ITRF reference epoch and velocity in m/year of the coordinate above),
-    // may appear in any order before the antenna eccentricity / name fields.
+    // Optional keyword tokens, may appear in any order before the antenna
+    // eccentricity / name fields:
+    //  - 'LAT:<D,M,S>', 'LON:<D,M,S>', 'H:<height>'  (geodetic a priori coordinate)
+    //  - 'EPOCH:<decimalYear>'                       (ITRF reference epoch of the coordinate)
+    //  - 'VEL:<vx>,<vy>,<vz>'                         (ITRF velocity [m/year] of the coordinate)
+    double lat = 0.0, lon = 0.0, hgt = 0.0;
+    bool haveLat = false, haveLon = false, haveHgt = false;
     while (!in.eof()) {
       streampos posBeforeToken = in.tellg();
@@ -92 +124 @@
         break;
       }
-      if (token.compare(0, 6, "EPOCH:") == 0) {
+      if (token.compare(0, 4, "LAT:") == 0) {
+        lat = dmsToDeg(token.substr(4));
+        haveLat = true;
+      }
+      else if (token.compare(0, 4, "LON:") == 0) {
+        lon = dmsToDeg(token.substr(4));
+        haveLon = true;
+      }
+      else if (token.compare(0, 2, "H:") == 0) {
+        hgt = atof(token.substr(2).c_str());
+        haveHgt = true;
+      }
+      else if (token.compare(0, 6, "EPOCH:") == 0) {
         staInfo._epoch = atof(token.substr(6).c_str());
       }
@@ -107 +151 @@
         break;
       }
+    }
+
+    if (geodetic && haveLat && haveLon && haveHgt) {
+      double Ell[3] = { lat * M_PI / 180.0, lon * M_PI / 180.0, hgt };
+      double XYZ[3];
+      ell2xyz(Ell, XYZ);
+      staInfo._xyz(1) = XYZ[0];
+      staInfo._xyz(2) = XYZ[1];
+      staInfo._xyz(3) = XYZ[2];
     }