Change NMEA mode setting, thus major changes in gpsd_error_model().

The start of this overly large patch was to simply move the test
for MODE_2D/3D flipping, which only affect NMEA 183, back into
driver_nmea0813.c

But that was intertwined with how gpsd_error_model() computes
derived variables, which required major changes to how NMEA 183
mode_2D/3D are set.

This ultimatly led to major regression test results.  Almost all for
the better.

I tried to break it up, but moving from one paradigm to another
needed one big jump...

1 files changed, 7 insertions, 7 deletions

diff --git a/test/daemon/triton400.log.chk b/test/daemon/triton400.log.chk
index c01ce943..7d19862c 100644
--- a/test/daemon/triton400.log.chk
+++ b/test/daemon/triton400.log.chk
@@ -9,34 +9,34 @@ $GPGGA,030129.00,2638.1726,N,08011.3892,W,1,06,1.5,00016,M,-0028,M,,*50
 $GPRMC,030129.0,A,2638.1726,N,08011.3892,W,0.00,219.6,010413,,*26
 {"class":"TPV","mode":3,"time":"2013-04-01T03:01:29.000Z","ept":0.005,"lat":26.636210000,"lon":-80.189820000,"alt":16.000,"track":219.6000,"speed":0.000}

 $GPGSA,A,3,08,07,11,28,17,26,,,,,,,02.6,01.5,02.1*06
-{"class":"TPV","mode":3,"time":"2013-04-01T03:01:29.000Z","ept":0.005,"lat":26.636210000,"lon":-80.189820000,"alt":16.000,"epv":48.300,"track":219.6000,"speed":0.000,"climb":0.000}

+{"class":"TPV","mode":3,"time":"2013-04-01T03:01:29.000Z","ept":0.005,"lat":26.636210000,"lon":-80.189820000,"alt":16.000,"epv":48.300,"track":219.6000,"speed":0.000}

 $GPGSV,3,1,11,08,75,303,44,07,66,172,51,11,51,055,36,28,39,325,36*76
 $GPGSV,3,2,11,17,31,254,51,26,13,295,51,09,12,322,36,19,12,046,51*76
 $GPGSV,3,3,11,20,09,138,36,13,04,183,51,32,03,113,44,,,,*44
 {"class":"SKY","xdop":1.31,"ydop":1.26,"vdop":2.10,"tdop":2.26,"hdop":1.50,"gdop":3.96,"pdop":2.60,"satellites":[{"PRN":8,"el":75,"az":303,"ss":44,"used":true,"gnssid":0,"svid":8},{"PRN":7,"el":66,"az":172,"ss":51,"used":true,"gnssid":0,"svid":7},{"PRN":11,"el":51,"az":55,"ss":36,"used":true,"gnssid":0,"svid":11},{"PRN":28,"el":39,"az":325,"ss":36,"used":true,"gnssid":0,"svid":28},{"PRN":17,"el":31,"az":254,"ss":51,"used":true,"gnssid":0,"svid":17},{"PRN":26,"el":13,"az":295,"ss":51,"used":true,"gnssid":0,"svid":26},{"PRN":9,"el":12,"az":322,"ss":36,"used":false,"gnssid":0,"svid":9},{"PRN":19,"el":12,"az":46,"ss":51,"used":false,"gnssid":0,"svid":19},{"PRN":20,"el":9,"az":138,"ss":36,"used":false,"gnssid":0,"svid":20},{"PRN":13,"el":4,"az":183,"ss":51,"used":false,"gnssid":0,"svid":13},{"PRN":32,"el":3,"az":113,"ss":44,"used":false,"gnssid":0,"svid":32}]}

 $GPGLL,2638.1727,N,08011.3892,W,030130.000,A,A*4E
 $GPGLL,2638.1728,N,08011.3893,W,030131.000,A,A*41
-{"class":"TPV","mode":2,"time":"2013-04-01T03:01:31.000Z","ept":0.005,"lat":26.636213333,"lon":-80.189821667,"epx":19.621,"epy":18.879,"speed":0.248,"eps":39.24}

+{"class":"TPV","mode":3,"time":"2013-04-01T03:01:31.000Z","ept":0.005,"lat":26.636213333,"lon":-80.189821667,"epx":19.621,"epy":18.879,"epv":48.300,"speed":0.248,"eps":39.24,"epc":96.60}

 $GPGGA,030131.00,2638.1728,N,08011.3893,W,1,06,1.5,00016,M,-0028,M,,*56
 $GPRMC,030131.0,A,2638.1728,N,08011.3893,W,0.00,219.6,010413,,*20
-{"class":"TPV","mode":3,"time":"2013-04-01T03:01:31.000Z","ept":0.005,"lat":26.636213333,"lon":-80.189821667,"alt":16.000,"epx":19.621,"epy":18.879,"epv":48.300,"track":219.6000,"speed":0.000,"climb":0.000,"eps":39.24}

+{"class":"TPV","mode":3,"time":"2013-04-01T03:01:31.000Z","ept":0.005,"lat":26.636213333,"lon":-80.189821667,"alt":16.000,"epx":19.621,"epy":18.879,"epv":48.300,"track":219.6000,"speed":0.000,"eps":39.24,"epc":96.60}

 $GPGSA,A,3,08,07,11,28,17,26,,,,,,,02.6,01.5,02.1*06
 $GPGSV,3,1,11,08,75,303,44,07,66,172,51,11,51,055,36,28,39,325,36*76
 $GPGSV,3,2,11,17,31,254,51,26,13,295,51,09,12,322,36,19,12,046,51*76
 $GPGSV,3,3,11,20,09,138,36,13,04,183,51,32,03,113,44,,,,*44
 {"class":"SKY","xdop":1.31,"ydop":1.26,"vdop":2.10,"tdop":2.26,"hdop":1.50,"gdop":3.96,"pdop":2.60,"satellites":[{"PRN":8,"el":75,"az":303,"ss":44,"used":true,"gnssid":0,"svid":8},{"PRN":7,"el":66,"az":172,"ss":51,"used":true,"gnssid":0,"svid":7},{"PRN":11,"el":51,"az":55,"ss":36,"used":true,"gnssid":0,"svid":11},{"PRN":28,"el":39,"az":325,"ss":36,"used":true,"gnssid":0,"svid":28},{"PRN":17,"el":31,"az":254,"ss":51,"used":true,"gnssid":0,"svid":17},{"PRN":26,"el":13,"az":295,"ss":51,"used":true,"gnssid":0,"svid":26},{"PRN":9,"el":12,"az":322,"ss":36,"used":false,"gnssid":0,"svid":9},{"PRN":19,"el":12,"az":46,"ss":51,"used":false,"gnssid":0,"svid":19},{"PRN":20,"el":9,"az":138,"ss":36,"used":false,"gnssid":0,"svid":20},{"PRN":13,"el":4,"az":183,"ss":51,"used":false,"gnssid":0,"svid":13},{"PRN":32,"el":3,"az":113,"ss":44,"used":false,"gnssid":0,"svid":32}]}

 $GPGLL,2638.1750,N,08011.3902,W,030132.000,A,A*44
-{"class":"TPV","mode":2,"time":"2013-04-01T03:01:32.000Z","ept":0.005,"lat":26.636250000,"lon":-80.189836667,"epx":19.621,"epy":18.879,"speed":4.328,"eps":39.24}

+{"class":"TPV","mode":3,"time":"2013-04-01T03:01:32.000Z","ept":0.005,"lat":26.636250000,"lon":-80.189836667,"epx":19.621,"epy":18.879,"epv":48.300,"speed":4.328,"eps":39.24,"epc":96.60}

 $GPGGA,030132.00,2638.1750,N,08011.3902,W,1,06,1.5,00019,M,-0028,M,,*5C
 $GPRMC,030132.0,A,2638.1750,N,08011.3902,W,0.00,219.6,010413,,*25
-{"class":"TPV","mode":3,"time":"2013-04-01T03:01:32.000Z","ept":0.005,"lat":26.636250000,"lon":-80.189836667,"alt":19.000,"epx":19.621,"epy":18.879,"epv":48.300,"track":219.6000,"speed":0.000,"climb":0.000,"eps":39.24}

+{"class":"TPV","mode":3,"time":"2013-04-01T03:01:32.000Z","ept":0.005,"lat":26.636250000,"lon":-80.189836667,"alt":19.000,"epx":19.621,"epy":18.879,"epv":48.300,"track":219.6000,"speed":0.000,"climb":3.000,"eps":39.24,"epc":96.60}

 $GPGSA,A,3,08,07,11,28,17,26,,,,,,,02.6,01.5,02.1*06
 $GPGSV,3,1,11,08,75,303,44,07,66,172,51,11,51,055,36,28,39,325,36*76
 $GPGSV,3,2,11,17,31,254,51,26,13,295,51,09,12,322,36,19,12,046,36*77
 $GPGSV,3,3,11,20,09,138,36,13,04,183,51,32,03,113,44,,,,*44
 {"class":"SKY","xdop":1.31,"ydop":1.26,"vdop":2.10,"tdop":2.26,"hdop":1.50,"gdop":3.96,"pdop":2.60,"satellites":[{"PRN":8,"el":75,"az":303,"ss":44,"used":true,"gnssid":0,"svid":8},{"PRN":7,"el":66,"az":172,"ss":51,"used":true,"gnssid":0,"svid":7},{"PRN":11,"el":51,"az":55,"ss":36,"used":true,"gnssid":0,"svid":11},{"PRN":28,"el":39,"az":325,"ss":36,"used":true,"gnssid":0,"svid":28},{"PRN":17,"el":31,"az":254,"ss":51,"used":true,"gnssid":0,"svid":17},{"PRN":26,"el":13,"az":295,"ss":51,"used":true,"gnssid":0,"svid":26},{"PRN":9,"el":12,"az":322,"ss":36,"used":false,"gnssid":0,"svid":9},{"PRN":19,"el":12,"az":46,"ss":36,"used":false,"gnssid":0,"svid":19},{"PRN":20,"el":9,"az":138,"ss":36,"used":false,"gnssid":0,"svid":20},{"PRN":13,"el":4,"az":183,"ss":51,"used":false,"gnssid":0,"svid":13},{"PRN":32,"el":3,"az":113,"ss":44,"used":false,"gnssid":0,"svid":32}]}

 $GPGLL,2638.1753,N,08011.3903,W,030133.000,A,A*47
-{"class":"TPV","mode":2,"time":"2013-04-01T03:01:33.000Z","ept":0.005,"lat":26.636255000,"lon":-80.189838333,"epx":19.621,"epy":18.879,"speed":0.578,"eps":39.24}

+{"class":"TPV","mode":3,"time":"2013-04-01T03:01:33.000Z","ept":0.005,"lat":26.636255000,"lon":-80.189838333,"epx":19.621,"epy":18.879,"epv":48.300,"speed":0.578,"eps":39.24,"epc":96.60}

 $GPGGA,030133.00,2638.1753,N,08011.3903,W,1,06,1.5,00020,M,-0028,M,,*55
 $GPRMC,030133.0,A,2638.1753,N,08011.3903,W,0.00,219.6,010413,,*26
-{"class":"TPV","mode":3,"time":"2013-04-01T03:01:33.000Z","ept":0.005,"lat":26.636255000,"lon":-80.189838333,"alt":20.000,"epx":19.621,"epy":18.879,"epv":48.300,"track":219.6000,"speed":0.000,"climb":0.000,"eps":39.24}

+{"class":"TPV","mode":3,"time":"2013-04-01T03:01:33.000Z","ept":0.005,"lat":26.636255000,"lon":-80.189838333,"alt":20.000,"epx":19.621,"epy":18.879,"epv":48.300,"track":219.6000,"speed":0.000,"climb":1.000,"eps":39.24,"epc":96.60}