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, 5 insertions, 5 deletions

diff --git a/test/daemon/garmin-10x.log.chk b/test/daemon/garmin-10x.log.chk
index 8e8f9013..7fe9c380 100644
--- a/test/daemon/garmin-10x.log.chk
+++ b/test/daemon/garmin-10x.log.chk
@@ -23,7 +23,7 @@ $GPGSV,3,2,10,20,38,248,17,13,16,310,,06,15,156,,29,15,048,15*78
 $GPGSV,3,3,10,03,08,171,,14,06,129,*7D

 {"class":"SKY","vdop":1.00,"hdop":7.20,"pdop":7.30,"satellites":[{"PRN":16,"el":74,"az":173,"ss":20,"used":true,"gnssid":0,"svid":16},{"PRN":23,"el":42,"az":310,"ss":17,"used":false,"gnssid":0,"svid":23},{"PRN":31,"el":40,"az":66,"ss":18,"used":true,"gnssid":0,"svid":31},{"PRN":32,"el":39,"az":218,"ss":15,"used":false,"gnssid":0,"svid":32},{"PRN":20,"el":38,"az":248,"ss":17,"used":false,"gnssid":0,"svid":20},{"PRN":13,"el":16,"az":310,"ss":0,"used":false,"gnssid":0,"svid":13},{"PRN":6,"el":15,"az":156,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":29,"el":15,"az":48,"ss":15,"used":true,"gnssid":0,"svid":29},{"PRN":3,"el":8,"az":171,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":14,"el":6,"az":129,"ss":0,"used":false,"gnssid":0,"svid":14}]}

 $GPRMC,165009.000,A,4143.6058,N,08338.0787,W,0.60,231.03,180710,,,A*7C

-{"class":"TPV","mode":3,"time":"2010-07-18T16:50:09.000Z","ept":0.005,"lat":41.726763333,"lon":-83.634645000,"alt":203.900,"epx":12.698,"epy":17.990,"epv":55.200,"track":231.0300,"speed":0.309,"climb":-0.200,"eps":35.98,"epc":110.40}

+{"class":"TPV","mode":3,"time":"2010-07-18T16:50:09.000Z","ept":0.005,"lat":41.726763333,"lon":-83.634645000,"alt":203.900,"epx":12.698,"epy":17.990,"epv":23.000,"track":231.0300,"speed":0.309,"climb":-0.200,"eps":35.98,"epc":78.20}

 $GPGGA,165010.000,4143.6057,N,08338.0788,W,6,00,50.0,203.8,M,-33.7,M,,0000*5D

 $GPGSA,A,2,,,,,,,,,,,,,50.0,50.0,50.0*06

 $GPGSV,3,1,10,16,74,173,09,23,42,310,07,31,40,066,13,32,39,218,07*73

@@ -60,23 +60,23 @@ $GPGSV,3,3,10,03,08,171,,14,06,129,*7D
 {"class":"SKY","vdop":50.00,"hdop":50.00,"pdop":50.00,"satellites":[{"PRN":16,"el":74,"az":173,"ss":0,"used":false,"gnssid":0,"svid":16},{"PRN":23,"el":42,"az":310,"ss":0,"used":false,"gnssid":0,"svid":23},{"PRN":31,"el":40,"az":66,"ss":12,"used":false,"gnssid":0,"svid":31},{"PRN":32,"el":39,"az":218,"ss":0,"used":false,"gnssid":0,"svid":32},{"PRN":20,"el":38,"az":248,"ss":0,"used":false,"gnssid":0,"svid":20},{"PRN":13,"el":16,"az":310,"ss":0,"used":false,"gnssid":0,"svid":13},{"PRN":6,"el":15,"az":156,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":29,"el":15,"az":48,"ss":0,"used":false,"gnssid":0,"svid":29},{"PRN":3,"el":8,"az":171,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":14,"el":6,"az":129,"ss":0,"used":false,"gnssid":0,"svid":14}]}

 $GPRMC,165022.000,V,,,,,,,180710,,,N*40

 $GPGGA,165044.000,4143.5985,N,08338.0820,W,1,03,2.2,204.1,M,-33.7,M,,0000*6B

-{"class":"TPV","mode":3,"time":"2010-07-18T16:50:44.000Z","ept":0.005,"lat":41.726641667,"lon":-83.634700000,"alt":204.100,"epv":1150.000,"speed":0.413,"climb":0.009,"epc":34.50}

+{"class":"TPV","mode":0,"time":"2010-07-18T16:50:44.000Z","ept":0.005}

 $GPGSA,A,2,31,23,16,,,,,,,,,,2.4,2.2,1.0*30

 $GPGSV,3,1,10,16,74,173,26,23,42,310,21,31,40,066,23,32,39,218,*7E

 $GPGSV,3,2,10,20,38,248,,13,16,310,,06,15,156,,29,15,048,*7A

 $GPGSV,3,3,10,03,08,171,,14,06,129,*7D

 {"class":"SKY","vdop":1.00,"hdop":2.20,"pdop":2.40,"satellites":[{"PRN":16,"el":74,"az":173,"ss":26,"used":true,"gnssid":0,"svid":16},{"PRN":23,"el":42,"az":310,"ss":21,"used":true,"gnssid":0,"svid":23},{"PRN":31,"el":40,"az":66,"ss":23,"used":true,"gnssid":0,"svid":31},{"PRN":32,"el":39,"az":218,"ss":0,"used":false,"gnssid":0,"svid":32},{"PRN":20,"el":38,"az":248,"ss":0,"used":false,"gnssid":0,"svid":20},{"PRN":13,"el":16,"az":310,"ss":0,"used":false,"gnssid":0,"svid":13},{"PRN":6,"el":15,"az":156,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":29,"el":15,"az":48,"ss":0,"used":false,"gnssid":0,"svid":29},{"PRN":3,"el":8,"az":171,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":14,"el":6,"az":129,"ss":0,"used":false,"gnssid":0,"svid":14}]}

 $GPRMC,165044.000,A,4143.5985,N,08338.0820,W,0.00,,180710,,,A*66

-{"class":"TPV","mode":3,"time":"2010-07-18T16:50:44.000Z","ept":0.005,"lat":41.726641667,"lon":-83.634700000,"alt":204.100,"epv":1150.000,"track":0.0000,"speed":0.000,"climb":0.009,"epc":34.50}

+{"class":"TPV","mode":3,"time":"2010-07-18T16:50:44.000Z","ept":0.005,"lat":41.726641667,"lon":-83.634700000,"alt":204.100,"epv":23.000,"track":0.0000,"speed":0.000}

 $GPGGA,165045.000,4143.6024,N,08338.0864,W,1,04,2.0,183.5,M,-33.7,M,,0000*66

-{"class":"TPV","mode":3,"time":"2010-07-18T16:50:45.000Z","ept":0.005,"lat":41.726706667,"lon":-83.634773333,"alt":183.500,"epv":23.000,"speed":9.453,"climb":-20.600,"epc":1173.00}

+{"class":"TPV","mode":3,"time":"2010-07-18T16:50:45.000Z","ept":0.005,"lat":41.726706667,"lon":-83.634773333,"alt":183.500,"epv":23.000,"speed":9.453,"climb":-20.600,"epc":46.00}

 $GPGSA,A,3,31,23,16,20,,,,,,,,,4.6,2.0,4.2*32

 $GPGSV,3,1,10,16,74,173,27,23,42,310,19,31,40,066,23,32,39,218,*74

 $GPGSV,3,2,10,20,38,248,19,13,16,310,,06,15,156,,29,15,048,*72

 $GPGSV,3,3,10,03,08,171,,14,06,129,*7D

 {"class":"SKY","xdop":0.97,"ydop":1.73,"vdop":4.20,"tdop":3.20,"hdop":2.00,"gdop":5.68,"pdop":4.60,"satellites":[{"PRN":16,"el":74,"az":173,"ss":27,"used":true,"gnssid":0,"svid":16},{"PRN":23,"el":42,"az":310,"ss":19,"used":true,"gnssid":0,"svid":23},{"PRN":31,"el":40,"az":66,"ss":23,"used":true,"gnssid":0,"svid":31},{"PRN":32,"el":39,"az":218,"ss":0,"used":false,"gnssid":0,"svid":32},{"PRN":20,"el":38,"az":248,"ss":19,"used":true,"gnssid":0,"svid":20},{"PRN":13,"el":16,"az":310,"ss":0,"used":false,"gnssid":0,"svid":13},{"PRN":6,"el":15,"az":156,"ss":0,"used":false,"gnssid":0,"svid":6},{"PRN":29,"el":15,"az":48,"ss":0,"used":false,"gnssid":0,"svid":29},{"PRN":3,"el":8,"az":171,"ss":0,"used":false,"gnssid":0,"svid":3},{"PRN":14,"el":6,"az":129,"ss":0,"used":false,"gnssid":0,"svid":14}]}

 $GPRMC,165045.000,A,4143.6024,N,08338.0864,W,2.19,176.03,180710,,,A*71

-{"class":"TPV","mode":3,"time":"2010-07-18T16:50:45.000Z","ept":0.005,"lat":41.726706667,"lon":-83.634773333,"alt":183.500,"epx":14.573,"epy":25.987,"epv":23.000,"track":176.0300,"speed":1.127,"climb":-20.600,"epc":1173.00}

+{"class":"TPV","mode":3,"time":"2010-07-18T16:50:45.000Z","ept":0.005,"lat":41.726706667,"lon":-83.634773333,"alt":183.500,"epx":14.573,"epy":25.987,"epv":23.000,"track":176.0300,"speed":1.127,"climb":-20.600,"epc":46.00}

 $GPGGA,165046.000,4143.6110,N,08338.0897,W,1,05,1.5,200.1,M,-33.7,M,,0000*64

 {"class":"TPV","mode":3,"time":"2010-07-18T16:50:46.000Z","ept":0.005,"lat":41.726850000,"lon":-83.634828333,"alt":200.100,"epx":14.573,"epy":25.987,"epv":96.600,"speed":16.564,"climb":16.600,"eps":51.97,"epc":119.60}

 $GPGSA,A,3,31,23,16,20,32,,,,,,,,4.0,1.5,3.6*30