@@ -12,24 +12,26 @@ function formatData(data) {
12
12
if ( typeof data [ key ] === 'object' ) {
13
13
for ( let i in data [ key ] ) {
14
14
var dataTempEntry = { } ;
15
- var stations ;
15
+ dataTempEntry . callsign = { } ;
16
16
if ( data [ key ] [ i ] . software_name == "aprs" ) {
17
- stations = data [ key ] [ i ] . uploader_callsign . split ( "," ) ;
17
+ var stations = data [ key ] [ i ] . uploader_callsign . split ( "," ) ;
18
+ for ( let uploader in stations ) {
19
+ dataTempEntry . callsign [ stations [ uploader ] ] = { } ;
20
+ }
18
21
} else {
19
- stations = [ data [ key ] [ i ] . uploader_callsign ] ;
20
- }
21
- dataTempEntry . callsign = { } ;
22
- for ( let x in stations ) {
23
- dataTempEntry . callsign [ stations [ x ] ] = { } ;
24
- }
25
- if ( data [ key ] [ i ] . snr ) {
26
- dataTempEntry . callsign [ stations [ 0 ] ] . snr = data [ key ] [ i ] . snr ;
27
- }
28
- if ( data [ key ] [ i ] . rssi ) {
29
- dataTempEntry . callsign [ stations [ 0 ] ] . rssi = data [ key ] [ i ] . rssi ;
30
- }
31
- if ( data [ key ] [ i ] . frequency ) {
32
- dataTempEntry . callsign [ stations [ 0 ] ] . frequency = data [ key ] [ i ] . frequency ;
22
+ for ( let uploader in data [ key ] [ i ] . uploaders ) {
23
+ uploader_callsign = data [ key ] [ i ] . uploaders [ uploader ] . uploader_callsign ;
24
+ dataTempEntry . callsign [ uploader_callsign ] = { } ;
25
+ if ( data [ key ] [ i ] . uploaders [ uploader ] . snr ) {
26
+ dataTempEntry . callsign [ uploader_callsign ] . snr = + data [ key ] [ i ] . uploaders [ uploader ] . snr . toFixed ( 1 ) ;
27
+ }
28
+ if ( data [ key ] [ i ] . uploaders [ uploader ] . rssi ) {
29
+ dataTempEntry . callsign [ uploader_callsign ] . rssi = + data [ key ] [ i ] . uploaders [ uploader ] . rssi . toFixed ( 1 ) ;
30
+ }
31
+ if ( data [ key ] [ i ] . uploaders [ uploader ] . frequency ) {
32
+ dataTempEntry . callsign [ uploader_callsign ] . frequency = + data [ key ] [ i ] . uploaders [ uploader ] . frequency . toFixed ( 3 ) ;
33
+ }
34
+ }
33
35
}
34
36
dataTempEntry . gps_alt = parseFloat ( ( data [ key ] [ i ] . alt ) . toPrecision ( 8 ) ) ;
35
37
dataTempEntry . gps_lat = parseFloat ( ( data [ key ] [ i ] . lat ) . toPrecision ( 8 ) ) ;
@@ -45,24 +47,33 @@ function formatData(data) {
45
47
dataTempEntry . vehicle = data [ key ] [ i ] . payload_callsign ;
46
48
dataTempEntry . position_id = data [ key ] [ i ] . payload_callsign + "-" + data [ key ] [ i ] . datetime ;
47
49
dataTempEntry . data = { } ;
48
- if ( data [ key ] [ i ] . batt ) {
49
- dataTempEntry . data . batt = Math . round ( data [ key ] [ i ] . batt , 2 ) ;
50
+ if ( data [ key ] [ i ] . hasOwnProperty ( "batt" ) ) {
51
+ dataTempEntry . data . batt = + data [ key ] [ i ] . batt . toFixed ( 2 ) ;
52
+ }
53
+ if ( data [ key ] [ i ] . hasOwnProperty ( "frequency" ) ) {
54
+ dataTempEntry . data . frequency = + data [ key ] [ i ] . frequency . toFixed ( 3 ) ;
50
55
}
51
- if ( data [ key ] [ i ] . frequency ) {
52
- dataTempEntry . data . frequency = Math . round ( data [ key ] [ i ] . frequency , 3 ) ;
56
+ if ( data [ key ] [ i ] . hasOwnProperty ( "tx_frequency" ) ) {
57
+ dataTempEntry . data . frequency_tx = + data [ key ] [ i ] . tx_frequency . toFixed ( 3 ) ;
53
58
}
54
59
if ( data [ key ] [ i ] . hasOwnProperty ( "humidity" ) ) {
55
60
dataTempEntry . data . humidity = data [ key ] [ i ] . humidity ;
56
61
}
57
62
if ( data [ key ] [ i ] . hasOwnProperty ( "pressure" ) ) {
58
63
dataTempEntry . data . pressure = data [ key ] [ i ] . pressure ;
59
64
}
60
- if ( data [ key ] [ i ] . sats ) {
65
+ if ( data [ key ] [ i ] . hasOwnProperty ( " sats" ) ) {
61
66
dataTempEntry . data . sats = data [ key ] [ i ] . sats ;
62
67
}
63
68
if ( data [ key ] [ i ] . hasOwnProperty ( "temp" ) ) {
64
69
dataTempEntry . data . temperature_external = data [ key ] [ i ] . temp ;
65
70
}
71
+ if ( data [ key ] [ i ] . hasOwnProperty ( "comment" ) ) {
72
+ dataTempEntry . data . comment = data [ key ] [ i ] . comment ;
73
+ }
74
+ if ( data [ key ] [ i ] . hasOwnProperty ( "modulation" ) ) {
75
+ dataTempEntry . data . modulation = data [ key ] [ i ] . modulation ;
76
+ }
66
77
dataTemp . push ( dataTempEntry ) ;
67
78
}
68
79
}
0 commit comments