diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2009-06-07 14:48:48 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2009-06-07 14:48:48 +0000 |
| commit | ce37cc216954c41fb920375c9cdbc6a276d64019 (patch) | |
| tree | 870dc209ce3142c5e8f5828b32083684df05d027 /driver_aivdm.c | |
| parent | e8f4b589e129384f6cc021403ba6fac7b462bc58 (diff) | |
| download | gpsd-ce37cc216954c41fb920375c9cdbc6a276d64019.tar.gz | |
Go back to passing AIS out-of-band values as-is into the JSON dump;
changing them to as JSON-AIS does is an unnecessary complication.
Diffstat (limited to 'driver_aivdm.c')
| -rw-r--r-- | driver_aivdm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/driver_aivdm.c b/driver_aivdm.c index 3be09a08..83571634 100644 --- a/driver_aivdm.c +++ b/driver_aivdm.c @@ -630,7 +630,7 @@ void aivdm_dump(struct ais_t *ais, bool scaled, bool json, FILE *fp) ais->type123.lon / AIS_LATLON_SCALE, ais->type123.lat / AIS_LATLON_SCALE, ais->type123.course, - (json && ais->type123.heading == AIS_NO_HEADING) ? -1 : ais->type123.heading, + ais->type123.heading, ais->type123.second, ais->type123.maneuver, ais->type123.raim, @@ -645,7 +645,7 @@ void aivdm_dump(struct ais_t *ais, bool scaled, bool json, FILE *fp) ais->type123.lon, ais->type123.lat, ais->type123.course, - (json && ais->type123.heading == AIS_NO_HEADING) ? -1 : ais->type123.heading, + ais->type123.heading, ais->type123.second, ais->type123.maneuver, ais->type123.raim, @@ -885,7 +885,7 @@ void aivdm_dump(struct ais_t *ais, bool scaled, bool json, FILE *fp) ais->type18.lon / AIS_LATLON_SCALE, ais->type18.lat / AIS_LATLON_SCALE, ais->type18.course / 10.0, - (json && ais->type18.heading == AIS_NO_HEADING) ? -1 : ais->type18.heading, + ais->type18.heading, ais->type18.second, ais->type18.regional, ais->type18.cs_flag, @@ -904,7 +904,7 @@ void aivdm_dump(struct ais_t *ais, bool scaled, bool json, FILE *fp) ais->type18.lon, ais->type18.lat, ais->type18.course, - (json && ais->type18.heading == AIS_NO_HEADING) ? -1 : ais->type18.heading, + ais->type18.heading, ais->type18.second, ais->type18.regional, ais->type18.cs_flag, @@ -935,7 +935,7 @@ void aivdm_dump(struct ais_t *ais, bool scaled, bool json, FILE *fp) ais->type19.lon / AIS_LATLON_SCALE, ais->type19.lat / AIS_LATLON_SCALE, ais->type19.course / 10.0, - (json && ais->type19.heading == AIS_NO_HEADING) ? -1 : ais->type18.heading, + ais->type19.heading, ais->type19.second, ais->type19.regional, ais->type19.shipname, @@ -956,7 +956,7 @@ void aivdm_dump(struct ais_t *ais, bool scaled, bool json, FILE *fp) ais->type19.lon, ais->type19.lat, ais->type19.course, - (json && ais->type19.heading == AIS_NO_HEADING) ? -1 : ais->type18.heading, + ais->type19.heading, ais->type19.second, ais->type19.regional, ais->type19.shipname, |