A longstanding bug in error modeling fixed.

The guard controllong DOP computation wasn't right.  The result was
that x/y error estimates were computed much less often than they
should have been.

1 files changed, 7 insertions, 7 deletions

diff --git a/test/daemon/tn204.log.chk b/test/daemon/tn204.log.chk
index 1f681e5c..f69ecece 100644
--- a/test/daemon/tn204.log.chk
+++ b/test/daemon/tn204.log.chk
@@ -5,7 +5,7 @@ $GPGGA,230149,3348.605,N,11821.126,W,1,05,1.7,49.4,M,-32.4,M,,*4E
 $GPGSA,A,3,07,08,,,27,28,29,,,,,,4.2,1.7,3.8*32
 $GPGSV,2,1,08,07,43,197,44,08,68,062,43,11,18,089,00,26,24,314,43*73
 $GPGSV,2,2,08,27,48,103,46,28,66,323,42,29,33,306,43,31,10,040,00*78
-{"class":"SKY","tag":"GSV","vdop":3.80,"hdop":1.70,"pdop":4.20,"satellites":[{"PRN":7,"el":43,"az":197,"ss":44,"used":true},{"PRN":8,"el":68,"az":62,"ss":43,"used":true},{"PRN":11,"el":18,"az":89,"ss":0,"used":false},{"PRN":26,"el":24,"az":314,"ss":43,"used":false},{"PRN":27,"el":48,"az":103,"ss":46,"used":true},{"PRN":28,"el":66,"az":323,"ss":42,"used":true},{"PRN":29,"el":33,"az":306,"ss":43,"used":true},{"PRN":31,"el":10,"az":40,"ss":0,"used":false}]}

+{"class":"SKY","tag":"GSV","xdop":0.79,"ydop":1.11,"vdop":3.80,"tdop":1.37,"hdop":1.70,"gdop":2.83,"pdop":4.20,"satellites":[{"PRN":7,"el":43,"az":197,"ss":44,"used":true},{"PRN":8,"el":68,"az":62,"ss":43,"used":true},{"PRN":11,"el":18,"az":89,"ss":0,"used":false},{"PRN":26,"el":24,"az":314,"ss":43,"used":false},{"PRN":27,"el":48,"az":103,"ss":46,"used":true},{"PRN":28,"el":66,"az":323,"ss":42,"used":true},{"PRN":29,"el":33,"az":306,"ss":43,"used":true},{"PRN":31,"el":10,"az":40,"ss":0,"used":false}]}

 $PGRME,17.4,M,40.3,M,43.9,M*15
 $GPGLL,3348.605,N,11821.126,W,230149,A*34
 $PGRMZ,162,f,3*1E
@@ -13,22 +13,22 @@ $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
 $GPRTE,1,1,c,0*07
 $GPRMC,230150,A,3348.606,N,11821.125,W,000.0,209.4,261002,013.8,E*62
-{"class":"TPV","tag":"RMC","time":1035673310.000,"ept":0.005,"lat":33.810100000,"lon":-118.352083333,"track":209.4000,"speed":0.000,"mode":2}

+{"class":"TPV","tag":"RMC","time":1035673310.000,"ept":0.005,"lat":33.810100000,"lon":-118.352083333,"epx":11.856,"epy":16.622,"track":209.4000,"speed":0.000,"eps":42.17,"mode":2}

 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,230151,3348.607,N,11821.124,W,1,05,1.7,49.2,M,-32.4,M,,*41
 $GPGSA,A,3,07,08,,,27,28,29,,,,,,4.2,1.7,3.8*32
 $GPGSV,2,1,08,07,43,197,45,08,68,062,42,11,18,089,00,26,24,314,43*73
 $GPGSV,2,2,08,27,48,103,46,28,66,323,42,29,33,306,44,31,10,040,00*7F
-{"class":"SKY","tag":"GSV","vdop":3.80,"hdop":1.70,"pdop":4.20,"satellites":[{"PRN":7,"el":43,"az":197,"ss":45,"used":true},{"PRN":8,"el":68,"az":62,"ss":42,"used":true},{"PRN":11,"el":18,"az":89,"ss":0,"used":false},{"PRN":26,"el":24,"az":314,"ss":43,"used":false},{"PRN":27,"el":48,"az":103,"ss":46,"used":true},{"PRN":28,"el":66,"az":323,"ss":42,"used":true},{"PRN":29,"el":33,"az":306,"ss":44,"used":true},{"PRN":31,"el":10,"az":40,"ss":0,"used":false}]}

+{"class":"SKY","tag":"GSV","xdop":0.79,"ydop":1.11,"vdop":3.80,"tdop":1.37,"hdop":1.70,"gdop":2.83,"pdop":4.20,"satellites":[{"PRN":7,"el":43,"az":197,"ss":45,"used":true},{"PRN":8,"el":68,"az":62,"ss":42,"used":true},{"PRN":11,"el":18,"az":89,"ss":0,"used":false},{"PRN":26,"el":24,"az":314,"ss":43,"used":false},{"PRN":27,"el":48,"az":103,"ss":46,"used":true},{"PRN":28,"el":66,"az":323,"ss":42,"used":true},{"PRN":29,"el":33,"az":306,"ss":44,"used":true},{"PRN":31,"el":10,"az":40,"ss":0,"used":false}]}

 $PGRME,17.4,M,40.3,M,43.9,M*15
 $GPGLL,3348.607,N,11821.124,W,230151,A*3D
-{"class":"TPV","tag":"GLL","time":1035673311.000,"ept":0.005,"lat":33.810116667,"lon":-118.352066667,"alt":49.200,"epx":25.546,"epy":25.546,"epv":83.674,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"GLL","time":1035673311.000,"ept":0.005,"lat":33.810116667,"lon":-118.352066667,"alt":49.200,"epx":25.546,"epy":25.546,"epv":83.674,"climb":0.000,"eps":33.24,"mode":3}

 $PGRMZ,161,f,3*1D
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
 $GPRTE,1,1,c,0*07
 $GPRMC,230152,A,3348.607,N,11821.124,W,000.0,209.4,261002,013.8,E*60
-{"class":"TPV","tag":"RMC","time":1035673312.000,"ept":0.005,"lat":33.810116667,"lon":-118.352066667,"track":209.4000,"speed":0.000,"mode":2}

+{"class":"TPV","tag":"RMC","time":1035673312.000,"ept":0.005,"lat":33.810116667,"lon":-118.352066667,"epx":11.856,"epy":16.622,"track":209.4000,"speed":0.000,"eps":42.17,"mode":2}

 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,230153,3348.607,N,11821.124,W,1,05,1.7,49.1,M,-32.4,M,,*40
 $GPGSA,A,3,,08,,,,,29,,,,,,4.2,1.7,3.8*3A
@@ -37,7 +37,7 @@ $GPGSV,2,2,08,27,48,103,46,28,66,323,42,29,33,306,44,31,10,040,00*7F
 {"class":"SKY","tag":"GSV","vdop":3.80,"hdop":1.70,"pdop":4.20,"satellites":[{"PRN":7,"el":43,"az":197,"ss":45,"used":false},{"PRN":8,"el":68,"az":62,"ss":42,"used":true},{"PRN":11,"el":18,"az":89,"ss":0,"used":false},{"PRN":26,"el":24,"az":314,"ss":41,"used":false},{"PRN":27,"el":48,"az":103,"ss":46,"used":false},{"PRN":28,"el":66,"az":323,"ss":42,"used":false},{"PRN":29,"el":33,"az":306,"ss":44,"used":true},{"PRN":31,"el":10,"az":40,"ss":0,"used":false}]}

 $PGRME,17.4,M,40.3,M,43.9,M*15
 $GPGLL,3348.607,N,11821.124,W,230153,A*3F
-{"class":"TPV","tag":"GLL","time":1035673313.000,"ept":0.005,"lat":33.810116667,"lon":-118.352066667,"alt":49.100,"epx":25.546,"epy":25.546,"epv":83.674,"climb":0.000,"mode":3}

+{"class":"TPV","tag":"GLL","time":1035673313.000,"ept":0.005,"lat":33.810116667,"lon":-118.352066667,"alt":49.100,"epx":25.546,"epy":25.546,"epv":83.674,"climb":0.000,"eps":33.24,"mode":3}

 $PGRMZ,161,f,3*1D
 $PGRMM,NAD83*29
 $GPBOD,,T,,M,,*47
@@ -49,7 +49,7 @@ $GPGGA,230155,3348.608,N,11821.124,W,1,02,1.9,49.0,M,-32.4,M,,*41
 $GPGSA,A,3,07,08,,,27,28,,,,,,,1.9,1.9,1.0*33
 $GPGSV,2,1,08,07,43,197,45,08,68,062,43,11,18,089,00,26,24,314,41*70
 $GPGSV,2,2,08,27,48,103,46,28,66,323,43,29,33,306,44,31,10,040,00*7E
-{"class":"SKY","tag":"GSV","vdop":1.00,"hdop":1.90,"pdop":1.90,"satellites":[{"PRN":7,"el":43,"az":197,"ss":45,"used":true},{"PRN":8,"el":68,"az":62,"ss":43,"used":true},{"PRN":11,"el":18,"az":89,"ss":0,"used":false},{"PRN":26,"el":24,"az":314,"ss":41,"used":false},{"PRN":27,"el":48,"az":103,"ss":46,"used":true},{"PRN":28,"el":66,"az":323,"ss":43,"used":true},{"PRN":29,"el":33,"az":306,"ss":44,"used":false},{"PRN":31,"el":10,"az":40,"ss":0,"used":false}]}

+{"class":"SKY","tag":"GSV","xdop":0.85,"ydop":1.11,"vdop":1.00,"tdop":1.38,"hdop":1.90,"gdop":2.93,"pdop":1.90,"satellites":[{"PRN":7,"el":43,"az":197,"ss":45,"used":true},{"PRN":8,"el":68,"az":62,"ss":43,"used":true},{"PRN":11,"el":18,"az":89,"ss":0,"used":false},{"PRN":26,"el":24,"az":314,"ss":41,"used":false},{"PRN":27,"el":48,"az":103,"ss":46,"used":true},{"PRN":28,"el":66,"az":323,"ss":43,"used":true},{"PRN":29,"el":33,"az":306,"ss":44,"used":false},{"PRN":31,"el":10,"az":40,"ss":0,"used":false}]}

 $PGRME,19.2,M,150.0,M,151.2,M*17
 $GPGLL,3348.608,N,11821.124,W,230155,A*36
 {"class":"TPV","tag":"GLL","time":1035673315.000,"ept":0.005,"lat":33.810133333,"lon":-118.352066667,"alt":49.000,"epx":28.188,"epy":28.188,"epv":311.441,"climb":0.000,"mode":3}