Second attempt at DOP computation fix.

1 files changed, 8 insertions, 8 deletions

diff --git a/test/daemon/mtk-3329.log.chk b/test/daemon/mtk-3329.log.chk
index 579c7bd0..e8df4681 100644
--- a/test/daemon/mtk-3329.log.chk
+++ b/test/daemon/mtk-3329.log.chk
@@ -7,32 +7,32 @@ $GPGSA,A,2,20,17,23,14,,,,,,,,,1.62,1.31,0.95*09
 $GPGSV,3,1,10,32,86,204,,24,84,113,,11,73,162,,20,54,245,16*7C

 $GPGSV,3,2,10,17,32,308,33,14,27,045,31,19,15,167,,23,14,188,25*78

 $GPGSV,3,3,10,28,13,265,,31,08,100,*7A

-{"class":"SKY","vdop":0.95,"hdop":1.31,"pdop":1.62,"satellites":[{"PRN":32,"el":86,"az":204,"ss":0,"used":false},{"PRN":24,"el":84,"az":113,"ss":0,"used":false},{"PRN":11,"el":73,"az":162,"ss":0,"used":false},{"PRN":20,"el":54,"az":245,"ss":16,"used":true},{"PRN":17,"el":32,"az":308,"ss":33,"used":true},{"PRN":14,"el":27,"az":45,"ss":31,"used":true},{"PRN":19,"el":15,"az":167,"ss":0,"used":false},{"PRN":23,"el":14,"az":188,"ss":25,"used":true},{"PRN":28,"el":13,"az":265,"ss":0,"used":false},{"PRN":31,"el":8,"az":100,"ss":0,"used":false}]}

+{"class":"SKY","xdop":5.79,"ydop":4.80,"vdop":0.95,"tdop":1.94,"hdop":1.31,"gdop":8.51,"pdop":1.62,"satellites":[{"PRN":32,"el":86,"az":204,"ss":0,"used":false},{"PRN":24,"el":84,"az":113,"ss":0,"used":false},{"PRN":11,"el":73,"az":162,"ss":0,"used":false},{"PRN":20,"el":54,"az":245,"ss":16,"used":true},{"PRN":17,"el":32,"az":308,"ss":33,"used":true},{"PRN":14,"el":27,"az":45,"ss":31,"used":true},{"PRN":19,"el":15,"az":167,"ss":0,"used":false},{"PRN":23,"el":14,"az":188,"ss":25,"used":true},{"PRN":28,"el":13,"az":265,"ss":0,"used":false},{"PRN":31,"el":8,"az":100,"ss":0,"used":false}]}

 $PMTK001,604,1*30

 $GPRMC,102128.000,A,5129.0623,N,00632.2910,E,0.23,30.68,210211,,,A*5E

-{"class":"TPV","mode":3,"time":"2011-02-21T10:21:28.000Z","ept":0.005,"lat":51.484371667,"lon":6.538183333,"alt":29.700,"epv":21.850,"track":30.6800,"speed":0.118,"climb":0.000}

+{"class":"TPV","mode":3,"time":"2011-02-21T10:21:28.000Z","ept":0.005,"lat":51.484371667,"lon":6.538183333,"alt":29.700,"epx":86.919,"epy":71.942,"epv":21.850,"track":30.6800,"speed":0.118,"climb":0.000}

 $GPGGA,102129.000,5129.0620,N,00632.2906,E,1,4,1.31,29.7,M,47.4,M,,*68

 $GPGSA,A,2,20,17,23,14,,,,,,,,,1.62,1.31,0.95*09

 $GPGSV,3,1,10,32,86,204,,24,84,113,,11,73,162,,20,54,245,15*7F

 $GPGSV,3,2,10,17,32,308,33,14,27,045,32,19,15,167,,23,14,188,25*7B

 $GPGSV,3,3,10,28,13,265,,31,08,100,*7A

-{"class":"SKY","vdop":0.95,"hdop":1.31,"pdop":1.62,"satellites":[{"PRN":32,"el":86,"az":204,"ss":0,"used":false},{"PRN":24,"el":84,"az":113,"ss":0,"used":false},{"PRN":11,"el":73,"az":162,"ss":0,"used":false},{"PRN":20,"el":54,"az":245,"ss":15,"used":true},{"PRN":17,"el":32,"az":308,"ss":33,"used":true},{"PRN":14,"el":27,"az":45,"ss":32,"used":true},{"PRN":19,"el":15,"az":167,"ss":0,"used":false},{"PRN":23,"el":14,"az":188,"ss":25,"used":true},{"PRN":28,"el":13,"az":265,"ss":0,"used":false},{"PRN":31,"el":8,"az":100,"ss":0,"used":false}]}

+{"class":"SKY","xdop":5.79,"ydop":4.80,"vdop":0.95,"tdop":1.94,"hdop":1.31,"gdop":8.51,"pdop":1.62,"satellites":[{"PRN":32,"el":86,"az":204,"ss":0,"used":false},{"PRN":24,"el":84,"az":113,"ss":0,"used":false},{"PRN":11,"el":73,"az":162,"ss":0,"used":false},{"PRN":20,"el":54,"az":245,"ss":15,"used":true},{"PRN":17,"el":32,"az":308,"ss":33,"used":true},{"PRN":14,"el":27,"az":45,"ss":32,"used":true},{"PRN":19,"el":15,"az":167,"ss":0,"used":false},{"PRN":23,"el":14,"az":188,"ss":25,"used":true},{"PRN":28,"el":13,"az":265,"ss":0,"used":false},{"PRN":31,"el":8,"az":100,"ss":0,"used":false}]}

 $GPRMC,102129.000,A,5129.0620,N,00632.2906,E,0.20,30.68,210211,,,A*58

-{"class":"TPV","mode":3,"time":"2011-02-21T10:21:29.000Z","ept":0.005,"lat":51.484366667,"lon":6.538176667,"alt":29.700,"epv":21.850,"track":30.6800,"speed":0.103,"climb":0.000,"epc":43.70}

+{"class":"TPV","mode":3,"time":"2011-02-21T10:21:29.000Z","ept":0.005,"lat":51.484366667,"lon":6.538176667,"alt":29.700,"epx":86.919,"epy":71.942,"epv":21.850,"track":30.6800,"speed":0.103,"climb":0.000,"eps":173.84,"epc":43.70}

 $GPGGA,102130.000,5129.0620,N,00632.2905,E,1,4,1.31,29.7,M,47.4,M,,*63

 $GPGSA,A,2,20,17,23,14,,,,,,,,,1.62,1.31,0.95*09

 $GPGSV,3,1,10,32,86,204,,24,84,113,,11,73,162,,20,54,245,15*7F

 $GPGSV,3,2,10,17,32,308,33,14,27,045,32,19,15,167,,23,14,188,25*7B

 $GPGSV,3,3,10,28,13,265,,31,08,100,*7A

-{"class":"SKY","vdop":0.95,"hdop":1.31,"pdop":1.62,"satellites":[{"PRN":32,"el":86,"az":204,"ss":0,"used":false},{"PRN":24,"el":84,"az":113,"ss":0,"used":false},{"PRN":11,"el":73,"az":162,"ss":0,"used":false},{"PRN":20,"el":54,"az":245,"ss":15,"used":true},{"PRN":17,"el":32,"az":308,"ss":33,"used":true},{"PRN":14,"el":27,"az":45,"ss":32,"used":true},{"PRN":19,"el":15,"az":167,"ss":0,"used":false},{"PRN":23,"el":14,"az":188,"ss":25,"used":true},{"PRN":28,"el":13,"az":265,"ss":0,"used":false},{"PRN":31,"el":8,"az":100,"ss":0,"used":false}]}

+{"class":"SKY","xdop":5.79,"ydop":4.80,"vdop":0.95,"tdop":1.94,"hdop":1.31,"gdop":8.51,"pdop":1.62,"satellites":[{"PRN":32,"el":86,"az":204,"ss":0,"used":false},{"PRN":24,"el":84,"az":113,"ss":0,"used":false},{"PRN":11,"el":73,"az":162,"ss":0,"used":false},{"PRN":20,"el":54,"az":245,"ss":15,"used":true},{"PRN":17,"el":32,"az":308,"ss":33,"used":true},{"PRN":14,"el":27,"az":45,"ss":32,"used":true},{"PRN":19,"el":15,"az":167,"ss":0,"used":false},{"PRN":23,"el":14,"az":188,"ss":25,"used":true},{"PRN":28,"el":13,"az":265,"ss":0,"used":false},{"PRN":31,"el":8,"az":100,"ss":0,"used":false}]}

 $PMTK705,AXN_1.30,0145,Fastrax IT500,*67

 $GPRMC,102130.000,A,5129.0620,N,00632.2905,E,0.16,30.68,210211,,,A*56

-{"class":"TPV","mode":3,"time":"2011-02-21T10:21:30.000Z","ept":0.005,"lat":51.484366667,"lon":6.538175000,"alt":29.700,"epv":21.850,"track":30.6800,"speed":0.082,"climb":0.000,"epc":43.70}

+{"class":"TPV","mode":3,"time":"2011-02-21T10:21:30.000Z","ept":0.005,"lat":51.484366667,"lon":6.538175000,"alt":29.700,"epx":86.919,"epy":71.942,"epv":21.850,"track":30.6800,"speed":0.082,"climb":0.000,"eps":173.84,"epc":43.70}

 $GPGGA,102131.000,5129.0620,N,00632.2904,E,1,4,1.31,29.7,M,47.4,M,,*63

 $GPGSA,A,2,20,17,23,14,,,,,,,,,1.62,1.31,0.95*09

 $GPGSV,3,1,10,32,86,204,,24,84,113,,11,73,162,,20,54,245,15*7F

 $GPGSV,3,2,10,17,32,308,32,14,27,045,32,19,15,167,,23,14,188,25*7A

 $GPGSV,3,3,10,28,13,265,,31,08,100,*7A

-{"class":"SKY","vdop":0.95,"hdop":1.31,"pdop":1.62,"satellites":[{"PRN":32,"el":86,"az":204,"ss":0,"used":false},{"PRN":24,"el":84,"az":113,"ss":0,"used":false},{"PRN":11,"el":73,"az":162,"ss":0,"used":false},{"PRN":20,"el":54,"az":245,"ss":15,"used":true},{"PRN":17,"el":32,"az":308,"ss":32,"used":true},{"PRN":14,"el":27,"az":45,"ss":32,"used":true},{"PRN":19,"el":15,"az":167,"ss":0,"used":false},{"PRN":23,"el":14,"az":188,"ss":25,"used":true},{"PRN":28,"el":13,"az":265,"ss":0,"used":false},{"PRN":31,"el":8,"az":100,"ss":0,"used":false}]}

+{"class":"SKY","xdop":5.79,"ydop":4.80,"vdop":0.95,"tdop":1.94,"hdop":1.31,"gdop":8.51,"pdop":1.62,"satellites":[{"PRN":32,"el":86,"az":204,"ss":0,"used":false},{"PRN":24,"el":84,"az":113,"ss":0,"used":false},{"PRN":11,"el":73,"az":162,"ss":0,"used":false},{"PRN":20,"el":54,"az":245,"ss":15,"used":true},{"PRN":17,"el":32,"az":308,"ss":32,"used":true},{"PRN":14,"el":27,"az":45,"ss":32,"used":true},{"PRN":19,"el":15,"az":167,"ss":0,"used":false},{"PRN":23,"el":14,"az":188,"ss":25,"used":true},{"PRN":28,"el":13,"az":265,"ss":0,"used":false},{"PRN":31,"el":8,"az":100,"ss":0,"used":false}]}

 $GPRMC,102131.000,A,5129.0620,N,00632.2904,E,0.22,30.68,210211,,,A*51

-{"class":"TPV","mode":3,"time":"2011-02-21T10:21:31.000Z","ept":0.005,"lat":51.484366667,"lon":6.538173333,"alt":29.700,"epv":21.850,"track":30.6800,"speed":0.113,"climb":0.000,"epc":43.70}

+{"class":"TPV","mode":3,"time":"2011-02-21T10:21:31.000Z","ept":0.005,"lat":51.484366667,"lon":6.538173333,"alt":29.700,"epx":86.919,"epy":71.942,"epv":21.850,"track":30.6800,"speed":0.113,"climb":0.000,"eps":173.84,"epc":43.70}