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

diff --git a/test/daemon/ac12.log.chk b/test/daemon/ac12.log.chk
index 1b0cb2ec..835deedf 100644
--- a/test/daemon/ac12.log.chk
+++ b/test/daemon/ac12.log.chk
@@ -16,7 +16,7 @@ $GPGSV,3,2,12,02,56,323,,04,41,024,,12,31,317,,17,31,085,*72
 $GPGSV,3,3,12,05,15,318,,24,02,246,,33,08,096,39,35,45,118,*77
 {"class":"SKY","xdop":0.76,"ydop":1.60,"vdop":3.00,"tdop":0.99,"hdop":1.70,"gdop":3.70,"pdop":3.40,"satellites":[{"PRN":28,"el":14,"az":150,"ss":40,"used":true,"gnssid":0,"svid":28},{"PRN":9,"el":15,"az":254,"ss":41,"used":true,"gnssid":0,"svid":9},{"PRN":10,"el":43,"az":192,"ss":47,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":6,"az":81,"ss":36,"used":true,"gnssid":0,"svid":13},{"PRN":2,"el":56,"az":323,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":41,"az":24,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":12,"el":31,"az":317,"ss":0,"used":false,"gnssid":0,"svid":12},{"PRN":17,"el":31,"az":85,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":5,"el":15,"az":318,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":24,"el":2,"az":246,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":120,"el":8,"az":96,"ss":39,"used":false,"gnssid":1,"svid":120},{"PRN":122,"el":45,"az":118,"ss":0,"used":false,"gnssid":1,"svid":122}]}

 $GPRMC,193222.00,A,2037.7283,N,08704.0847,W,00.0,201.8,231207,01,W,A*25
-{"class":"TPV","mode":3,"time":"2007-12-23T19:32:22.000Z","ept":0.005,"lat":20.628805000,"lon":-87.068078333,"alt":-30.000,"epx":11.444,"epy":24.060,"epv":69.000,"track":201.8000,"speed":0.000,"climb":-0.400}

+{"class":"TPV","mode":3,"time":"2007-12-23T19:32:22.000Z","ept":0.005,"lat":20.628805000,"lon":-87.068078333,"alt":-30.000,"epx":11.444,"epy":24.060,"epv":69.000,"track":201.8000,"speed":0.000,"climb":0.400,"eps":48.12,"epc":138.00}

 $GPZDA,193224.00,23,12,2007,00,00*6E
 $GPGGA,193223.00,2037.72880,N,08704.08455,W,1,04,1.7,-29.55,M,-13.9,M,,*70
 $GPGSA,A,3,10,09,28,13,,,,,,,,,03.4,01.7,03.0*00
@@ -25,7 +25,7 @@ $GPGSV,3,2,12,02,56,323,,04,41,024,,12,31,317,,17,31,085,*72
 $GPGSV,3,3,12,05,15,318,,24,02,246,,33,08,096,,35,45,118,*7D
 {"class":"SKY","xdop":0.76,"ydop":1.60,"vdop":3.00,"tdop":0.99,"hdop":1.70,"gdop":3.70,"pdop":3.40,"satellites":[{"PRN":28,"el":14,"az":150,"ss":39,"used":true,"gnssid":0,"svid":28},{"PRN":9,"el":15,"az":254,"ss":41,"used":true,"gnssid":0,"svid":9},{"PRN":10,"el":43,"az":192,"ss":47,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":6,"az":81,"ss":36,"used":true,"gnssid":0,"svid":13},{"PRN":2,"el":56,"az":323,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":41,"az":24,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":12,"el":31,"az":317,"ss":0,"used":false,"gnssid":0,"svid":12},{"PRN":17,"el":31,"az":85,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":5,"el":15,"az":318,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":24,"el":2,"az":246,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":120,"el":8,"az":96,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":122,"el":45,"az":118,"ss":0,"used":false,"gnssid":1,"svid":122}]}

 $GPRMC,193223.00,A,2037.7288,N,08704.0846,W,00.1,201.8,231207,01,W,A*2F
-{"class":"TPV","mode":3,"time":"2007-12-23T19:32:23.000Z","ept":0.005,"lat":20.628813333,"lon":-87.068076667,"alt":-29.550,"epx":11.444,"epy":24.060,"epv":69.000,"track":201.8000,"speed":0.051,"climb":-0.450}

+{"class":"TPV","mode":3,"time":"2007-12-23T19:32:23.000Z","ept":0.005,"lat":20.628813333,"lon":-87.068076667,"alt":-29.550,"epx":11.444,"epy":24.060,"epv":69.000,"track":201.8000,"speed":0.051,"climb":0.450,"eps":48.12,"epc":138.00}

 $GPZDA,193225.00,23,12,2007,00,00*6F
 $GPGGA,193224.00,2037.72912,N,08704.08451,W,1,04,1.7,-29.53,M,-13.9,M,,*7F
 $GPGSA,A,3,10,09,28,13,,,,,,,,,03.4,01.7,03.0*00
@@ -34,7 +34,7 @@ $GPGSV,3,2,12,02,56,323,,04,41,024,,12,31,317,,17,31,085,*72
 $GPGSV,3,3,12,05,15,318,,24,02,246,,33,08,096,,35,45,118,*7D
 {"class":"SKY","xdop":0.76,"ydop":1.60,"vdop":3.00,"tdop":0.99,"hdop":1.70,"gdop":3.70,"pdop":3.40,"satellites":[{"PRN":28,"el":14,"az":150,"ss":39,"used":true,"gnssid":0,"svid":28},{"PRN":9,"el":15,"az":254,"ss":41,"used":true,"gnssid":0,"svid":9},{"PRN":10,"el":43,"az":192,"ss":47,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":6,"az":81,"ss":36,"used":true,"gnssid":0,"svid":13},{"PRN":2,"el":56,"az":323,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":41,"az":24,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":12,"el":31,"az":317,"ss":0,"used":false,"gnssid":0,"svid":12},{"PRN":17,"el":31,"az":85,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":5,"el":15,"az":318,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":24,"el":2,"az":246,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":120,"el":8,"az":96,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":122,"el":45,"az":118,"ss":0,"used":false,"gnssid":1,"svid":122}]}

 $GPRMC,193224.00,A,2037.7291,N,08704.0845,W,00.0,201.8,231207,01,W,A*22
-{"class":"TPV","mode":3,"time":"2007-12-23T19:32:24.000Z","ept":0.005,"lat":20.628818333,"lon":-87.068075000,"alt":-29.530,"epx":11.444,"epy":24.060,"epv":69.000,"track":201.8000,"speed":0.000,"climb":-0.020}

+{"class":"TPV","mode":3,"time":"2007-12-23T19:32:24.000Z","ept":0.005,"lat":20.628818333,"lon":-87.068075000,"alt":-29.530,"epx":11.444,"epy":24.060,"epv":69.000,"track":201.8000,"speed":0.000,"climb":0.020,"eps":48.12,"epc":138.00}

 $GPZDA,193226.00,23,12,2007,00,00*6C
 $GPGGA,193225.00,2037.72949,N,08704.08443,W,1,04,1.7,-29.21,M,-13.9,M,,*76
 $GPGSA,A,3,10,09,28,13,,,,,,,,,03.4,01.7,03.0*00
@@ -44,7 +44,7 @@ $GPGSV,4,3,13,05,16,318,,24,03,247,,30,00,323,,33,08,096,*76
 $GPGSV,4,4,13,35,45,118,*44
 {"class":"SKY","xdop":0.77,"ydop":1.55,"vdop":3.00,"tdop":0.98,"hdop":1.70,"gdop":3.58,"pdop":3.40,"satellites":[{"PRN":28,"el":13,"az":151,"ss":39,"used":true,"gnssid":0,"svid":28},{"PRN":9,"el":15,"az":253,"ss":42,"used":true,"gnssid":0,"svid":9},{"PRN":10,"el":43,"az":192,"ss":48,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":6,"az":81,"ss":36,"used":true,"gnssid":0,"svid":13},{"PRN":2,"el":56,"az":325,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":41,"az":24,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":12,"el":32,"az":317,"ss":0,"used":false,"gnssid":0,"svid":12},{"PRN":17,"el":30,"az":86,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":5,"el":16,"az":318,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":24,"el":3,"az":247,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":30,"el":0,"az":323,"ss":0,"used":false,"gnssid":0,"svid":30},{"PRN":120,"el":8,"az":96,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":122,"el":45,"az":118,"ss":0,"used":false,"gnssid":1,"svid":122}]}

 $GPRMC,193225.00,A,2037.7295,N,08704.0844,W,00.1,201.8,231207,01,W,A*27
-{"class":"TPV","mode":3,"time":"2007-12-23T19:32:25.000Z","ept":0.005,"lat":20.628825000,"lon":-87.068073333,"alt":-29.210,"epx":11.444,"epy":24.060,"epv":69.000,"track":201.8000,"speed":0.051,"climb":-0.320}

+{"class":"TPV","mode":3,"time":"2007-12-23T19:32:25.000Z","ept":0.005,"lat":20.628825000,"lon":-87.068073333,"alt":-29.210,"epx":11.444,"epy":24.060,"epv":69.000,"track":201.8000,"speed":0.051,"climb":0.320,"eps":48.12,"epc":138.00}

 $GPZDA,193227.00,23,12,2007,00,00*6D
 $GPGGA,193226.00,2037.72992,N,08704.08433,W,1,04,1.7,-28.69,M,-13.9,M,,*79
 $GPGSA,A,3,10,09,28,13,,,,,,,,,03.4,01.7,03.0*00
@@ -54,7 +54,7 @@ $GPGSV,4,3,13,05,16,318,,24,03,247,,30,00,323,,33,08,096,*76
 $GPGSV,4,4,13,35,45,118,*44
 {"class":"SKY","xdop":0.77,"ydop":1.55,"vdop":3.00,"tdop":0.98,"hdop":1.70,"gdop":3.58,"pdop":3.40,"satellites":[{"PRN":28,"el":13,"az":151,"ss":41,"used":true,"gnssid":0,"svid":28},{"PRN":9,"el":15,"az":253,"ss":41,"used":true,"gnssid":0,"svid":9},{"PRN":10,"el":43,"az":192,"ss":48,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":6,"az":81,"ss":36,"used":true,"gnssid":0,"svid":13},{"PRN":2,"el":56,"az":325,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":41,"az":24,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":12,"el":32,"az":317,"ss":0,"used":false,"gnssid":0,"svid":12},{"PRN":17,"el":30,"az":86,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":5,"el":16,"az":318,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":24,"el":3,"az":247,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":30,"el":0,"az":323,"ss":0,"used":false,"gnssid":0,"svid":30},{"PRN":120,"el":8,"az":96,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":122,"el":45,"az":118,"ss":0,"used":false,"gnssid":1,"svid":122}]}

 $GPRMC,193226.00,A,2037.7299,N,08704.0843,W,00.1,201.8,231207,01,W,A*2F
-{"class":"TPV","mode":3,"time":"2007-12-23T19:32:26.000Z","ept":0.005,"lat":20.628831667,"lon":-87.068071667,"alt":-28.690,"epx":11.544,"epy":23.220,"epv":69.000,"track":201.8000,"speed":0.051,"climb":-0.520}

+{"class":"TPV","mode":3,"time":"2007-12-23T19:32:26.000Z","ept":0.005,"lat":20.628831667,"lon":-87.068071667,"alt":-28.690,"epx":11.544,"epy":23.220,"epv":69.000,"track":201.8000,"speed":0.051,"climb":0.520,"eps":47.28,"epc":138.00}

 $GPZDA,193228.00,23,12,2007,00,00*62
 $GPGGA,193227.00,2037.73032,N,08704.08423,W,1,04,1.7,-28.28,M,-13.9,M,,*7E
 $GPGSA,A,3,10,28,09,13,,,,,,,,,03.4,01.7,03.0*00
@@ -64,4 +64,4 @@ $GPGSV,4,3,13,05,16,318,,24,03,247,,30,00,323,,33,08,096,*76
 $GPGSV,4,4,13,35,45,118,*44
 {"class":"SKY","xdop":0.77,"ydop":1.55,"vdop":3.00,"tdop":0.98,"hdop":1.70,"gdop":3.58,"pdop":3.40,"satellites":[{"PRN":28,"el":13,"az":151,"ss":41,"used":true,"gnssid":0,"svid":28},{"PRN":9,"el":15,"az":253,"ss":41,"used":true,"gnssid":0,"svid":9},{"PRN":10,"el":43,"az":192,"ss":48,"used":true,"gnssid":0,"svid":10},{"PRN":13,"el":6,"az":81,"ss":36,"used":true,"gnssid":0,"svid":13},{"PRN":2,"el":56,"az":325,"ss":0,"used":false,"gnssid":0,"svid":2},{"PRN":4,"el":41,"az":24,"ss":0,"used":false,"gnssid":0,"svid":4},{"PRN":12,"el":32,"az":317,"ss":0,"used":false,"gnssid":0,"svid":12},{"PRN":17,"el":30,"az":86,"ss":0,"used":false,"gnssid":0,"svid":17},{"PRN":5,"el":16,"az":318,"ss":0,"used":false,"gnssid":0,"svid":5},{"PRN":24,"el":3,"az":247,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":30,"el":0,"az":323,"ss":0,"used":false,"gnssid":0,"svid":30},{"PRN":120,"el":8,"az":96,"ss":0,"used":false,"gnssid":1,"svid":120},{"PRN":122,"el":45,"az":118,"ss":0,"used":false,"gnssid":1,"svid":122}]}

 $GPRMC,193227.00,A,2037.7303,N,08704.0842,W,00.0,201.8,231207,01,W,A*2C
-{"class":"TPV","mode":3,"time":"2007-12-23T19:32:27.000Z","ept":0.005,"lat":20.628838333,"lon":-87.068070000,"alt":-28.280,"epx":11.544,"epy":23.220,"epv":69.000,"track":201.8000,"speed":0.000,"climb":-0.410}

+{"class":"TPV","mode":3,"time":"2007-12-23T19:32:27.000Z","ept":0.005,"lat":20.628838333,"lon":-87.068070000,"alt":-28.280,"epx":11.544,"epy":23.220,"epv":69.000,"track":201.8000,"speed":0.000,"climb":0.410,"eps":46.44,"epc":138.00}