Fix GPGSA/BDGSA processing so they combine.

The combine code stolen from the GPGSV/BDGSV combining code.
Just 2 regressions changed.  No surprise since Beidu rarely seen
in the USA.

I eyeballed the changes in the chk files and they look good.

1 files changed, 7 insertions, 7 deletions

diff --git a/test/daemon/skytraq-fixB.log.chk b/test/daemon/skytraq-fixB.log.chk
index 7e8de0b9..7b7b9fa6 100644
--- a/test/daemon/skytraq-fixB.log.chk
+++ b/test/daemon/skytraq-fixB.log.chk
@@ -32,14 +32,14 @@ $GPGSV,4,1,13,23,66,310,29,03,65,186,34,26,43,081,27,16,41,124,39*7E
 $GPGSV,4,2,13,51,37,160,38,04,37,066,25,09,34,291,10,22,26,156,37*71

 $GPGSV,4,3,13,06,19,301,,31,17,052,21,193,11,307,,07,11,232,25*4C

 $GPGSV,4,4,13,01,03,202,30*4A

-{"class":"SKY","vdop":1.40,"hdop":1.10,"pdop":1.80,"satellites":[{"PRN":23,"el":66,"az":310,"ss":29,"used":false},{"PRN":3,"el":65,"az":186,"ss":34,"used":false},{"PRN":26,"el":43,"az":81,"ss":27,"used":false},{"PRN":16,"el":41,"az":124,"ss":39,"used":false},{"PRN":138,"el":37,"az":160,"ss":38,"used":false},{"PRN":4,"el":37,"az":66,"ss":25,"used":false},{"PRN":9,"el":34,"az":291,"ss":10,"used":false},{"PRN":22,"el":26,"az":156,"ss":37,"used":false},{"PRN":6,"el":19,"az":301,"ss":0,"used":false},{"PRN":31,"el":17,"az":52,"ss":21,"used":false},{"PRN":193,"el":11,"az":307,"ss":0,"used":false},{"PRN":7,"el":11,"az":232,"ss":25,"used":false},{"PRN":1,"el":3,"az":202,"ss":30,"used":false}]}

+{"class":"SKY","xdop":0.79,"ydop":0.86,"vdop":1.40,"tdop":0.97,"hdop":1.10,"gdop":2.11,"pdop":1.80,"satellites":[{"PRN":23,"el":66,"az":310,"ss":29,"used":true},{"PRN":3,"el":65,"az":186,"ss":34,"used":true},{"PRN":26,"el":43,"az":81,"ss":27,"used":false},{"PRN":16,"el":41,"az":124,"ss":39,"used":true},{"PRN":138,"el":37,"az":160,"ss":38,"used":false},{"PRN":4,"el":37,"az":66,"ss":25,"used":false},{"PRN":9,"el":34,"az":291,"ss":10,"used":false},{"PRN":22,"el":26,"az":156,"ss":37,"used":true},{"PRN":6,"el":19,"az":301,"ss":0,"used":false},{"PRN":31,"el":17,"az":52,"ss":21,"used":true},{"PRN":193,"el":11,"az":307,"ss":0,"used":false},{"PRN":7,"el":11,"az":232,"ss":25,"used":true},{"PRN":1,"el":3,"az":202,"ss":30,"used":false}]}

 $BDGSV,1,1,02,214,55,153,40,208,01,299,*67

-{"class":"SKY","vdop":1.40,"hdop":1.10,"pdop":1.80,"satellites":[{"PRN":23,"el":66,"az":310,"ss":29,"used":false},{"PRN":3,"el":65,"az":186,"ss":34,"used":false},{"PRN":26,"el":43,"az":81,"ss":27,"used":false},{"PRN":16,"el":41,"az":124,"ss":39,"used":false},{"PRN":138,"el":37,"az":160,"ss":38,"used":false},{"PRN":4,"el":37,"az":66,"ss":25,"used":false},{"PRN":9,"el":34,"az":291,"ss":10,"used":false},{"PRN":22,"el":26,"az":156,"ss":37,"used":false},{"PRN":6,"el":19,"az":301,"ss":0,"used":false},{"PRN":31,"el":17,"az":52,"ss":21,"used":false},{"PRN":193,"el":11,"az":307,"ss":0,"used":false},{"PRN":7,"el":11,"az":232,"ss":25,"used":false},{"PRN":1,"el":3,"az":202,"ss":30,"used":false},{"PRN":214,"el":55,"az":153,"ss":40,"used":true},{"PRN":208,"el":1,"az":299,"ss":0,"used":false}]}

+{"class":"SKY","xdop":0.79,"ydop":0.86,"vdop":1.40,"tdop":0.97,"hdop":1.10,"gdop":2.11,"pdop":1.80,"satellites":[{"PRN":23,"el":66,"az":310,"ss":29,"used":true},{"PRN":3,"el":65,"az":186,"ss":34,"used":true},{"PRN":26,"el":43,"az":81,"ss":27,"used":false},{"PRN":16,"el":41,"az":124,"ss":39,"used":true},{"PRN":138,"el":37,"az":160,"ss":38,"used":false},{"PRN":4,"el":37,"az":66,"ss":25,"used":false},{"PRN":9,"el":34,"az":291,"ss":10,"used":false},{"PRN":22,"el":26,"az":156,"ss":37,"used":true},{"PRN":6,"el":19,"az":301,"ss":0,"used":false},{"PRN":31,"el":17,"az":52,"ss":21,"used":true},{"PRN":193,"el":11,"az":307,"ss":0,"used":false},{"PRN":7,"el":11,"az":232,"ss":25,"used":true},{"PRN":1,"el":3,"az":202,"ss":30,"used":false},{"PRN":214,"el":55,"az":153,"ss":40,"used":true},{"PRN":208,"el":1,"az":299,"ss":0,"used":false}]}

 $GPRMC,182141.000,A,4404.1164403,N,12118.8704326,W,000.0,329.9,290316,,,D*7E

 $GPVTG,329.9,T,,M,000.0,N,000.0,K,D*09

 $GPZDA,182141.000,29,03,2016,00,00*54

 $GPGST,182141.000,15.5,15.3,7.2,21.8,0.9,0.5,0.8*54

-{"class":"TPV","mode":3,"time":"2016-03-29T18:21:41.000Z","ept":0.005,"lat":44.068607338,"lon":-121.314507210,"alt":1215.168,"epv":8.050,"track":329.9000,"speed":0.000,"climb":0.015,"epc":16.10}

+{"class":"TPV","mode":3,"time":"2016-03-29T18:21:41.000Z","ept":0.005,"lat":44.068607338,"lon":-121.314507210,"alt":1215.168,"epx":2.968,"epy":3.226,"epv":8.050,"track":329.9000,"speed":0.000,"climb":0.015,"epc":16.10}

 {"class":"GST","time":"1970-01-03T02:35:41.000Z","rms":15.500,"major":15.300,"minor":7.200,"orient":21.800,"lat":0.900,"lon":0.500,"alt":0.800}

 $PSTI,030,182141.000,A,4404.1164403,N,12118.8704326,W,1215.168,0.01,-0.03,0.07,290316,D,0.0,0.0*15

 $GPGGA,182142.000,4404.1164065,N,12118.8704154,W,2,07,1.1,1215.183,M,-20.300,M,,0000*52

@@ -50,7 +50,7 @@ $GPRMC,182142.000,A,4404.1164065,N,12118.8704154,W,000.0,329.9,290316,,,D*7E
 $GPVTG,329.9,T,,M,000.0,N,000.0,K,D*09

 $GPZDA,182142.000,29,03,2016,00,00*57

 $GPGST,182142.000,14.5,14.4,6.0,13.2,0.9,0.5,0.8*58

-{"class":"TPV","mode":3,"time":"2016-03-29T18:21:42.000Z","ept":0.005,"lat":44.068606775,"lon":-121.314506923,"alt":1215.183,"epv":8.050,"track":329.9000,"speed":0.000,"climb":0.015,"epc":16.10}

+{"class":"TPV","mode":3,"time":"2016-03-29T18:21:42.000Z","ept":0.005,"lat":44.068606775,"lon":-121.314506923,"alt":1215.183,"epx":2.968,"epy":3.226,"epv":8.050,"track":329.9000,"speed":0.000,"climb":0.015,"eps":6.45,"epc":16.10}

 {"class":"GST","time":"1970-01-03T02:35:42.000Z","rms":14.500,"major":14.400,"minor":6.000,"orient":13.200,"lat":0.900,"lon":0.500,"alt":0.800}

 $PSTI,030,182142.000,A,4404.1164065,N,12118.8704154,W,1215.183,0.01,-0.02,0.05,290316,D,0.0,0.0*13

 $GPGGA,182143.000,4404.1163794,N,12118.8704014,W,2,07,1.1,1215.198,M,-20.300,M,,0000*52

@@ -61,7 +61,7 @@ $GPRMC,182143.000,A,4404.1163794,N,12118.8704014,W,000.0,329.9,290316,,,D*74
 $GPVTG,329.9,T,,M,000.0,N,000.0,K,D*09

 $GPZDA,182143.000,29,03,2016,00,00*56

 $GPGST,182143.000,13.5,15.3,6.1,11.8,0.9,0.5,0.8*51

-{"class":"TPV","mode":3,"time":"2016-03-29T18:21:43.000Z","ept":0.005,"lat":44.068606323,"lon":-121.314506690,"alt":1215.198,"epv":8.050,"track":329.9000,"speed":0.000,"climb":0.015,"epc":16.10}

+{"class":"TPV","mode":3,"time":"2016-03-29T18:21:43.000Z","ept":0.005,"lat":44.068606323,"lon":-121.314506690,"alt":1215.198,"epx":2.968,"epy":3.226,"epv":8.050,"track":329.9000,"speed":0.000,"climb":0.015,"eps":6.45,"epc":16.10}

 {"class":"GST","time":"1970-01-03T02:35:43.000Z","rms":13.500,"major":15.300,"minor":6.100,"orient":11.800,"lat":0.900,"lon":0.500,"alt":0.800}

 $PSTI,030,182143.000,A,4404.1163794,N,12118.8704014,W,1215.198,0.01,-0.00,0.03,290316,D,0.0,0.0*17

 $GPGGA,182144.000,4404.1163490,N,12118.8703790,W,2,07,1.1,1215.211,M,-20.300,M,,0000*5C

@@ -73,11 +73,11 @@ $GPGSV,4,2,13,51,37,160,38,04,37,066,25,09,34,291,07,22,26,156,37*77
 $GPGSV,4,3,13,06,19,301,,31,17,052,20,193,11,307,,07,11,232,27*4F

 $GPGSV,4,4,13,01,03,202,30*4A

 $BDGSV,1,1,02,214,55,153,40,208,01,299,*67

-{"class":"SKY","vdop":1.40,"hdop":1.10,"pdop":1.80,"satellites":[{"PRN":23,"el":66,"az":310,"ss":29,"used":false},{"PRN":3,"el":65,"az":186,"ss":33,"used":false},{"PRN":26,"el":43,"az":81,"ss":27,"used":false},{"PRN":16,"el":41,"az":124,"ss":38,"used":false},{"PRN":138,"el":37,"az":160,"ss":38,"used":false},{"PRN":4,"el":37,"az":66,"ss":25,"used":false},{"PRN":9,"el":34,"az":291,"ss":7,"used":false},{"PRN":22,"el":26,"az":156,"ss":37,"used":false},{"PRN":6,"el":19,"az":301,"ss":0,"used":false},{"PRN":31,"el":17,"az":52,"ss":20,"used":false},{"PRN":193,"el":11,"az":307,"ss":0,"used":false},{"PRN":7,"el":11,"az":232,"ss":27,"used":false},{"PRN":1,"el":3,"az":202,"ss":30,"used":false},{"PRN":214,"el":55,"az":153,"ss":40,"used":true},{"PRN":208,"el":1,"az":299,"ss":0,"used":false}]}

+{"class":"SKY","xdop":0.79,"ydop":0.86,"vdop":1.40,"tdop":0.97,"hdop":1.10,"gdop":2.11,"pdop":1.80,"satellites":[{"PRN":23,"el":66,"az":310,"ss":29,"used":true},{"PRN":3,"el":65,"az":186,"ss":33,"used":true},{"PRN":26,"el":43,"az":81,"ss":27,"used":false},{"PRN":16,"el":41,"az":124,"ss":38,"used":true},{"PRN":138,"el":37,"az":160,"ss":38,"used":false},{"PRN":4,"el":37,"az":66,"ss":25,"used":false},{"PRN":9,"el":34,"az":291,"ss":7,"used":false},{"PRN":22,"el":26,"az":156,"ss":37,"used":true},{"PRN":6,"el":19,"az":301,"ss":0,"used":false},{"PRN":31,"el":17,"az":52,"ss":20,"used":true},{"PRN":193,"el":11,"az":307,"ss":0,"used":false},{"PRN":7,"el":11,"az":232,"ss":27,"used":true},{"PRN":1,"el":3,"az":202,"ss":30,"used":false},{"PRN":214,"el":55,"az":153,"ss":40,"used":true},{"PRN":208,"el":1,"az":299,"ss":0,"used":false}]}

 $GPRMC,182144.000,A,4404.1163490,N,12118.8703790,W,000.0,329.9,290316,,,D*78

 $GPVTG,329.9,T,,M,000.0,N,000.0,K,D*09

 $GPZDA,182144.000,29,03,2016,00,00*51

 $GPGST,182144.000,14.5,14.3,5.3,12.9,0.9,0.5,0.8*53

-{"class":"TPV","mode":3,"time":"2016-03-29T18:21:44.000Z","ept":0.005,"lat":44.068605817,"lon":-121.314506317,"alt":1215.211,"epv":8.050,"track":329.9000,"speed":0.000,"climb":0.013,"epc":16.10}

+{"class":"TPV","mode":3,"time":"2016-03-29T18:21:44.000Z","ept":0.005,"lat":44.068605817,"lon":-121.314506317,"alt":1215.211,"epx":2.968,"epy":3.226,"epv":8.050,"track":329.9000,"speed":0.000,"climb":0.013,"eps":6.45,"epc":16.10}

 {"class":"GST","time":"1970-01-03T02:35:44.000Z","rms":14.500,"major":14.300,"minor":5.300,"orient":12.900,"lat":0.900,"lon":0.500,"alt":0.800}

 $PSTI,030,182144.000,A,4404.1163490,N,12118.8703790,W,1215.211,0.01,-0.02,0.06,290316,D,0.0,0.0*1E