Add "status" to TPV for DGPS notification

Also update the affected regression files.  gpsd had been
throwing away the DGPS status.

1 files changed, 14 insertions, 14 deletions

diff --git a/test/daemon/saab-r4.log.chk b/test/daemon/saab-r4.log.chk
index 170c7ddd..c2b6a49b 100644
--- a/test/daemon/saab-r4.log.chk
+++ b/test/daemon/saab-r4.log.chk
@@ -5,12 +5,12 @@ $PFEC,AIcmd,0,35,A,01062011,130711*05
 {"class":"AIS","type":1,"repeat":0,"mmsi":244121341,"scaled":false,"status":15,"status_text":"Not defined","turn":0,"speed":5,"accuracy":true,"lon":-4868800,"lat":30127913,"course":30,"heading":4,"second":11,"maneuver":0,"raim":false,"radio":23068}

 $GPZDA,130711,01,06,2011,01,00*49
 $GPGLL,5012.790800,N,00806.879600,W,130711,A,D*5B
-{"class":"TPV","mode":2,"time":"2011-06-01T13:07:11.000Z","ept":0.005,"lat":50.213180000,"lon":-8.114660000}

+{"class":"TPV","status":2,"mode":2,"time":"2011-06-01T13:07:11.000Z","ept":0.005,"lat":50.213180000,"lon":-8.114660000}

 $GPGGA,130711,5012.790800,N,00806.879600,W,2,,,,,,,*6A
-{"class":"TPV","mode":2,"time":"2011-06-01T13:07:11.000Z","ept":0.005,"lat":50.213180000,"lon":-8.114660000,"speed":0.000}

+{"class":"TPV","status":2,"mode":2,"time":"2011-06-01T13:07:11.000Z","ept":0.005,"lat":50.213180000,"lon":-8.114660000,"speed":0.000}

 $GPVTG,3.0,T,,,0.50,N,,,D*16
 $GPRMC,130711.00,A,5012.790800,N,00806.879600,W,0.5,3.0,010611,,A*6A
-{"class":"TPV","mode":2,"time":"2011-06-01T13:07:11.000Z","ept":0.005,"lat":50.213180000,"lon":-8.114660000,"track":3.0000,"speed":0.257}

+{"class":"TPV","status":2,"mode":2,"time":"2011-06-01T13:07:11.000Z","ept":0.005,"lat":50.213180000,"lon":-8.114660000,"track":3.0000,"speed":0.257}

 $GPDTM,W84,C*52
 $PFEC,AIcmd,0,35,A,01062011,130712*06
 !AIVDO,1,1,,B,13`kvwO005wJnb0Lfo:P7h8H05`L,0*7D
@@ -20,7 +20,7 @@ $GPGLL,5012.791400,N,00806.879600,W,130712,A,D*55
 $GPGGA,130712,5012.791400,N,00806.879600,W,2,,,,,,,*64
 $GPVTG,3.1,T,,,0.50,N,,,D*17
 $GPRMC,130712.00,A,5012.791400,N,00806.879600,W,0.5,3.1,010611,,A*65
-{"class":"TPV","mode":2,"time":"2011-06-01T13:07:12.000Z","ept":0.005,"lat":50.213190000,"lon":-8.114660000,"track":3.1000,"speed":0.257}

+{"class":"TPV","status":2,"mode":2,"time":"2011-06-01T13:07:12.000Z","ept":0.005,"lat":50.213190000,"lon":-8.114660000,"track":3.1000,"speed":0.257}

 $GPDTM,W84,C*52
 $PFEC,AIcmd,0,35,A,01062011,130713*07
 !AIVDO,1,1,,B,13`kvwO005wJnb0Lfo;07h8J05`L,0*1E
@@ -30,7 +30,7 @@ $GPGLL,5012.791400,N,00806.879600,W,130713,A,D*54
 $GPGGA,130713,5012.791400,N,00806.879600,W,2,,,,,,,*65
 $GPVTG,3.1,T,,,0.50,N,,,D*17
 $GPRMC,130713.00,A,5012.791400,N,00806.879600,W,0.5,3.1,010611,,A*64
-{"class":"TPV","mode":2,"time":"2011-06-01T13:07:13.000Z","ept":0.005,"lat":50.213190000,"lon":-8.114660000,"track":3.1000,"speed":0.257}

+{"class":"TPV","status":2,"mode":2,"time":"2011-06-01T13:07:13.000Z","ept":0.005,"lat":50.213190000,"lon":-8.114660000,"track":3.1000,"speed":0.257}

 $GPDTM,W84,C*52
 $PFEC,AIcmd,0,35,A,01062011,130714*00
 !AIVDO,1,1,,B,13`kvwO005wJnb0Lfo;@7@8L05`L,0*40
@@ -40,7 +40,7 @@ $GPGLL,5012.791400,N,00806.879600,W,130714,A,D*53
 $GPGGA,130714,5012.791400,N,00806.879600,W,2,,,,,,,*62
 $GPVTG,2.9,T,,,0.50,N,,,D*1E
 $GPRMC,130714.00,A,5012.791400,N,00806.879600,W,0.5,2.9,010611,,A*6A
-{"class":"TPV","mode":2,"time":"2011-06-01T13:07:14.000Z","ept":0.005,"lat":50.213190000,"lon":-8.114660000,"track":2.9000,"speed":0.257}

+{"class":"TPV","status":2,"mode":2,"time":"2011-06-01T13:07:14.000Z","ept":0.005,"lat":50.213190000,"lon":-8.114660000,"track":2.9000,"speed":0.257}

 $GPDTM,W84,C*52
 $PFEC,AIcmd,0,35,A,01062011,130715*01
 !AIVDO,1,1,,B,13`kvwO005wJnb0Lfo;h7@8N05`L,0*6A
@@ -50,7 +50,7 @@ $GPGLL,5012.791400,N,00806.879600,W,130715,A,D*52
 $GPGGA,130715,5012.791400,N,00806.879600,W,2,,,,,,,*63
 $GPVTG,2.9,T,,,0.50,N,,,D*1E
 $GPRMC,130715.00,A,5012.791400,N,00806.879600,W,0.5,2.9,010611,,A*6B
-{"class":"TPV","mode":2,"time":"2011-06-01T13:07:15.000Z","ept":0.005,"lat":50.213190000,"lon":-8.114660000,"track":2.9000,"speed":0.257}

+{"class":"TPV","status":2,"mode":2,"time":"2011-06-01T13:07:15.000Z","ept":0.005,"lat":50.213190000,"lon":-8.114660000,"track":2.9000,"speed":0.257}

 $GPDTM,W84,C*52
 $PFEC,AIcmd,0,35,A,01062011,130716*02
 !AIVDO,1,1,,B,13`kvwO005wJnb0Lfo<07P8P05`L,0*3B
@@ -60,7 +60,7 @@ $GPGLL,5012.792000,N,00806.879600,W,130716,A,D*56
 $GPGGA,130716,5012.792000,N,00806.879600,W,2,,,,,,,*67
 $GPVTG,3.0,T,,,0.50,N,,,D*16
 $GPRMC,130716.00,A,5012.792000,N,00806.879600,W,0.5,3.0,010611,,A*67
-{"class":"TPV","mode":2,"time":"2011-06-01T13:07:16.000Z","ept":0.005,"lat":50.213200000,"lon":-8.114660000,"track":3.0000,"speed":0.257}

+{"class":"TPV","status":2,"mode":2,"time":"2011-06-01T13:07:16.000Z","ept":0.005,"lat":50.213200000,"lon":-8.114660000,"track":3.0000,"speed":0.257}

 $GPDTM,W84,C*52
 !AIVDM,1,1,,B,13aGhtw0B<OJfDpLgQqQd1FR05`L,0*41
 {"class":"AIS","type":1,"repeat":0,"mmsi":244707571,"scaled":false,"status":15,"status_text":"Not defined","turn":1,"speed":140,"accuracy":false,"lon":-4885860,"lat":30138854,"course":432,"heading":43,"second":17,"maneuver":0,"raim":false,"radio":23068}

@@ -72,7 +72,7 @@ $GPGLL,5012.792000,N,00806.879600,W,130717,A,D*57
 $GPGGA,130717,5012.792000,N,00806.879600,W,2,,,,,,,*66
 $GPVTG,2.8,T,,,0.50,N,,,D*1F
 $GPRMC,130717.00,A,5012.792000,N,00806.879600,W,0.5,2.8,010611,,A*6F
-{"class":"TPV","mode":2,"time":"2011-06-01T13:07:17.000Z","ept":0.005,"lat":50.213200000,"lon":-8.114660000,"track":2.8000,"speed":0.257}

+{"class":"TPV","status":2,"mode":2,"time":"2011-06-01T13:07:17.000Z","ept":0.005,"lat":50.213200000,"lon":-8.114660000,"track":2.8000,"speed":0.257}

 $GPDTM,W84,C*52
 $PFEC,AIcmd,0,35,A,01062011,130718*0C
 !AIVDO,1,1,,B,13`kvwO005wJnb2Lfo<h6@8T05`L,0*74
@@ -82,7 +82,7 @@ $GPGLL,5012.792000,N,00806.879600,W,130718,A,D*58
 $GPGGA,130718,5012.792000,N,00806.879600,W,2,,,,,,,*69
 $GPVTG,2.5,T,,,0.50,N,,,D*12
 $GPRMC,130718.00,A,5012.792000,N,00806.879600,W,0.5,2.5,010611,,A*6D
-{"class":"TPV","mode":2,"time":"2011-06-01T13:07:18.000Z","ept":0.005,"lat":50.213200000,"lon":-8.114660000,"track":2.5000,"speed":0.257}

+{"class":"TPV","status":2,"mode":2,"time":"2011-06-01T13:07:18.000Z","ept":0.005,"lat":50.213200000,"lon":-8.114660000,"track":2.5000,"speed":0.257}

 $GPDTM,W84,C*52
 $PFEC,AIcmd,0,35,A,01062011,130719*0D
 !AIVDO,1,1,,B,13`kvwO005wJnb2Lfo=@6@8V05`L,0*5F
@@ -92,7 +92,7 @@ $GPGLL,5012.792000,N,00806.879600,W,130719,A,D*59
 $GPGGA,130719,5012.792000,N,00806.879600,W,2,,,,,,,*68
 $GPVTG,2.5,T,,,0.50,N,,,D*12
 $GPRMC,130719.00,A,5012.792000,N,00806.879600,W,0.5,2.5,010611,,A*6C
-{"class":"TPV","mode":2,"time":"2011-06-01T13:07:19.000Z","ept":0.005,"lat":50.213200000,"lon":-8.114660000,"track":2.5000,"speed":0.257}

+{"class":"TPV","status":2,"mode":2,"time":"2011-06-01T13:07:19.000Z","ept":0.005,"lat":50.213200000,"lon":-8.114660000,"track":2.5000,"speed":0.257}

 $GPDTM,W84,C*52
 $PFEC,AIcmd,0,35,A,01062011,130720*07
 !AIVDO,1,1,,B,13`kvwO005wJnb2Lfo=P6@8`05`L,0*79
@@ -102,7 +102,7 @@ $GPGLL,5012.792600,N,00806.879600,W,130720,A,D*55
 $GPGGA,130720,5012.792600,N,00806.879600,W,2,,,,,,,*64
 $GPVTG,2.5,T,,,0.50,N,,,D*12
 $GPRMC,130720.00,A,5012.792600,N,00806.879600,W,0.5,2.5,010611,,A*60
-{"class":"TPV","mode":2,"time":"2011-06-01T13:07:20.000Z","ept":0.005,"lat":50.213210000,"lon":-8.114660000,"track":2.5000,"speed":0.257}

+{"class":"TPV","status":2,"mode":2,"time":"2011-06-01T13:07:20.000Z","ept":0.005,"lat":50.213210000,"lon":-8.114660000,"track":2.5000,"speed":0.257}

 $GPDTM,W84,C*52
 $PFEC,AIcmd,0,35,A,01062011,130721*06
 !AIVDO,1,1,,B,13`kvwO005wJnb2Lfo>05P8b05`L,0*0B
@@ -112,7 +112,7 @@ $GPGLL,5012.792600,N,00806.879600,W,130721,A,D*54
 $GPGGA,130721,5012.792600,N,00806.879600,W,2,,,,,,,*65
 $GPVTG,2.2,T,,,0.50,N,,,D*15
 $GPRMC,130721.00,A,5012.792600,N,00806.879600,W,0.5,2.2,010611,,A*66
-{"class":"TPV","mode":2,"time":"2011-06-01T13:07:21.000Z","ept":0.005,"lat":50.213210000,"lon":-8.114660000,"track":2.2000,"speed":0.257}

+{"class":"TPV","status":2,"mode":2,"time":"2011-06-01T13:07:21.000Z","ept":0.005,"lat":50.213210000,"lon":-8.114660000,"track":2.2000,"speed":0.257}

 $GPDTM,W84,C*52
 $PFEC,AIcmd,0,35,A,01062011,130722*05
 !AIVDO,1,1,,B,13`kvwO005wJnb2Lfo>@6@8d05`L,0*6E
@@ -122,5 +122,5 @@ $GPGLL,5012.792600,N,00806.879600,W,130722,A,D*57
 $GPGGA,130722,5012.792600,N,00806.879600,W,2,,,,,,,*66
 $GPVTG,2.5,T,,,0.50,N,,,D*12
 $GPRMC,130722.00,A,5012.792600,N,00806.879600,W,0.5,2.5,010611,,A*62
-{"class":"TPV","mode":2,"time":"2011-06-01T13:07:22.000Z","ept":0.005,"lat":50.213210000,"lon":-8.114660000,"track":2.5000,"speed":0.257}

+{"class":"TPV","status":2,"mode":2,"time":"2011-06-01T13:07:22.000Z","ept":0.005,"lat":50.213210000,"lon":-8.114660000,"track":2.5000,"speed":0.257}

 $GPDTM,W84,C*52