Changeset 6109 in ntrip for trunk/BNC/src/rinex

Timestamp:

Sep 8, 2014, 3:49:16 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/rinex/reqcanalyze.cpp (modified) (2 diffs)

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -554 +554 @@
           
           if (eph) {
-            double xSat, ySat, zSat, clkSat;
-            eph->position(oneObs->_GPSWeek, oneObs->_GPSWeeks, 
-                          xSat, ySat, zSat, clkSat);
+            ColumnVector xc(4);
+            ColumnVector vv(3);
+            eph->getCrd(bncTime(oneObs->_GPSWeek, oneObs->_GPSWeeks), xc, vv, false);
           
             double rho, eleSat, azSat;
-            topos(xyzSta(1), xyzSta(2), xyzSta(3), 
-                  xSat, ySat, zSat, rho, eleSat, azSat);
+            topos(xyzSta(1), xyzSta(2), xyzSta(3), xc(1), xc(2), xc(3), rho, eleSat, azSat);
           
             aziDeg = azSat * 180.0/M_PI;
@@ -764 +763 @@
     if (eph) {
       ++nSatUsed;
-      ColumnVector xSat(3);
-      double clkSat;
-      eph->position(_currEpo->tt.gpsw(), _currEpo->tt.gpssec(), 
-                    xSat(1), xSat(2), xSat(3), clkSat);
-      ColumnVector dx = xSat - xyzSta;
+      ColumnVector xSat(4);
+      ColumnVector vv(3);
+      eph->getCrd(_currEpo->tt, xSat, vv, false);
+      ColumnVector dx = xSat.Rows(1,3) - xyzSta;
       double rho = dx.norm_Frobenius();
       AA(nSatUsed,1) = dx(1) / rho;