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

diff --git a/test/daemon/iTrek.log.chk b/test/daemon/iTrek.log.chk
index 3e2f3d4b..8b10f312 100644
--- a/test/daemon/iTrek.log.chk
+++ b/test/daemon/iTrek.log.chk
@@ -22,9 +22,9 @@ $GPRMC,045851.000,A,3519.9046,N,13640.2631,E,0.12,114.35,270705,,*0B
 {"class":"TPV","tag":"RMC","time":1122440331.000,"ept":0.005,"lat":35.331743333,"lon":136.671051667,"alt":80.400,"epv":43.700,"track":114.3500,"speed":0.062,"climb":0.000,"mode":3}

 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
 $GPGSV,2,2,08,22,62,272,24,18,55,192,16,30,50,179,18,15,09,229,*74
-{"class":"SKY","tag":"GSV","vdop":1.90,"hdop":2.20,"pdop":2.90,"satellites":[{"PRN":22,"el":62,"az":272,"ss":24,"used":false},{"PRN":18,"el":55,"az":192,"ss":16,"used":false},{"PRN":30,"el":50,"az":179,"ss":18,"used":false},{"PRN":15,"el":9,"az":229,"ss":0,"used":false}]}

+{"class":"SKY","tag":"GSV","xdop":11.57,"ydop":10.11,"vdop":1.90,"tdop":17.18,"hdop":2.20,"gdop":26.66,"pdop":2.90,"satellites":[{"PRN":22,"el":62,"az":272,"ss":24,"used":false},{"PRN":18,"el":55,"az":192,"ss":16,"used":false},{"PRN":30,"el":50,"az":179,"ss":18,"used":false},{"PRN":15,"el":9,"az":229,"ss":0,"used":false}]}

 $GPRMC,045852.000,A,3519.9046,N,13640.2632,E,0.10,104.21,270705,,*0D
-{"class":"TPV","tag":"RMC","time":1122440332.000,"ept":0.005,"lat":35.331743333,"lon":136.671053333,"epx":173.568,"epy":151.635,"track":104.2100,"speed":0.051,"mode":2}

+{"class":"TPV","tag":"RMC","time":1122440332.000,"ept":0.005,"lat":35.331743333,"lon":136.671053333,"epx":173.568,"epy":151.635,"track":104.2100,"speed":0.051,"eps":347.14,"mode":2}

 $GPGGA,045853.000,3519.9045,N,13640.2632,E,1,04,2.2,80.4,M,,,,0000*3B
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
 $GPRMC,045853.000,A,3519.9045,N,13640.2632,E,0.11,97.51,270705,,*32
@@ -43,7 +43,7 @@ $GPRMC,045856.000,A,3519.9042,N,13640.2632,E,0.11,115.12,270705,,*0C
 $GPGGA,045857.000,3519.9040,N,13640.2632,E,1,04,2.2,80.5,M,,,,0000*3B
 $GPGSV,2,1,08,05,67,099,26,09,41,047,46,14,32,311,43,26,08,109,30*78
 $GPGSV,2,2,08,22,62,272,25,18,55,192,24,30,50,179,19,15,09,229,*75
-{"class":"SKY","tag":"GSV","vdop":1.90,"hdop":2.20,"pdop":2.90,"satellites":[{"PRN":5,"el":67,"az":99,"ss":26,"used":true},{"PRN":9,"el":41,"az":47,"ss":46,"used":true},{"PRN":14,"el":32,"az":311,"ss":43,"used":true},{"PRN":26,"el":8,"az":109,"ss":30,"used":true},{"PRN":22,"el":62,"az":272,"ss":25,"used":false},{"PRN":18,"el":55,"az":192,"ss":24,"used":false},{"PRN":30,"el":50,"az":179,"ss":19,"used":false},{"PRN":15,"el":9,"az":229,"ss":0,"used":false}]}

+{"class":"SKY","tag":"GSV","xdop":1.20,"ydop":1.90,"vdop":1.90,"tdop":1.30,"hdop":2.20,"gdop":3.21,"pdop":2.90,"satellites":[{"PRN":5,"el":67,"az":99,"ss":26,"used":true},{"PRN":9,"el":41,"az":47,"ss":46,"used":true},{"PRN":14,"el":32,"az":311,"ss":43,"used":true},{"PRN":26,"el":8,"az":109,"ss":30,"used":true},{"PRN":22,"el":62,"az":272,"ss":25,"used":false},{"PRN":18,"el":55,"az":192,"ss":24,"used":false},{"PRN":30,"el":50,"az":179,"ss":19,"used":false},{"PRN":15,"el":9,"az":229,"ss":0,"used":false}]}

 $GPRMC,045857.000,A,3519.9040,N,13640.2632,E,0.11,116.49,270705,,*02
 {"class":"TPV","tag":"RMC","time":1122440337.000,"ept":0.005,"lat":35.331733333,"lon":136.671053333,"alt":80.500,"epx":17.960,"epy":28.495,"epv":43.700,"track":116.4900,"speed":0.057,"climb":0.100,"mode":3}

 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
@@ -63,7 +63,7 @@ $GPGGA,045902.000,3519.9034,N,13640.2633,E,1,04,2.2,81.0,M,,,,0000*3C
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
 $GPGSV,2,1,08,05,67,099,26,09,41,047,46,14,32,311,42,26,08,109,29*71
 $GPGSV,2,2,08,22,62,272,24,18,55,192,24,30,50,179,25,15,09,229,23*7A
-{"class":"SKY","tag":"GSV","vdop":1.90,"hdop":2.20,"pdop":2.90,"satellites":[{"PRN":5,"el":67,"az":99,"ss":26,"used":true},{"PRN":9,"el":41,"az":47,"ss":46,"used":true},{"PRN":14,"el":32,"az":311,"ss":42,"used":true},{"PRN":26,"el":8,"az":109,"ss":29,"used":true},{"PRN":22,"el":62,"az":272,"ss":24,"used":false},{"PRN":18,"el":55,"az":192,"ss":24,"used":false},{"PRN":30,"el":50,"az":179,"ss":25,"used":false},{"PRN":15,"el":9,"az":229,"ss":23,"used":false}]}

+{"class":"SKY","tag":"GSV","xdop":1.20,"ydop":1.90,"vdop":1.90,"tdop":1.30,"hdop":2.20,"gdop":3.21,"pdop":2.90,"satellites":[{"PRN":5,"el":67,"az":99,"ss":26,"used":true},{"PRN":9,"el":41,"az":47,"ss":46,"used":true},{"PRN":14,"el":32,"az":311,"ss":42,"used":true},{"PRN":26,"el":8,"az":109,"ss":29,"used":true},{"PRN":22,"el":62,"az":272,"ss":24,"used":false},{"PRN":18,"el":55,"az":192,"ss":24,"used":false},{"PRN":30,"el":50,"az":179,"ss":25,"used":false},{"PRN":15,"el":9,"az":229,"ss":23,"used":false}]}

 $GPRMC,045902.000,A,3519.9034,N,13640.2633,E,0.13,137.85,270705,,*00
 {"class":"TPV","tag":"RMC","time":1122440342.000,"ept":0.005,"lat":35.331723333,"lon":136.671055000,"alt":81.000,"epx":17.960,"epy":28.495,"epv":43.700,"track":137.8500,"speed":0.067,"climb":0.000,"mode":3}

 $GPGGA,045903.000,3519.9032,N,13640.2633,E,1,04,2.2,81.1,M,,,,0000*3A
@@ -86,7 +86,7 @@ $GPGGA,045907.000,3519.9026,N,13640.2633,E,1,04,2.2,80.6,M,,,,0000*3D
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
 $GPGSV,2,1,08,05,67,099,32,09,41,047,46,14,32,311,42,26,08,109,24*79
 $GPGSV,2,2,08,22,62,272,25,18,55,192,25,30,50,179,26,15,09,229,*78
-{"class":"SKY","tag":"GSV","vdop":1.90,"hdop":2.20,"pdop":2.90,"satellites":[{"PRN":5,"el":67,"az":99,"ss":32,"used":true},{"PRN":9,"el":41,"az":47,"ss":46,"used":true},{"PRN":14,"el":32,"az":311,"ss":42,"used":true},{"PRN":26,"el":8,"az":109,"ss":24,"used":true},{"PRN":22,"el":62,"az":272,"ss":25,"used":false},{"PRN":18,"el":55,"az":192,"ss":25,"used":false},{"PRN":30,"el":50,"az":179,"ss":26,"used":false},{"PRN":15,"el":9,"az":229,"ss":0,"used":false}]}

+{"class":"SKY","tag":"GSV","xdop":1.20,"ydop":1.90,"vdop":1.90,"tdop":1.30,"hdop":2.20,"gdop":3.21,"pdop":2.90,"satellites":[{"PRN":5,"el":67,"az":99,"ss":32,"used":true},{"PRN":9,"el":41,"az":47,"ss":46,"used":true},{"PRN":14,"el":32,"az":311,"ss":42,"used":true},{"PRN":26,"el":8,"az":109,"ss":24,"used":true},{"PRN":22,"el":62,"az":272,"ss":25,"used":false},{"PRN":18,"el":55,"az":192,"ss":25,"used":false},{"PRN":30,"el":50,"az":179,"ss":26,"used":false},{"PRN":15,"el":9,"az":229,"ss":0,"used":false}]}

 $GPRMC,045907.000,A,3519.9026,N,13640.2633,E,0.12,56.07,270705,,*3B
 {"class":"TPV","tag":"RMC","time":1122440347.000,"ept":0.005,"lat":35.331710000,"lon":136.671055000,"alt":80.600,"epx":17.960,"epy":28.495,"epv":43.700,"track":56.0700,"speed":0.062,"climb":0.000,"mode":3}

 $GPGGA,045908.000,3519.9026,N,13640.2633,E,1,04,2.2,80.8,M,,,,0000*3C
@@ -105,7 +105,7 @@ $GPRMC,045911.000,A,3519.9026,N,13640.2634,E,0.42,13.19,270705,,*30
 $GPGGA,045912.000,3519.9026,N,13640.2634,E,1,04,2.2,81.3,M,,,,0000*3A
 $GPGSV,2,1,08,05,67,099,33,09,41,047,46,14,32,311,42,26,08,109,23*7F
 $GPGSV,2,2,08,22,62,272,25,18,55,192,18,30,50,179,21,15,09,229,*71
-{"class":"SKY","tag":"GSV","vdop":1.90,"hdop":2.20,"pdop":2.90,"satellites":[{"PRN":5,"el":67,"az":99,"ss":33,"used":true},{"PRN":9,"el":41,"az":47,"ss":46,"used":true},{"PRN":14,"el":32,"az":311,"ss":42,"used":true},{"PRN":26,"el":8,"az":109,"ss":23,"used":true},{"PRN":22,"el":62,"az":272,"ss":25,"used":false},{"PRN":18,"el":55,"az":192,"ss":18,"used":false},{"PRN":30,"el":50,"az":179,"ss":21,"used":false},{"PRN":15,"el":9,"az":229,"ss":0,"used":false}]}

+{"class":"SKY","tag":"GSV","xdop":1.20,"ydop":1.90,"vdop":1.90,"tdop":1.30,"hdop":2.20,"gdop":3.21,"pdop":2.90,"satellites":[{"PRN":5,"el":67,"az":99,"ss":33,"used":true},{"PRN":9,"el":41,"az":47,"ss":46,"used":true},{"PRN":14,"el":32,"az":311,"ss":42,"used":true},{"PRN":26,"el":8,"az":109,"ss":23,"used":true},{"PRN":22,"el":62,"az":272,"ss":25,"used":false},{"PRN":18,"el":55,"az":192,"ss":18,"used":false},{"PRN":30,"el":50,"az":179,"ss":21,"used":false},{"PRN":15,"el":9,"az":229,"ss":0,"used":false}]}

 $GPRMC,045912.000,A,3519.9026,N,13640.2634,E,0.36,13.64,270705,,*3A
 {"class":"TPV","tag":"RMC","time":1122440352.000,"ept":0.005,"lat":35.331710000,"lon":136.671056667,"alt":81.300,"epx":17.960,"epy":28.495,"epv":43.700,"track":13.6400,"speed":0.185,"climb":0.000,"mode":3}

 $GPGGA,045913.000,3519.9025,N,13640.2634,E,1,04,2.2,81.2,M,,,,0000*39
@@ -124,7 +124,7 @@ $GPRMC,045916.000,A,3519.9019,N,13640.2636,E,0.31,160.03,270705,,*03
 $GPGGA,045917.000,3519.9017,N,13640.2636,E,1,04,2.2,79.0,M,,,,0000*3B
 $GPGSV,2,1,08,05,67,099,34,09,41,047,46,14,32,311,42,26,08,109,19*71
 $GPGSV,2,2,08,22,62,272,20,18,55,192,19,30,50,179,13,15,09,229,24*72
-{"class":"SKY","tag":"GSV","vdop":1.90,"hdop":2.20,"pdop":2.90,"satellites":[{"PRN":5,"el":67,"az":99,"ss":34,"used":true},{"PRN":9,"el":41,"az":47,"ss":46,"used":true},{"PRN":14,"el":32,"az":311,"ss":42,"used":true},{"PRN":26,"el":8,"az":109,"ss":19,"used":true},{"PRN":22,"el":62,"az":272,"ss":20,"used":false},{"PRN":18,"el":55,"az":192,"ss":19,"used":false},{"PRN":30,"el":50,"az":179,"ss":13,"used":false},{"PRN":15,"el":9,"az":229,"ss":24,"used":false}]}

+{"class":"SKY","tag":"GSV","xdop":1.20,"ydop":1.90,"vdop":1.90,"tdop":1.30,"hdop":2.20,"gdop":3.21,"pdop":2.90,"satellites":[{"PRN":5,"el":67,"az":99,"ss":34,"used":true},{"PRN":9,"el":41,"az":47,"ss":46,"used":true},{"PRN":14,"el":32,"az":311,"ss":42,"used":true},{"PRN":26,"el":8,"az":109,"ss":19,"used":true},{"PRN":22,"el":62,"az":272,"ss":20,"used":false},{"PRN":18,"el":55,"az":192,"ss":19,"used":false},{"PRN":30,"el":50,"az":179,"ss":13,"used":false},{"PRN":15,"el":9,"az":229,"ss":24,"used":false}]}

 $GPRMC,045917.000,A,3519.9017,N,13640.2636,E,0.32,160.37,270705,,*08
 {"class":"TPV","tag":"RMC","time":1122440357.000,"ept":0.005,"lat":35.331695000,"lon":136.671060000,"alt":79.000,"epx":17.960,"epy":28.495,"epv":43.700,"track":160.3700,"speed":0.165,"climb":0.000,"mode":3}

 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
@@ -145,7 +145,7 @@ $GPGGA,045922.000,3519.9007,N,13640.2636,E,1,04,2.2,78.6,M,,,,0000*3B
 $GPGSA,A,3,09,05,14,26,,,,,,,,,2.9,2.2,1.9*3C
 $GPGSV,2,1,08,05,67,099,21,09,41,047,36,14,32,311,26,26,08,109,21*7B
 $GPGSV,2,2,08,22,62,272,20,18,55,192,18,30,50,179,,15,09,229,*77
-{"class":"SKY","tag":"GSV","vdop":1.90,"hdop":2.20,"pdop":2.90,"satellites":[{"PRN":5,"el":67,"az":99,"ss":21,"used":true},{"PRN":9,"el":41,"az":47,"ss":36,"used":true},{"PRN":14,"el":32,"az":311,"ss":26,"used":true},{"PRN":26,"el":8,"az":109,"ss":21,"used":true},{"PRN":22,"el":62,"az":272,"ss":20,"used":false},{"PRN":18,"el":55,"az":192,"ss":18,"used":false},{"PRN":30,"el":50,"az":179,"ss":0,"used":false},{"PRN":15,"el":9,"az":229,"ss":0,"used":false}]}

+{"class":"SKY","tag":"GSV","xdop":1.20,"ydop":1.90,"vdop":1.90,"tdop":1.30,"hdop":2.20,"gdop":3.21,"pdop":2.90,"satellites":[{"PRN":5,"el":67,"az":99,"ss":21,"used":true},{"PRN":9,"el":41,"az":47,"ss":36,"used":true},{"PRN":14,"el":32,"az":311,"ss":26,"used":true},{"PRN":26,"el":8,"az":109,"ss":21,"used":true},{"PRN":22,"el":62,"az":272,"ss":20,"used":false},{"PRN":18,"el":55,"az":192,"ss":18,"used":false},{"PRN":30,"el":50,"az":179,"ss":0,"used":false},{"PRN":15,"el":9,"az":229,"ss":0,"used":false}]}

 $GPRMC,045922.000,A,3519.9007,N,13640.2636,E,3.35,194.25,270705,,*03
 {"class":"TPV","tag":"RMC","time":1122440362.000,"ept":0.005,"lat":35.331678333,"lon":136.671060000,"alt":78.600,"epx":17.960,"epy":28.495,"epv":43.700,"track":194.2500,"speed":1.723,"climb":0.100,"mode":3}

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