diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2006-09-09 07:58:01 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2006-09-09 07:58:01 +0000 |
| commit | 09f1d5cf1046962c85eeddf97f21ca03eadd95a0 (patch) | |
| tree | 38b7d3c780d84c958894ef0dc70603b464f077b5 /geoid.c | |
| parent | 949464a1664edee7aebf31818a017abc216a8d9c (diff) | |
| download | gpsd-09f1d5cf1046962c85eeddf97f21ca03eadd95a0.tar.gz | |
The big dead-storage elimination: we get rid of the newdata member.
All regression tests pass.
Diffstat (limited to 'geoid.c')
| -rw-r--r-- | geoid.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -92,20 +92,20 @@ void ecef_to_wgs84fix(struct gps_data_t *gpsdata, phi = atan2(z + e_2*b*pow(sin(theta),3),p - e2*a*pow(cos(theta),3)); n = a / sqrt(1.0 - e2*pow(sin(phi),2)); h = p / cos(phi) - n; - gpsdata->newdata.latitude = phi * RAD_2_DEG; - gpsdata->newdata.longitude = lambda * RAD_2_DEG; - gpsdata->separation = wgs84_separation(gpsdata->newdata.latitude, gpsdata->newdata.longitude); - gpsdata->newdata.altitude = h - gpsdata->separation; + gpsdata->fix.latitude = phi * RAD_2_DEG; + gpsdata->fix.longitude = lambda * RAD_2_DEG; + gpsdata->separation = wgs84_separation(gpsdata->fix.latitude, gpsdata->fix.longitude); + gpsdata->fix.altitude = h - gpsdata->separation; /* velocity computation */ vnorth = -vx*sin(phi)*cos(lambda)-vy*sin(phi)*sin(lambda)+vz*cos(phi); veast = -vx*sin(lambda)+vy*cos(lambda); - gpsdata->newdata.climb = vx*cos(phi)*cos(lambda)+vy*cos(phi)*sin(lambda)+vz*sin(phi); - gpsdata->newdata.speed = sqrt(pow(vnorth,2) + pow(veast,2)); + gpsdata->fix.climb = vx*cos(phi)*cos(lambda)+vy*cos(phi)*sin(lambda)+vz*sin(phi); + gpsdata->fix.speed = sqrt(pow(vnorth,2) + pow(veast,2)); heading = atan2(veast,vnorth); /*@ +evalorder @*/ if (heading < 0) heading += 2 * PI; - gpsdata->newdata.track = heading * RAD_2_DEG; + gpsdata->fix.track = heading * RAD_2_DEG; } #ifdef TESTMAIN |